From f5fe637f79d80ac8c8bb59a6badee356bed5289c Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 25 Apr 2025 07:30:17 +0000
Subject: [PATCH] dolphin_kf6, bump to 25.04.0 (#12244)

---
 ...12.3.recipe => dolphin_kf6-25.04.0.recipe} | 16 ++++++------
 ...12.3.patchset => dolphin-25.04.0.patchset} | 25 -------------------
 2 files changed, 7 insertions(+), 34 deletions(-)
 rename kde-apps/dolphin/{dolphin_kf6-24.12.3.recipe => dolphin_kf6-25.04.0.recipe} (96%)
 rename kde-apps/dolphin/patches/{dolphin-24.12.3.patchset => dolphin-25.04.0.patchset} (75%)

diff --git a/kde-apps/dolphin/dolphin_kf6-24.12.3.recipe b/kde-apps/dolphin/dolphin_kf6-25.04.0.recipe
similarity index 96%
rename from kde-apps/dolphin/dolphin_kf6-24.12.3.recipe
rename to kde-apps/dolphin/dolphin_kf6-25.04.0.recipe
index 00d744d8b..324802acd 100644
--- a/kde-apps/dolphin/dolphin_kf6-24.12.3.recipe
+++ b/kde-apps/dolphin/dolphin_kf6-25.04.0.recipe
@@ -23,11 +23,11 @@ At first look, this is a simple file manager, but it has many talents. Some feat
 * Add a terminal in the directory you are currently browsing
 * Many functions controlled by keyboard shortcuts"
 HOMEPAGE="https://userbase.kde.org/Dolphin"
-COPYRIGHT="2000-2025 KDE"
+COPYRIGHT="2000-2025 KDE Organisation"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/dolphin-$portVersion.tar.xz"
-CHECKSUM_SHA256="0bcefb5c6eadddb867924e9052d5431c5b7c98aa4022c3fa2ca16d5b6515b0f0"
+CHECKSUM_SHA256="8997ec04ef12af22647dfef67b15ea8f1304f7ae076c7b8fd53184a55a012a18"
 SOURCE_DIR="dolphin-$portVersion"
 PATCHES="dolphin-$portVersion.patchset"
 ADDITIONAL_FILES="dolphin.rdef.in"
@@ -57,12 +57,12 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	dbus$secondaryArchSuffix
 #	cmd:dbus_launch$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
 	lib:libKF6BalooWidgets$secondaryArchSuffix
 	lib:libphonon4Qt6$secondaryArchSuffix
 	lib:libphonon4Qt6experimental$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	# KF6
-	lib:libGL$secondaryArchSuffix
 	lib:libKF6Archive$secondaryArchSuffix
 	lib:libKF6Attica$secondaryArchSuffix
 	lib:libKF6AuthCore$secondaryArchSuffix
@@ -171,12 +171,10 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
-
 PATCH()
 {
-	# disable docs
-	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
-	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
+	# use Haiku's icon theme
+	sed -e 's,\    KIconTheme::initTheme();,\//    KIconTheme::initTheme();,g' -i src/main.cpp
 }
 
 BUILD()
@@ -191,12 +189,12 @@ BUILD()
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
 
-	make -Cbuild $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make -Cbuild install
+	make -C build install
 
 	# cleanup
 	rm -rf $libDir/systemd
diff --git a/kde-apps/dolphin/patches/dolphin-24.12.3.patchset b/kde-apps/dolphin/patches/dolphin-25.04.0.patchset
similarity index 75%
rename from kde-apps/dolphin/patches/dolphin-24.12.3.patchset
rename to kde-apps/dolphin/patches/dolphin-25.04.0.patchset
index 1abf3a76c..9a7ee29b2 100644
--- a/kde-apps/dolphin/patches/dolphin-24.12.3.patchset
+++ b/kde-apps/dolphin/patches/dolphin-25.04.0.patchset
@@ -38,28 +38,3 @@ index 02fe3e3..63303a2 100644
 -- 
 2.48.1
 
-
-From 7181b5f1bac949f36e06597300fd24a88ec152d5 Mon Sep 17 00:00:00 2001
-From: Schrijvers Luc <begasus@gmail.com>
-Date: Thu, 26 Dec 2024 19:42:25 +0100
-Subject: Use Haiku icons
-
-
-diff --git a/src/main.cpp b/src/main.cpp
-index f811c4f..c6826e8 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -69,8 +69,10 @@ int main(int argc, char **argv)
-     /**
-      * trigger initialisation of proper icon theme
-      */
-+#ifndef Q_OS_HAIKU
- #if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0)
-     KIconTheme::initTheme();
-+#endif
- #endif
- 
-     QApplication app(argc, argv);
--- 
-2.48.1
-