From 1409535dbc1e429312dd146e608b72ebd5e977a1 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 20 Aug 2025 07:46:53 +0200 Subject: [PATCH] dolphin_kf6, check Qt version for slice/sliced (#12789) --- kde-apps/dolphin/dolphin_kf6-25.08.0.recipe | 2 +- kde-apps/dolphin/patches/dolphin-25.08.0.patchset | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/kde-apps/dolphin/dolphin_kf6-25.08.0.recipe b/kde-apps/dolphin/dolphin_kf6-25.08.0.recipe index 042fe74da..cbdd56bb0 100644 --- a/kde-apps/dolphin/dolphin_kf6-25.08.0.recipe +++ b/kde-apps/dolphin/dolphin_kf6-25.08.0.recipe @@ -25,7 +25,7 @@ At first look, this is a simple file manager, but it has many talents. Some feat HOMEPAGE="https://userbase.kde.org/Dolphin" COPYRIGHT="2000-2025 KDE Organisation" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/dolphin-$portVersion.tar.xz" CHECKSUM_SHA256="ddd5e5622594792490695999188c6215c3a0821787c71dfb57dbfdd08e1ce935" SOURCE_DIR="dolphin-$portVersion" diff --git a/kde-apps/dolphin/patches/dolphin-25.08.0.patchset b/kde-apps/dolphin/patches/dolphin-25.08.0.patchset index d303f0f92..336852772 100644 --- a/kde-apps/dolphin/patches/dolphin-25.08.0.patchset +++ b/kde-apps/dolphin/patches/dolphin-25.08.0.patchset @@ -1,19 +1,22 @@ -From e0a33f4f7b5089fb82eeca1cc2f4262cdef42dc8 Mon Sep 17 00:00:00 2001 +From f91b67cd7b0e9ec3e52e4076bb1977e2bde17943 Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Sun, 17 Aug 2025 16:54:30 +0200 Subject: Fix Qt >= 6.8 error diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp -index b702f5b..e81b3b1 100644 +index b702f5b..1ed8578 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp -@@ -2247,7 +2247,7 @@ void DolphinView::applyDynamicView() +@@ -2247,7 +2247,11 @@ void DolphinView::applyDynamicView() for (const auto &file : itemList) { ++checkedItems; -- const QString type = file.mimetype().slice(0, 5); ++#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) + const QString type = file.mimetype().slice(0, 5); ++#else + const QString type = file.mimetype().sliced(0, 5); ++#endif if (type == "image" || type == "video") { ++imageAndVideoCount;