From 2867df6e5dcc5fb2e8d8fb855bc75094e87399f4 Mon Sep 17 00:00:00 2001 From: pangqing Date: Tue, 5 Aug 2025 21:15:29 +0800 Subject: [PATCH] set default c++17 Signed-off-by: pangqing --- 0001-set-default-c++17.patch | 25 +++++++++++++++++++++++++ dde-app-services.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-set-default-c++17.patch diff --git a/0001-set-default-c++17.patch b/0001-set-default-c++17.patch new file mode 100644 index 0000000..c638a8d --- /dev/null +++ b/0001-set-default-c++17.patch @@ -0,0 +1,25 @@ +From 12f327d42092f278c0479861a25c4285395c28c4 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Tue, 5 Aug 2025 13:08:16 +0000 +Subject: [PATCH] set default c++17 + +--- + dconfig-center/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dconfig-center/CMakeLists.txt b/dconfig-center/CMakeLists.txt +index c458c09..b81720d 100644 +--- a/dconfig-center/CMakeLists.txt ++++ b/dconfig-center/CMakeLists.txt +@@ -6,7 +6,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + + project(dconfig-center) + +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + include(GNUInstallDirs) + +-- +2.50.1 + diff --git a/dde-app-services.spec b/dde-app-services.spec index 6ffc3f5..341a1ca 100644 --- a/dde-app-services.spec +++ b/dde-app-services.spec @@ -1,11 +1,12 @@ %define __cmake_builddir $(pwd) Name: dde-app-services Version: 0.0.20 -Release: 2 +Release: 3 Summary: Service collection of DDE applications License: LGPL-3.0+ Url: https://github.com/linuxdeepin/dde-app-services Source0: %{name}-%{version}.tar.gz +Patch0: 0001-set-default-c++17.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -39,6 +40,7 @@ dde-dconfig-editor is a GUI or Console tool, it's used to view and edit DSG conf %prep %setup -q +%patch0 -p1 %if 0%{?openeuler} sed -i 's/set(REQUIRED_QT_VERSION 5.11.3)/set(REQUIRED_QT_VERSION 5.11.1)/' $(find ./dconfig-center/*/ -name "CMakeLists.txt") @@ -76,6 +78,9 @@ export PATH=%_qt5_bindir:$PATH %changelog +* Tue Aug 05 2025 pangqing - 0.0.20-3 +- set default c++17 + * Thu Feb 20 2025 pangqing - 0.0.20-2 - fix build error -- Gitee