diff --git a/dtkcore-force-c++-17.patch b/dtkcore-force-c++-17.patch new file mode 100644 index 0000000000000000000000000000000000000000..8d4f647b1f634a02b5b1b15c4cff9c620080504d --- /dev/null +++ b/dtkcore-force-c++-17.patch @@ -0,0 +1,95 @@ +diff -Naur dtkcore-5.5.35.org/examples/dasync-example/dasync-example.pro dtkcore-5.5.35/examples/dasync-example/dasync-example.pro +--- dtkcore-5.5.35.org/examples/dasync-example/dasync-example.pro 2022-11-24 13:50:12.000000000 +0800 ++++ dtkcore-5.5.35/examples/dasync-example/dasync-example.pro 2025-06-05 17:17:45.918089276 +0800 +@@ -7,7 +7,7 @@ + INCLUDEPATH += . + QT+= core widgets testlib + +-CONFIG += c++11 ++CONFIG += c++17 + # The following define makes your compiler warn you if you use any + # feature of Qt which has been marked as deprecated (the exact warnings + # depend on your compiler). Please consult the documentation of the +diff -Naur dtkcore-5.5.35.org/tests/ddesktopentry/ddesktopentry.pro dtkcore-5.5.35/tests/ddesktopentry/ddesktopentry.pro +--- dtkcore-5.5.35.org/tests/ddesktopentry/ddesktopentry.pro 2022-11-24 13:50:12.000000000 +0800 ++++ dtkcore-5.5.35/tests/ddesktopentry/ddesktopentry.pro 2025-06-05 17:18:26.479643537 +0800 +@@ -3,7 +3,7 @@ + + TARGET = tst_ddesktopentrytest + TEMPLATE = app +-CONFIG += c++11 ++CONFIG += c++17 + CONFIG -= app_bundle + + !isEmpty(DTK_STATIC_LIB){ +diff -Naur dtkcore-5.5.35.org/tests/dthreadutils/dthreadutils.pro dtkcore-5.5.35/tests/dthreadutils/dthreadutils.pro +--- dtkcore-5.5.35.org/tests/dthreadutils/dthreadutils.pro 2022-11-24 13:50:12.000000000 +0800 ++++ dtkcore-5.5.35/tests/dthreadutils/dthreadutils.pro 2025-06-05 17:18:34.027733647 +0800 +@@ -2,7 +2,7 @@ + QT -= gui + + TEMPLATE = app +-CONFIG += c++11 ++CONFIG += c++17 + + !isEmpty(DTK_STATIC_LIB){ + DEFINES += DTK_STATIC_LIB +diff -Naur dtkcore-5.5.35.org/tests/dutils/dutils.pro dtkcore-5.5.35/tests/dutils/dutils.pro +--- dtkcore-5.5.35.org/tests/dutils/dutils.pro 2022-11-24 13:50:12.000000000 +0800 ++++ dtkcore-5.5.35/tests/dutils/dutils.pro 2025-06-05 17:18:44.652019913 +0800 +@@ -2,7 +2,7 @@ + QT -= gui + + TEMPLATE = app +-CONFIG += c++11 ++CONFIG += c++17 + + !isEmpty(DTK_STATIC_LIB){ + DEFINES += DTK_STATIC_LIB +diff -Naur dtkcore-5.5.35.org/tests/dvtablehook/dvtablehook.pro dtkcore-5.5.35/tests/dvtablehook/dvtablehook.pro +--- dtkcore-5.5.35.org/tests/dvtablehook/dvtablehook.pro 2022-11-24 13:50:12.000000000 +0800 ++++ dtkcore-5.5.35/tests/dvtablehook/dvtablehook.pro 2025-06-05 17:18:52.053436743 +0800 +@@ -2,7 +2,7 @@ + QT -= gui + + TEMPLATE = app +-CONFIG += c++11 ++CONFIG += c++17 + + # TODO: vtabhook release test failed + QMAKE_CXXFLAGS_RELEASE -= -O2 +diff -Naur dtkcore-5.5.35.org/tests/tests.pro dtkcore-5.5.35/tests/tests.pro +--- dtkcore-5.5.35.org/tests/tests.pro 2022-11-24 13:50:12.000000000 +0800 ++++ dtkcore-5.5.35/tests/tests.pro 2025-06-05 17:18:09.945710085 +0800 +@@ -1,6 +1,6 @@ + TEMPLATE = app + QT += core dbus xml testlib concurrent +-CONFIG += thread c++11 link_pkgconfig ++CONFIG += thread c++17 link_pkgconfig + CONFIG -= app_bundle + + QMAKE_LFLAGS += -Wl,--export-dynamic +diff -Naur dtkcore-5.5.35.org/tools/qdbusxml2cpp/qdbusxml2cpp.pro dtkcore-5.5.35/tools/qdbusxml2cpp/qdbusxml2cpp.pro +--- dtkcore-5.5.35.org/tools/qdbusxml2cpp/qdbusxml2cpp.pro 2022-11-24 13:50:12.000000000 +0800 ++++ dtkcore-5.5.35/tools/qdbusxml2cpp/qdbusxml2cpp.pro 2025-06-05 17:18:55.353403155 +0800 +@@ -2,7 +2,7 @@ + + TEMPLATE = app + QT += core dbus-private dbus +-CONFIG += c++11 ++CONFIG += c++17 + + SOURCES += qdbusxml2cpp.cpp + +diff -Naur dtkcore-5.5.35.org/tools/settings/settings.pro dtkcore-5.5.35/tools/settings/settings.pro +--- dtkcore-5.5.35.org/tools/settings/settings.pro 2022-11-24 13:50:12.000000000 +0800 ++++ dtkcore-5.5.35/tools/settings/settings.pro 2025-06-05 17:19:00.015490119 +0800 +@@ -1,7 +1,7 @@ + QT += core xml + QT -= gui + +-CONFIG += c++11 ++CONFIG += c++17 + + TARGET = dtk-settings + CONFIG += console link_pkgconfig diff --git a/dtkcore.spec b/dtkcore.spec index 2f81fe6d34e31238a2a853fd1d0a310b0bf59548..a4c3c8895e7e0d4ee3f2639e748569404f9125d2 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,10 +1,11 @@ Name: dtkcore Version: 5.5.35 -Release: 1 +Release: 2 Summary: Deepin tool kit core modules License: LGPLv3+ URL: https://github.com/linuxdeepin/dtkcore Source0: %{name}-%{version}.tar.gz +Patch0: dtkcore-force-c++-17.patch BuildRequires: gcc-c++ #BuildRequires: annobin @@ -73,6 +74,9 @@ export PATH=%{_qt5_bindir}:$PATH %{_libdir}/lib%{name}.so %changelog +* Thu Jun 05 2025 Zijian Li - 5.5.35-2 +- force c++ 17 for newer version of gtest + * Mon Jul 24 2023 leeffo - 5.5.35-1 - update: upgrade to version 5.5.35