diff --git a/0002-set-default-c++17.patch b/0002-set-default-c++17.patch new file mode 100644 index 0000000000000000000000000000000000000000..e63276c2ba20fb1382dea39ba6afd35108e38dd1 --- /dev/null +++ b/0002-set-default-c++17.patch @@ -0,0 +1,29 @@ +From 0204d399d6d088e9e0a786f3a80a8d9ecf23c5d9 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Mon, 4 Aug 2025 02:32:30 +0000 +Subject: [PATCH] set default c++17 + +--- + CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3e8e83..bcea752 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,11 +40,7 @@ set (BUILD_DOCS ON CACHE BOOL "Generate doxygen-based documentation") + set (BUILD_WITH_SYSTEMD OFF CACHE BOOL "Build with systemd") + + # CXX FILAGS +-if("${QT_VERSION_MAJOR}" STREQUAL "5") +- set(CMAKE_CXX_STANDARD 11) +-else() +- set(CMAKE_CXX_STANDARD 17) +-endif() ++set(CMAKE_CXX_STANDARD 17) + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) + endif() +-- +2.50.1 + diff --git a/dtkcore.spec b/dtkcore.spec index 333774c99531a95375d21613a7381b7b6f9b6d44..198a0f8145867bc9c2810017a9fe465536ce341e 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,13 +1,14 @@ %define __cmake_builddir $(pwd) Name: dtkcore Version: 5.6.8.2 -Release: 2%{?dist}.02 +Release: 2%{?dist}.03 Summary: Deepin tool kit core modules License: LGPL-3.0-or-later URL: https://github.com/linuxdeepin/dtkcore Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch0001: 0001-LSHW-returns-a-multi-element-array-when-querying-mem.patch +Patch0002: 0002-set-default-c++17.patch BuildRequires: gcc-c++ #BuildRequires: annobin @@ -78,6 +79,9 @@ export PATH=%{_qt5_bindir}:$PATH %changelog +* Mon Aug 04 2025 pangqing - 5.6.8.2-2.03 +- set default c++17 + * Tue Sep 24 2024 songmingliang - 5.6.8.2-2.02 - fix: make check license successfully