!10 update to upstream 5.9.7

From: @xzyangha 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl

0001-fix-broken-KF5-include-path.patch

@@ -1,19 +1,19 @@
-From 969abdfd29d2b87aa13f19838b7603b05960594e Mon Sep 17 00:00:00 2001
+From 6373d9af2b9f1660102fa46a139f42ef56f7d330 Mon Sep 17 00:00:00 2001
 From: loong ci <loong_c@yeah.net>
-Date: Tue, 9 Aug 2022 14:39:13 +0800
-Subject: [PATCH] fix broken KF5 include path
+Date: Wed, 27 Jul 2022 09:18:09 +0800
+Subject: [PATCH] fix: broken KF5 include path
 
 ---
- src/dtextedit.cpp | 6 +++---
- src/dtextedit.h   | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ src/editor/dtextedit.cpp        | 6 +++---
+ src/editor/showflodcodewidget.h | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 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"
+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 <KF5/KSyntaxHighlighting/definition.h>
@@ -25,19 +25,25 @@ index 1236b05..71a4e06 100644
  
  #include <QAbstractTextDocumentLayout>
  #include <QTextDocumentFragment>
-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
- 
+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 <DFrame>
+ #include <DPlainTextEdit>
+ #include <DApplicationHelper>
 -#include <KF5/KSyntaxHighlighting/repository.h>
+-#include <KF5/KSyntaxHighlighting/definition.h>
+-#include <KF5/KSyntaxHighlighting/syntaxhighlighter.h>
+-#include <KF5/KSyntaxHighlighting/theme.h>
 +#include <KSyntaxHighlighting/repository.h>
- #include "uncommentselection.h"
- #include "linenumberarea.h"
- #include "bookmarkwidget.h"
++#include <KSyntaxHighlighting/definition.h>
++#include <KSyntaxHighlighting/syntaxhighlighter.h>
++#include <KSyntaxHighlighting/theme.h>
+ 
+ DWIDGET_USE_NAMESPACE
+ 
 -- 
 2.20.1
 

deepin-editor.spec

@@ -1,6 +1,15 @@
+%global debug_package   %{nil}
+%define pkgrelease  2
+%if 0%{?openeuler}
+%define specrelease %{pkgrelease}
+%else
+## allow specrelease to have configurable %%{?dist} tag in other distribution
+%define specrelease %{pkgrelease}%{?dist}
+%endif
+
 Name:           deepin-editor
-Version:        5.6.28
-Release:        2
+Version:        5.9.7
+Release:        %{specrelease}
 Summary:        Simple editor for Linux Deepin
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/deepin-editor
@@ -8,11 +17,11 @@ Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch0:         0001-fix-broken-KF5-include-path.patch
 
 BuildRequires: cmake3
+BuildRequires: qt5-devel
 BuildRequires: gcc-c++
 BuildRequires: freeimage-devel
-BuildRequires:  dtkcore-devel
-BuildRequires:  dtkwidget-devel
-BuildRequires: pkgconfig(dtkwm)
+BuildRequires: dtkwidget-devel
+BuildRequires: dtkcore-devel
 BuildRequires: pkgconfig(libexif)
 BuildRequires: pkgconfig(xcb-aux)
 BuildRequires: pkgconfig(xtst)
@@ -22,43 +31,55 @@ BuildRequires: pkgconfig(Qt5DBus)
 BuildRequires: pkgconfig(Qt5Gui)
 BuildRequires: pkgconfig(Qt5Svg)
 BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(dframeworkdbus)
 BuildRequires: qt5-linguist
 BuildRequires: qt5-qtbase-private-devel
-BuildRequires: cmake(KF5Codecs)
-BuildRequires: cmake(KF5SyntaxHighlighting)
+BuildRequires: kf5-kcodecs-devel
+BuildRequires: kf5-syntax-highlighting-devel
+BuildRequires: gtest-devel
+BuildRequires: gmock-devel
+
+
 
 %description
 %{summary}.
 
 %prep
-%autosetup -p1
+%setup -q
+%patch0 -p1
 
-%build
 # help find (and prefer) qt5 utilities, e.g. qmake, lrelease
 export PATH=%{_qt5_bindir}:$PATH
+# cmake_minimum_required version is too high
 sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt")
-%cmake . -DVERSION=%{version}
+mkdir build && pushd build
+%cmake -DCMAKE_BUILD_TYPE=Release -DAPP_VERSION=%{version} -DVERSION=%{version}  ../
 %make_build
+popd
 
 %install
-%make_install
+%make_install -C build INSTALL_ROOT="%buildroot"
 
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
+# %check
+# desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
 
 %files
 %doc README.md
 %license LICENSE
-%{_bindir}/dedit
+# %{_bindir}/dedit
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/deepin-manual/manual-assets/application/deepin-editor/editor/*
 
 %changelog
-* Tue Aug 09 2022 liweiganga <liweiganga@uniontech.com> - 5.6.28-2
+* Wed Jul 27 2022 liweiganga <liweiganga@uniontech.com> - 5.9.7-2
 - fix: broken KF5 include path
 
+* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.9.7-1
+- update to 5.9.7
+
 * Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.6.28-1
 - Update 5.6.28
 
@@ -67,4 +88,3 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
 
 * Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.6.1-3
 - Package init
-