4 changed files with 15 additions and 109 deletions
--- a/0001-feat-broken-KF5-include-path.patch
+++ b/0001-feat-broken-KF5-include-path.patch
@ -1,49 +0,0 @@
-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
-
--- a/deepin-editor-5.6.28.tar.gz
+++ b/deepin-editor-5.6.28.tar.gz
--- a/deepin-editor-6.0.6.tar.gz
+++ b/deepin-editor-6.0.6.tar.gz
--- a/deepin-editor.spec
+++ b/deepin-editor.spec
@ -1,28 +1,17 @@
-%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:        6.0.6
-Release:        %{specrelease}
+Version:        5.6.28
+Release:        1
 Summary:        Simple editor for Linux Deepin
 License:        GPLv3
 URL:            https://github.com/linuxdeepin/deepin-editor
-Source0:        %{name}-%{version}.tar.gz
-#%Patch0:         0001-feat-broken-KF5-include-path.patch
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

 BuildRequires: cmake3
-BuildRequires: qt5-devel
 BuildRequires: gcc-c++
 BuildRequires: freeimage-devel
-BuildRequires: dtkcommon-devel
-BuildRequires: dtkwidget-devel
-BuildRequires: dtkcore-devel
+BuildRequires:  dtkcore-devel
+BuildRequires:  dtkwidget-devel
+BuildRequires: pkgconfig(dtkwm)
 BuildRequires: pkgconfig(libexif)
 BuildRequires: pkgconfig(xcb-aux)
 BuildRequires: pkgconfig(xtst)
@ -32,75 +21,40 @@ BuildRequires: pkgconfig(Qt5DBus)
 BuildRequires: pkgconfig(Qt5Gui)
 BuildRequires: pkgconfig(Qt5Svg)
 BuildRequires: pkgconfig(Qt5X11Extras)
-BuildRequires: pkgconfig(dframeworkdbus)
 BuildRequires: qt5-linguist
 BuildRequires: qt5-qtbase-private-devel
-BuildRequires: kf5-kcodecs-devel
-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
-
+BuildRequires: cmake(KF5Codecs)
+BuildRequires: cmake(KF5SyntaxHighlighting)

 %description
 %{summary}.

 %prep
 %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")
-mkdir build && pushd build
-%cmake -DCMAKE_BUILD_TYPE=Release -DAPP_VERSION=%{version} -DVERSION=%{version}  ../
+%cmake . -DVERSION=%{version}
 %make_build
-popd

 %install
-%make_install -C build INSTALL_ROOT="%buildroot"
+%make_install

-# %check
-# desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:

 %files
 %doc README.md
-%license LICENSE.txt
+%license LICENSE
+%{_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
-* 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

@ -109,3 +63,4 @@ popd

 * Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.6.1-3
 - Package init
+