diff --git a/0001-feat-broken-KF5-include-path.patch b/0001-feat-broken-KF5-include-path.patch deleted file mode 100644 index 8388712ac66764a496ba5bc9ed09215232759795..0000000000000000000000000000000000000000 --- a/0001-feat-broken-KF5-include-path.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9b2501cd5d5ebc02ca54c9d49dde4a9be91799de Mon Sep 17 00:00:00 2001 -From: leeffo -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 --#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/0001-set-CXX-standard-for-17-for-icu-76.patch b/0001-set-CXX-standard-for-17-for-icu-76.patch new file mode 100644 index 0000000000000000000000000000000000000000..1427c9bfae98c98e6c06bf7d0b473c4189339c54 --- /dev/null +++ b/0001-set-CXX-standard-for-17-for-icu-76.patch @@ -0,0 +1,25 @@ +From 3eb512e351f5a5277cd4f491adf8c8deea60e29e Mon Sep 17 00:00:00 2001 +From: Funda Wang +Date: Mon, 25 Nov 2024 00:42:37 +0800 +Subject: [PATCH] set CXX standard for 17 for icu 76 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78af98f..665c0fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,7 +10,7 @@ project(deepin-editor + ) + + #set(CMAKE_VERBOSE_MAKEFILE ON) +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + set(CMAKE_AUTOUIC ON) +-- +2.43.0 + diff --git a/deepin-editor.spec b/deepin-editor.spec index 44534ef3b27f05a665fc0cbfc1f84ce410851359..2e9b50b021f8d91b2f5b61782a7dba5e66e3456e 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,7 +14,7 @@ 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 +Patch1: 0001-set-CXX-standard-for-17-for-icu-76.patch BuildRequires: cmake3 BuildRequires: qt5-devel @@ -50,8 +50,7 @@ BuildRequires: libchardet-devel %{summary}. %prep -%setup -q -#%%patch0 -p1 +%autosetup -p1 # fix strip sed -i 's|-Wall"|-Wall -s"|' CMakeLists.txt @@ -61,16 +60,11 @@ sed -i 's|-Wall"|-Wall -s"|' CMakeLists.txt 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} ../ -%make_build -popd +%cmake -DCMAKE_BUILD_TYPE=Release -DAPP_VERSION=%{version} -DVERSION=%{version} +%cmake_build %install -%make_install -C build INSTALL_ROOT="%buildroot" - -# %check -# desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: +%cmake_install %files %doc README.md @@ -83,6 +77,10 @@ popd %{_datadir}/dsg/configs/org.deepin.editor/org.deepin.editor.json %changelog +* Mon Nov 25 2024 Funda Wang - 6.0.6-2 +- adopt to new cmake macro +- set cxx standard to 17 for icu 76 + * Wed Jul 26 2023 leeffo - 6.0.6-1 - upgrade to version 6.0.6