From 2a207e662a22fc7a9d09f7b31dc5a6e48a1c1130 Mon Sep 17 00:00:00 2001 From: loong_C Date: Wed, 27 Jul 2022 09:20:39 +0800 Subject: [PATCH] fix: broken KF5 include path --- 0001-fix-broken-KF5-include-path.patch | 49 ++++++++++++++++++++++++++ deepin-editor.spec | 7 +++- 2 files changed, 55 insertions(+), 1 deletion(-) 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..863eb5f --- /dev/null +++ b/0001-fix-broken-KF5-include-path.patch @@ -0,0 +1,49 @@ +From 6373d9af2b9f1660102fa46a139f42ef56f7d330 Mon Sep 17 00:00:00 2001 +From: loong ci +Date: Wed, 27 Jul 2022 09:18:09 +0800 +Subject: [PATCH] fix: 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 64a51e1..3a6ddda 100644 +--- a/src/editor/dtextedit.cpp ++++ b/src/editor/dtextedit.cpp +@@ -33,9 +33,9 @@ + #include "insertblockbytextcommond.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 bdf42d4..e568568 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 @@ -14,6 +14,7 @@ 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: qt5-devel @@ -45,6 +46,7 @@ BuildRequires: gmock-devel %prep %setup -q +%patch0 -p1 # help find (and prefer) qt5 utilities, e.g. qmake, lrelease export PATH=%{_qt5_bindir}:$PATH @@ -72,6 +74,9 @@ popd %{_datadir}/deepin-manual/manual-assets/application/deepin-editor/editor/* %changelog +* Wed Jul 27 2022 liweiganga - 5.9.7-2 +- fix: broken KF5 include path + * Mon Jul 18 2022 konglidong - 5.9.7-1 - update to 5.9.7 -- Gitee