!29 sync by openEuler-22.03-LTS-SP3

From: @ut-layne-yang 
Reviewed-by: @xzyangha 
Signed-off-by: @xzyangha

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

@@ -0,0 +1,49 @@
+From 9b2501cd5d5ebc02ca54c9d49dde4a9be91799de Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+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 <KF5/KSyntaxHighlighting/definition.h>
+-#include <KF5/KSyntaxHighlighting/syntaxhighlighter.h>
+-#include <KF5/KSyntaxHighlighting/theme.h>
++#include <KSyntaxHighlighting/definition.h>
++#include <KSyntaxHighlighting/syntaxhighlighter.h>
++#include <KSyntaxHighlighting/theme.h>
+ 
+ #include <QAbstractTextDocumentLayout>
+ #include <QTextDocumentFragment>
+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 <KSyntaxHighlighting/definition.h>
++#include <KSyntaxHighlighting/syntaxhighlighter.h>
++#include <KSyntaxHighlighting/theme.h>
+ 
+ DWIDGET_USE_NAMESPACE
+ 
+-- 
+2.20.1
+

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

@@ -1,43 +0,0 @@
-From 969abdfd29d2b87aa13f19838b7603b05960594e 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
-
----
- 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 <KF5/KSyntaxHighlighting/definition.h>
--#include <KF5/KSyntaxHighlighting/syntaxhighlighter.h>
--#include <KF5/KSyntaxHighlighting/theme.h>
-+#include <KSyntaxHighlighting/definition.h>
-+#include <KSyntaxHighlighting/syntaxhighlighter.h>
-+#include <KSyntaxHighlighting/theme.h>
- 
- #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
- 
--#include <KF5/KSyntaxHighlighting/repository.h>
-+#include <KSyntaxHighlighting/repository.h>
- #include "uncommentselection.h"
- #include "linenumberarea.h"
- #include "bookmarkwidget.h"
--- 
-2.20.1
-

README.en.md

@@ -1,36 +0,0 @@
-# deepin-editor
-
-#### Description
-deepin editor
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,37 +0,0 @@
-# deepin-editor
-
-#### 介绍
-deepin editor
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

deepin-editor.spec

@@ -1,18 +1,28 @@
+%global debug_package   %{nil}
+%define pkgrelease  1
+%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
+Version:        6.0.6
-Release:        2
+Release:        %{specrelease}
 Summary:        Simple editor for Linux Deepin
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/deepin-editor
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
-Patch0:         0001-fix-broken-KF5-include-path.patch
+#%Patch0:         0001-feat-broken-KF5-include-path.patch
 
 BuildRequires: cmake3
+BuildRequires: qt5-devel
 BuildRequires: gcc-c++
 BuildRequires: freeimage-devel
-BuildRequires:  dtkcore-devel
+BuildRequires: dtkcommon-devel
-BuildRequires:  dtkwidget-devel
+BuildRequires: dtkwidget-devel
-BuildRequires: pkgconfig(dtkwm)
+BuildRequires: dtkcore-devel
 BuildRequires: pkgconfig(libexif)
 BuildRequires: pkgconfig(xcb-aux)
 BuildRequires: pkgconfig(xtst)
@@ -22,43 +32,75 @@ 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: kf5-kcodecs-devel
-BuildRequires: cmake(KF5SyntaxHighlighting)
+BuildRequires: kf5-syntax-highlighting-devel
+BuildRequires: gtest-devel
+BuildRequires: gmock-devel
+BuildRequires: dtkcommon-devel
+BuildRequires: uchardet-devel
+BuildRequires: enca-devel
+BuildRequires: libicu-devel
+BuildRequires: libchardet-devel
+
 
 %description
 %{summary}.
 
 %prep
-%autosetup -p1
+%setup -q
+#%%patch0 -p1
+
+# fix strip
+sed -i 's|-Wall"|-Wall -s"|' CMakeLists.txt
 
 %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
+# %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
+# desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
 
 %files
 %doc README.md
-%license LICENSE
+%license LICENSE.txt
-%{_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/*
+%{_datadir}/dsg/configs/org.deepin.editor/org.deepin.editor.json
 
 %changelog
-* Tue Aug 09 2022 liweiganga <liweiganga@uniontech.com> - 5.6.28-2
+* Wed Jul 26 2023 leeffo <liweiganga@uniontech.com> - 6.0.6-1
+- upgrade to version 6.0.6
+
+* Fri Mar 31 2023 liweiganga <liweiganga@uniontech.com> - 5.9.23-1
+- update: update to 5.9.23
+
+* Thu Mar 16 2023 liweiganga <liweiganga@uniontech.com> - 5.9.7-4
+- feat: fix strip
+
+* Wed Dec 21 2022 liweiganga <liweiganga@uniontech.com> - 5.9.7-3
+- enable debuginfo for fix strip
+
+* 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 +109,3 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
 
 * Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.6.1-3
 - Package init
-