diff --git a/0001-fix-broken-KF5-include-path.patch b/0001-fix-broken-KF5-include-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..863eb5fef2a863591f59b7ff3ae30d0e5c22e525 --- /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-5.6.28.tar.gz b/deepin-editor-5.6.28.tar.gz deleted file mode 100644 index bab95e2c6f8849c71750280904ada44a2af3f4c5..0000000000000000000000000000000000000000 Binary files a/deepin-editor-5.6.28.tar.gz and /dev/null differ diff --git a/deepin-editor-5.9.7.tar.gz b/deepin-editor-5.9.7.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8a7c7eb3cdaf9143343e25182ad33656008ed96e Binary files /dev/null and b/deepin-editor-5.9.7.tar.gz differ diff --git a/deepin-editor.spec b/deepin-editor.spec index 459fefddafc4290708118f263de671e146631cf0..e56856878846ecacabbf88553f8bbaddb80e4042 100644 --- a/deepin-editor.spec +++ b/deepin-editor.spec @@ -1,17 +1,27 @@ +%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: 1 +Version: 5.9.7 +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 +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) @@ -21,40 +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 %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 +* 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 + * Mon Jul 12 2021 weidong - 5.6.28-1 - Update 5.6.28 @@ -63,4 +88,3 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: * Thu Jul 30 2020 openEuler Buildteam - 5.6.1-3 - Package init -