From cbfd3dd2a66b317f4a0728cfd5cdd70f93f32c05 Mon Sep 17 00:00:00 2001 From: pangqing Date: Tue, 5 Aug 2025 21:01:30 +0800 Subject: [PATCH] set default c++17 Signed-off-by: pangqing --- 0004-set-default-c++17.patch | 53 ++++++++++++++++++++++++++++++++++++ deepin-system-monitor.spec | 6 +++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 0004-set-default-c++17.patch diff --git a/0004-set-default-c++17.patch b/0004-set-default-c++17.patch new file mode 100644 index 0000000..9f56b6e --- /dev/null +++ b/0004-set-default-c++17.patch @@ -0,0 +1,53 @@ +From 262e4a96a65f508697e6babf0f8b4f861162ca05 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Tue, 5 Aug 2025 12:42:58 +0000 +Subject: [PATCH] set default c++17 + +--- + deepin-system-monitor-main/CMakeLists.txt | 2 +- + deepin-system-monitor-plugin-popup/CMakeLists.txt | 2 +- + tests/CMakeLists.txt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/deepin-system-monitor-main/CMakeLists.txt b/deepin-system-monitor-main/CMakeLists.txt +index b826d13..1d5a960 100644 +--- a/deepin-system-monitor-main/CMakeLists.txt ++++ b/deepin-system-monitor-main/CMakeLists.txt +@@ -13,7 +13,7 @@ set(APP_RESOURCES ${APP_RES_ROOT}/${PROJECT_NAME}.qrc) + set(DESKTOP_FILE ${PROJECT_NAME}.desktop) + set(POLICY_FILE com.deepin.pkexec.${PROJECT_NAME}.policy) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED True) + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ") +diff --git a/deepin-system-monitor-plugin-popup/CMakeLists.txt b/deepin-system-monitor-plugin-popup/CMakeLists.txt +index aa1b62f..6eb468b 100644 +--- a/deepin-system-monitor-plugin-popup/CMakeLists.txt ++++ b/deepin-system-monitor-plugin-popup/CMakeLists.txt +@@ -9,7 +9,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(APP_RES_ROOT asserts) + set(APP_RESOURCES ${APP_RES_ROOT}/${PROJECT_NAME}.qrc) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED True) + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall ") +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index fc92bf3..f252860 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -25,7 +25,7 @@ set(APP_RESOURCES ../deepin-system-monitor-main/${APP_RES_ROOT}/${PROJECT_NAME}. + set(DESKTOP_FILE ${PROJECT_NAME}.desktop) + set(POLICY_FILE com.deepin.pkexec.${PROJECT_NAME}.policy) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED True) + + +-- +2.50.1 + diff --git a/deepin-system-monitor.spec b/deepin-system-monitor.spec index 9dd628d..58c914b 100644 --- a/deepin-system-monitor.spec +++ b/deepin-system-monitor.spec @@ -4,7 +4,7 @@ Name: deepin-system-monitor Version: 5.9.31 -Release: 3 +Release: 4 Summary: A more user-friendly system monitor License: GPLv3 URL: https://github.com/linuxdeepin/deepin-system-monitor @@ -13,6 +13,7 @@ Patch0: 0001-procps-ng-update-4.0.0.patch Patch1: 0002-Remove-all-symbol-table-and-relocation-information-f.patch Patch2: 0003-feat-add-build-option-to-disable-wayland-support.patch Patch3: 0001-fix-build-error.patch +Patch4: 0004-set-default-c++17.patch BuildRequires: qt5-devel BuildRequires: cmake @@ -117,6 +118,9 @@ fi %changelog +* Tue Aug 05 2025 pangqing - 5.9.31-4 +- set default c++17 + * Wed Sep 25 2024 songmingliang - 5.9.31-3 - delete redundant 0003-Fix-incomplete-display-of-the-system-monitor-when-th.patch -- Gitee