From d64870ae5df1b999ab69155480cf5af7eb715078 Mon Sep 17 00:00:00 2001 From: wangqi Date: Tue, 16 Sep 2025 14:44:24 +0800 Subject: [PATCH] spec: update license (cherry picked from commit df906c4f45d596ea58ceee7e25cb297cd6990bf3) --- 0001-feat-broken-KF5-include-path.patch | 49 ------------------------- deepin-editor.spec | 8 ++-- 2 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 0001-feat-broken-KF5-include-path.patch diff --git a/0001-feat-broken-KF5-include-path.patch b/0001-feat-broken-KF5-include-path.patch deleted file mode 100644 index 8388712..0000000 --- a/0001-feat-broken-KF5-include-path.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9b2501cd5d5ebc02ca54c9d49dde4a9be91799de Mon Sep 17 00:00:00 2001 -From: leeffo -Date: Fri, 31 Mar 2023 11:14:21 +0800 -Subject: [PATCH] feat: broken KF5 include path - ---- - src/editor/dtextedit.cpp | 6 +++--- - src/editor/showflodcodewidget.h | 8 ++++---- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/editor/dtextedit.cpp b/src/editor/dtextedit.cpp -index 0c50ea5..79a0bb7 100644 ---- a/src/editor/dtextedit.cpp -+++ b/src/editor/dtextedit.cpp -@@ -33,9 +33,9 @@ - #include "insertblockbytextcommond.h" - #include "indenttextcommond.h" - --#include --#include --#include -+#include -+#include -+#include - - #include - #include -diff --git a/src/editor/showflodcodewidget.h b/src/editor/showflodcodewidget.h -index def67ad..5d2e5b7 100644 ---- a/src/editor/showflodcodewidget.h -+++ b/src/editor/showflodcodewidget.h -@@ -23,10 +23,10 @@ - #include - #include - #include --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - DWIDGET_USE_NAMESPACE - --- -2.20.1 - diff --git a/deepin-editor.spec b/deepin-editor.spec index 44534ef..8a429f4 100644 --- a/deepin-editor.spec +++ b/deepin-editor.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%define pkgrelease 1 +%define pkgrelease 2 %if 0%{?openeuler} %define specrelease %{pkgrelease} %else @@ -11,10 +11,9 @@ Name: deepin-editor Version: 6.0.6 Release: %{specrelease} Summary: Simple editor for Linux Deepin -License: GPLv3 +License: GPLv3+ and GPLv2+ and MIT and CC0 and CC-BY-4.0 URL: https://github.com/linuxdeepin/deepin-editor Source0: %{name}-%{version}.tar.gz -#%Patch0: 0001-feat-broken-KF5-include-path.patch BuildRequires: cmake3 BuildRequires: qt5-devel @@ -83,6 +82,9 @@ popd %{_datadir}/dsg/configs/org.deepin.editor/org.deepin.editor.json %changelog +* Tue Sep 16 2025 wangqia - 6.0.6-2 +- spec: update license + * Wed Jul 26 2023 leeffo - 6.0.6-1 - upgrade to version 6.0.6 -- Gitee