From 37db827aa1204e4f5663c07e02d83d8dfb63b954 Mon Sep 17 00:00:00 2001 From: loong_C Date: Tue, 9 Aug 2022 14:05:30 +0800 Subject: [PATCH] fix: broken KF5 include path (cherry picked from commit 6b408899002123f5ac3952495699dd014a96054b) --- 0001-fix-broken-KF5-include-path.patch | 43 ++++++++++++++++++++++++++ deepin-editor.spec | 8 +++-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 0001-fix-broken-KF5-include-path.patch diff --git a/0001-fix-broken-KF5-include-path.patch b/0001-fix-broken-KF5-include-path.patch new file mode 100644 index 0000000..c3867ec --- /dev/null +++ b/0001-fix-broken-KF5-include-path.patch @@ -0,0 +1,43 @@ +From 969abdfd29d2b87aa13f19838b7603b05960594e Mon Sep 17 00:00:00 2001 +From: loong ci +Date: Tue, 9 Aug 2022 14:39:13 +0800 +Subject: [PATCH] fix broken KF5 include path + +--- + src/dtextedit.cpp | 6 +++--- + src/dtextedit.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/dtextedit.cpp b/src/dtextedit.cpp +index 1236b05..71a4e06 100644 +--- a/src/dtextedit.cpp ++++ b/src/dtextedit.cpp +@@ -30,9 +30,9 @@ + #include "showflodcodewidget.h" + + +-#include +-#include +-#include ++#include ++#include ++#include + + #include + #include +diff --git a/src/dtextedit.h b/src/dtextedit.h +index 1bed580..2580979 100644 +--- a/src/dtextedit.h ++++ b/src/dtextedit.h +@@ -23,7 +23,7 @@ + #ifndef TEXTEDIT_H + #define TEXTEDIT_H + +-#include ++#include + #include "uncommentselection.h" + #include "linenumberarea.h" + #include "bookmarkwidget.h" +-- +2.20.1 + diff --git a/deepin-editor.spec b/deepin-editor.spec index 459fefd..ce533f0 100644 --- a/deepin-editor.spec +++ b/deepin-editor.spec @@ -1,10 +1,11 @@ Name: deepin-editor Version: 5.6.28 -Release: 1 +Release: 2 Summary: Simple editor for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/deepin-editor Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-fix-broken-KF5-include-path.patch BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -30,7 +31,7 @@ BuildRequires: cmake(KF5SyntaxHighlighting) %{summary}. %prep -%setup -q +%autosetup -p1 %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -55,6 +56,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %changelog +* Tue Aug 09 2022 liweiganga - 5.6.28-2 +- fix: broken KF5 include path + * Mon Jul 12 2021 weidong - 5.6.28-1 - Update 5.6.28 -- Gitee