From c171c3d93aa06a805b5ee39e9c3d18edfbccf9f1 Mon Sep 17 00:00:00 2001 From: pangqing Date: Fri, 1 Aug 2025 10:55:56 +0800 Subject: [PATCH] rebuild Signed-off-by: pangqing --- dtkcore-force-c++-17.patch | 52 ++++++++++++++++++++++++++++++++++++++ dtkcore.spec | 6 ++++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 dtkcore-force-c++-17.patch diff --git a/dtkcore-force-c++-17.patch b/dtkcore-force-c++-17.patch new file mode 100644 index 0000000..f877d04 --- /dev/null +++ b/dtkcore-force-c++-17.patch @@ -0,0 +1,52 @@ +From a317d363be8358282cc63fd3190cb3051905b080 Mon Sep 17 00:00:00 2001 +From: pangqing +Date: Fri, 1 Aug 2025 11:22:37 +0800 +Subject: [PATCH] dtkcore force c++-17 + +--- + tools/dci/dci.pro | 2 +- + tools/qdbusxml2cpp/qdbusxml2cpp.pro | 2 +- + tools/settings/settings.pro | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/dci/dci.pro b/tools/dci/dci.pro +index 934d632..ab6a384 100644 +--- a/tools/dci/dci.pro ++++ b/tools/dci/dci.pro +@@ -1,6 +1,6 @@ + QT -= gui + +-CONFIG += c++11 console ++CONFIG += c++17 console + CONFIG -= app_bundle + + # You can make your code fail to compile if it uses deprecated APIs. +diff --git a/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/tools/qdbusxml2cpp/qdbusxml2cpp.pro +index e1e2b71..1c34b05 100644 +--- a/tools/qdbusxml2cpp/qdbusxml2cpp.pro ++++ b/tools/qdbusxml2cpp/qdbusxml2cpp.pro +@@ -2,7 +2,7 @@ TARGET = qdbusxml2cpp-fix + + TEMPLATE = app + QT += core dbus-private dbus +-CONFIG += c++11 ++CONFIG += c++17 + + SOURCES += qdbusxml2cpp.cpp + +diff --git a/tools/settings/settings.pro b/tools/settings/settings.pro +index 21784c1..6a2a0c6 100644 +--- a/tools/settings/settings.pro ++++ b/tools/settings/settings.pro +@@ -1,7 +1,7 @@ + QT += core xml + QT -= gui + +-CONFIG += c++11 ++CONFIG += c++17 + + TARGET = dtk-settings + CONFIG += console link_pkgconfig +-- +2.43.5 + diff --git a/dtkcore.spec b/dtkcore.spec index 333774c..7c4fff2 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: dtkcore-force-c++-17.patch BuildRequires: gcc-c++ #BuildRequires: annobin @@ -78,6 +79,9 @@ export PATH=%{_qt5_bindir}:$PATH %changelog +* Fri Aug 01 2025 pangqing - 5.6.8.2-2.03 +- rebuild + * Tue Sep 24 2024 songmingliang - 5.6.8.2-2.02 - fix: make check license successfully -- Gitee