diff --git a/0003-set-default-c++17.patch b/0003-set-default-c++17.patch new file mode 100644 index 0000000000000000000000000000000000000000..896a308e7f64cd06d83609d5f69b63bfcfc40bcf --- /dev/null +++ b/0003-set-default-c++17.patch @@ -0,0 +1,277 @@ +From 744548618fb8e7b6e69daf6612e46581a12bd074 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Tue, 5 Aug 2025 08:54:42 +0000 +Subject: [PATCH] set default c++17 + +--- + .../dde-advanced-property-plugin.pro | 2 +- + src/dde-desktop/dde-desktop.pri | 2 +- + src/dde-desktop/dde-desktop.pro | 2 +- + src/dde-dock-plugins/disk-mount/disk-mount.pro | 2 +- + src/dde-file-manager-daemon/dde-file-manager-daemon.pro | 2 +- + src/dde-file-manager-lib/dde-file-manager-lib.pro | 2 +- + .../ImageMenuPlugin/ImageMenuPlugin.pro | 2 +- + .../dde-eetrust-emblem-plugin/dde-eetrust-emblem-plugin.pro | 2 +- + .../dde-image-preview-plugin/dde-image-preview-plugin.pro | 2 +- + .../dde-music-preview-plugin/dde-music-preview-plugin.pro | 2 +- + .../dde-pdf-preview-plugin/dde-pdf-preview-plugin.pro | 2 +- + .../dde-text-preview-plugin/dde-text-preview-plugin.pro | 2 +- + .../dde-video-preview-plugin/dde-video-preview-plugin.pro | 2 +- + src/dde-file-manager-plugins/pluginView/pluginView.pro | 2 +- + src/dde-file-manager-plugins/showfile/showfile.pro | 2 +- + src/dde-file-manager/dde-file-manager.pro | 2 +- + src/dde-select-dialog-wayland/dde-select-dialog-wayland.pro | 2 +- + src/dde-select-dialog-x11/dde-select-dialog-x11.pro | 2 +- + .../dde-anythingmonitor/dde-anythingmonitor.pro | 2 +- + 19 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/src/dde-advanced-property-plugin/dde-advanced-property-plugin.pro b/src/dde-advanced-property-plugin/dde-advanced-property-plugin.pro +index 41fb431..39c71fb 100644 +--- a/src/dde-advanced-property-plugin/dde-advanced-property-plugin.pro ++++ b/src/dde-advanced-property-plugin/dde-advanced-property-plugin.pro +@@ -8,7 +8,7 @@ QT += core gui widgets + + TARGET = dde-advanced-property-plugin + TEMPLATE = lib +-CONFIG += plugin c++11 ++CONFIG += plugin c++17 + + PLUGIN_INSTALL_DIR = $$PLUGINDIR/menu + message($$PLUGIN_INSTALL_DIR) +diff --git a/src/dde-desktop/dde-desktop.pri b/src/dde-desktop/dde-desktop.pri +index a9c22fe..46bedcf 100644 +--- a/src/dde-desktop/dde-desktop.pri ++++ b/src/dde-desktop/dde-desktop.pri +@@ -13,7 +13,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + greaterThan(QT_MINOR_VERSION, 7): QT += gui-private + else: QT += platformsupport-private + +-CONFIG += c++11 link_pkgconfig ++CONFIG += c++17 link_pkgconfig + PKGCONFIG += xcb xcb-ewmh xcb-shape dframeworkdbus gio-qt + + INCLUDEPATH += $$PWD/../dde-file-manager-lib\ +diff --git a/src/dde-desktop/dde-desktop.pro b/src/dde-desktop/dde-desktop.pro +index 2a482f7..46134c4 100644 +--- a/src/dde-desktop/dde-desktop.pro ++++ b/src/dde-desktop/dde-desktop.pro +@@ -33,7 +33,7 @@ else: QT += platformsupport-private + TEMPLATE = app + TARGET = dde-desktop + DESTDIR = $$BUILD_DIST +-CONFIG += c++11 link_pkgconfig ++CONFIG += c++17 link_pkgconfig + PKGCONFIG += xcb xcb-ewmh xcb-shape dframeworkdbus gio-qt + + INCLUDEPATH += $$PWD/../dde-file-manager-lib\ +diff --git a/src/dde-dock-plugins/disk-mount/disk-mount.pro b/src/dde-dock-plugins/disk-mount/disk-mount.pro +index 135e85e..7af85fd 100644 +--- a/src/dde-dock-plugins/disk-mount/disk-mount.pro ++++ b/src/dde-dock-plugins/disk-mount/disk-mount.pro +@@ -1,7 +1,7 @@ + PREFIX = /usr + QT += core widgets concurrent dbus + TEMPLATE = lib +-CONFIG += plugin c++11 link_pkgconfig ++CONFIG += plugin c++17 link_pkgconfig + PKGCONFIG += dtkwidget gio-qt udisks2-qt5 + + INCLUDEPATH += /usr/include/dde-dock +diff --git a/src/dde-file-manager-daemon/dde-file-manager-daemon.pro b/src/dde-file-manager-daemon/dde-file-manager-daemon.pro +index 6eea22b..f80c031 100644 +--- a/src/dde-file-manager-daemon/dde-file-manager-daemon.pro ++++ b/src/dde-file-manager-daemon/dde-file-manager-daemon.pro +@@ -18,7 +18,7 @@ CONFIG(release, release|debug) { + } else { + PKGCONFIG += dtkwidget + } +-CONFIG += c++11 link_pkgconfig ++CONFIG += c++17 link_pkgconfig + + LIBS += -L$$OUT_PWD/../dde-file-manager-lib -ldde-file-manager -lKF5Codecs \ + -L$$OUT_PWD/../dde-file-manager-extension -ldfm-extension +diff --git a/src/dde-file-manager-lib/dde-file-manager-lib.pro b/src/dde-file-manager-lib/dde-file-manager-lib.pro +index 8b9235b..749c09a 100644 +--- a/src/dde-file-manager-lib/dde-file-manager-lib.pro ++++ b/src/dde-file-manager-lib/dde-file-manager-lib.pro +@@ -35,7 +35,7 @@ isEmpty(PREFIX){ + PREFIX = /usr + } + +-CONFIG += c++11 link_pkgconfig ++CONFIG += c++17 link_pkgconfig + PKGCONFIG += libsecret-1 gio-unix-2.0 poppler-cpp dtkwidget dtkgui udisks2-qt5 disomaster gio-qt libcrypto Qt5Xdg dframeworkdbus polkit-agent-1 polkit-qt5-1 + #DEFINES += QT_NO_DEBUG_OUTPUT + DEFINES += QT_MESSAGELOGCONTEXT +diff --git a/src/dde-file-manager-plugins/ImageMenuPlugin/ImageMenuPlugin.pro b/src/dde-file-manager-plugins/ImageMenuPlugin/ImageMenuPlugin.pro +index 6307f6f..dc80b9a 100644 +--- a/src/dde-file-manager-plugins/ImageMenuPlugin/ImageMenuPlugin.pro ++++ b/src/dde-file-manager-plugins/ImageMenuPlugin/ImageMenuPlugin.pro +@@ -9,7 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + + TARGET = ImageMenuPlugin + TEMPLATE = lib +-CONFIG += plugin c++11 ++CONFIG += plugin c++17 + + include(../../common/common.pri) + include(../plugininterfaces/plugininterfaces.pri) +diff --git a/src/dde-file-manager-plugins/pluginEmblem/dde-eetrust-emblem-plugin/dde-eetrust-emblem-plugin.pro b/src/dde-file-manager-plugins/pluginEmblem/dde-eetrust-emblem-plugin/dde-eetrust-emblem-plugin.pro +index 6827281..f4ec8a6 100644 +--- a/src/dde-file-manager-plugins/pluginEmblem/dde-eetrust-emblem-plugin/dde-eetrust-emblem-plugin.pro ++++ b/src/dde-file-manager-plugins/pluginEmblem/dde-eetrust-emblem-plugin/dde-eetrust-emblem-plugin.pro +@@ -3,7 +3,7 @@ QT += core + TARGET = dde-eetrust-emblem-plugin + TEMPLATE = lib + +-CONFIG += plugin c++11 link_pkgconfig ++CONFIG += plugin c++17 link_pkgconfig + PKGCONFIG += dtkcore + + include(../../../common/common.pri) +diff --git a/src/dde-file-manager-plugins/pluginPreview/dde-image-preview-plugin/dde-image-preview-plugin.pro b/src/dde-file-manager-plugins/pluginPreview/dde-image-preview-plugin/dde-image-preview-plugin.pro +index 9e6ebcd..dd761b0 100644 +--- a/src/dde-file-manager-plugins/pluginPreview/dde-image-preview-plugin/dde-image-preview-plugin.pro ++++ b/src/dde-file-manager-plugins/pluginPreview/dde-image-preview-plugin/dde-image-preview-plugin.pro +@@ -9,7 +9,7 @@ QT += widgets + TARGET = dde-image-preview-plugin + TEMPLATE = lib + +-CONFIG += plugin c++11 link_pkgconfig ++CONFIG += plugin c++17 link_pkgconfig + PKGCONFIG += dtkwidget dtkgui + + include(../../../common/common.pri) +diff --git a/src/dde-file-manager-plugins/pluginPreview/dde-music-preview-plugin/dde-music-preview-plugin.pro b/src/dde-file-manager-plugins/pluginPreview/dde-music-preview-plugin/dde-music-preview-plugin.pro +index f2543e7..d61bbe5 100644 +--- a/src/dde-file-manager-plugins/pluginPreview/dde-music-preview-plugin/dde-music-preview-plugin.pro ++++ b/src/dde-file-manager-plugins/pluginPreview/dde-music-preview-plugin/dde-music-preview-plugin.pro +@@ -11,7 +11,7 @@ TEMPLATE = lib + + PKGCONFIG += taglib + +-CONFIG += c++11 plugin link_pkgconfig ++CONFIG += c++17 plugin link_pkgconfig + + include(../../../common/common.pri) + include(dde-music-preview-plugin.pri) +diff --git a/src/dde-file-manager-plugins/pluginPreview/dde-pdf-preview-plugin/dde-pdf-preview-plugin.pro b/src/dde-file-manager-plugins/pluginPreview/dde-pdf-preview-plugin/dde-pdf-preview-plugin.pro +index fe27db5..4ad42a6 100644 +--- a/src/dde-file-manager-plugins/pluginPreview/dde-pdf-preview-plugin/dde-pdf-preview-plugin.pro ++++ b/src/dde-file-manager-plugins/pluginPreview/dde-pdf-preview-plugin/dde-pdf-preview-plugin.pro +@@ -11,7 +11,7 @@ TEMPLATE = lib + + PKGCONFIG += poppler-cpp + +-CONFIG += c++11 plugin link_pkgconfig ++CONFIG += c++17 plugin link_pkgconfig + + include(../../../common/common.pri) + include(dde-pdf-preview-plugin.pri) +diff --git a/src/dde-file-manager-plugins/pluginPreview/dde-text-preview-plugin/dde-text-preview-plugin.pro b/src/dde-file-manager-plugins/pluginPreview/dde-text-preview-plugin/dde-text-preview-plugin.pro +index 16064fe..54cd773 100644 +--- a/src/dde-file-manager-plugins/pluginPreview/dde-text-preview-plugin/dde-text-preview-plugin.pro ++++ b/src/dde-file-manager-plugins/pluginPreview/dde-text-preview-plugin/dde-text-preview-plugin.pro +@@ -8,7 +8,7 @@ QT += core gui widgets + + TARGET = dde-text-preview-plugin + TEMPLATE = lib +-CONFIG += c++11 plugin ++CONFIG += c++17 plugin + + include(../../../common/common.pri) + include(dde-text-preview-plugin.pri) +diff --git a/src/dde-file-manager-plugins/pluginPreview/dde-video-preview-plugin/dde-video-preview-plugin.pro b/src/dde-file-manager-plugins/pluginPreview/dde-video-preview-plugin/dde-video-preview-plugin.pro +index 7b0a9a2..4968023 100644 +--- a/src/dde-file-manager-plugins/pluginPreview/dde-video-preview-plugin/dde-video-preview-plugin.pro ++++ b/src/dde-file-manager-plugins/pluginPreview/dde-video-preview-plugin/dde-video-preview-plugin.pro +@@ -10,7 +10,7 @@ TARGET = dde-video-preview-plugin + TEMPLATE = lib + + PKGCONFIG += libdmr dtkgui +-CONFIG += plugin link_pkgconfig c++11 ++CONFIG += plugin link_pkgconfig c++17 + + include(../../../common/common.pri) + include(dde-video-preview-plugin.pri) +diff --git a/src/dde-file-manager-plugins/pluginView/pluginView.pro b/src/dde-file-manager-plugins/pluginView/pluginView.pro +index 8c9f987..d36d5cf 100644 +--- a/src/dde-file-manager-plugins/pluginView/pluginView.pro ++++ b/src/dde-file-manager-plugins/pluginView/pluginView.pro +@@ -9,7 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + + TARGET = pluginView + TEMPLATE = lib +-CONFIG += c++11 plugin ++CONFIG += c++17 plugin + + include(../../common/common.pri) + include(../plugininterfaces/plugininterfaces.pri) +diff --git a/src/dde-file-manager-plugins/showfile/showfile.pro b/src/dde-file-manager-plugins/showfile/showfile.pro +index 1661021..78a6ccf 100644 +--- a/src/dde-file-manager-plugins/showfile/showfile.pro ++++ b/src/dde-file-manager-plugins/showfile/showfile.pro +@@ -9,7 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + + TARGET = showfile + TEMPLATE = lib +-CONFIG += c++11 plugin ++CONFIG += c++17 plugin + + include(../../common/common.pri) + include(../plugininterfaces/plugininterfaces.pri) +diff --git a/src/dde-file-manager/dde-file-manager.pro b/src/dde-file-manager/dde-file-manager.pro +index 21b4132..899f192 100644 +--- a/src/dde-file-manager/dde-file-manager.pro ++++ b/src/dde-file-manager/dde-file-manager.pro +@@ -14,7 +14,7 @@ isEmpty(TARGET) { + } + + TEMPLATE = app +-CONFIG += c++11 link_pkgconfig ++CONFIG += c++17 link_pkgconfig + PKGCONFIG += gio-unix-2.0 + CONFIG(release, release|debug) { + PKGCONFIG += dtkwidget +diff --git a/src/dde-select-dialog-wayland/dde-select-dialog-wayland.pro b/src/dde-select-dialog-wayland/dde-select-dialog-wayland.pro +index 1769f81..c8dfb99 100755 +--- a/src/dde-select-dialog-wayland/dde-select-dialog-wayland.pro ++++ b/src/dde-select-dialog-wayland/dde-select-dialog-wayland.pro +@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + TARGET = dde-select-dialog-wayland + TEMPLATE = app + +-CONFIG += c++11 link_pkgconfig ++CONFIG += c++17 link_pkgconfig + PKGCONFIG += dtkwidget dtkgui dtkcore + + include($$PWD/../dde-desktop/dbus/filedialog/selectdialog.pri) +diff --git a/src/dde-select-dialog-x11/dde-select-dialog-x11.pro b/src/dde-select-dialog-x11/dde-select-dialog-x11.pro +index 967eb65..0a2a230 100755 +--- a/src/dde-select-dialog-x11/dde-select-dialog-x11.pro ++++ b/src/dde-select-dialog-x11/dde-select-dialog-x11.pro +@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + TARGET = dde-select-dialog-x11 + TEMPLATE = app + +-CONFIG += c++11 link_pkgconfig ++CONFIG += c++17 link_pkgconfig + PKGCONFIG += dtkwidget dtkgui dtkcore + + include($$PWD/../dde-desktop/dbus/filedialog/selectdialog.pri) +diff --git a/src/deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro b/src/deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro +index e371abe..9d6f8ec 100644 +--- a/src/deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro ++++ b/src/deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro +@@ -13,7 +13,7 @@ QT += core \ + dbus \ + concurrent + +-CONFIG += c++11 \ ++CONFIG += c++17 \ + console \ + link_pkgconfig \ + plugin +-- +2.50.1 + diff --git a/dde-file-manager.spec b/dde-file-manager.spec index 9c81ab339905dabbe8144b6864c514f222107d4f..228bcdee8fe6b609e455e1025fa0d6bc8a407988 100644 --- a/dde-file-manager.spec +++ b/dde-file-manager.spec @@ -1,7 +1,7 @@ %undefine _lto_cflags Name: dde-file-manager Version: 5.7.8.1 -Release: 5 +Release: 6 Summary: Deepin File Manager License: GPLv3 URL: https://github.com/linuxdeepin/dde-file-manager @@ -9,6 +9,7 @@ Source0: %{name}_%{version}.orig.tar.xz Patch0: 0001-hide-authorized-watermask.patch Patch1: 0002-fix-undefined-std-array.patch Patch2: 0001-fix-build-error.patch +Patch3: 0003-set-default-c++17.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -237,7 +238,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dde-home.desktop ||: %{_datadir}/dbus-1/services/com.deepin.dde.desktop.service %changelog -* Thue Mar 13 2025 pangqing - 5.7.8.1-5 +* Tue Aug 05 2025 pangqing - 5.7.8.1-6 +- set default c++17 + +* Thu Mar 13 2025 pangqing - 5.7.8.1-5 - fix dde desktop black screen problem * Tue Sep 23 2024 misaka00251 - 5.7.8.1-4