From 65fca179215e801a3a5db7b92768b8ea4dfbbfd0 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 13 May 2025 09:58:48 +0200
Subject: [PATCH] kio_extras_kf6, bump to 25.04.0 (#12366)

---
 ...3.recipe => kio_extras_kf6-25.04.0.recipe} |  6 ++--
 .../patches/kio_extras-24.12.3.patchset       | 32 -------------------
 2 files changed, 4 insertions(+), 34 deletions(-)
 rename kde-apps/kio-extras/{kio_extras_kf6-24.12.3.recipe => kio_extras_kf6-25.04.0.recipe} (97%)
 delete mode 100644 kde-apps/kio-extras/patches/kio_extras-24.12.3.patchset

diff --git a/kde-apps/kio-extras/kio_extras_kf6-24.12.3.recipe b/kde-apps/kio-extras/kio_extras_kf6-25.04.0.recipe
similarity index 97%
rename from kde-apps/kio-extras/kio_extras_kf6-24.12.3.recipe
rename to kde-apps/kio-extras/kio_extras_kf6-25.04.0.recipe
index 64f492c03..e840a02f6 100644
--- a/kde-apps/kio-extras/kio_extras_kf6-24.12.3.recipe
+++ b/kde-apps/kio-extras/kio_extras_kf6-25.04.0.recipe
@@ -14,9 +14,8 @@ COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kio-extras-$portVersion.tar.xz"
-CHECKSUM_SHA256="c4374fe36e87e7b0eb745a1bba8f4b066f58b84139f9cd7b42cab6711bfb6e2f"
+CHECKSUM_SHA256="7c87dc107ed375f5dfed74ffaf86a25990c131e539a4789b78ba70751b2fefac"
 SOURCE_DIR="kio-extras-$portVersion"
-PATCHES="kio_extras-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -135,6 +134,7 @@ BUILD_PREREQUIRES="
 
 PATCH()
 {
+	# disable docs generation
 	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
 	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
 }
@@ -162,8 +162,10 @@ INSTALL()
 {
 	make -C build install
 
+	# don't mess with shared_mime_info files
 	rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
 	rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces}
+	# cleanup
 	rm -rf $dataDir/applications
 
 	prepareInstalledDevelLib \
diff --git a/kde-apps/kio-extras/patches/kio_extras-24.12.3.patchset b/kde-apps/kio-extras/patches/kio_extras-24.12.3.patchset
deleted file mode 100644
index 0cf80948c..000000000
--- a/kde-apps/kio-extras/patches/kio_extras-24.12.3.patchset
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3a921cff2328f5f5222a7f6aa03a83c4b53b40e1 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 11 May 2022 10:49:55 +1000
-Subject: Disable shm for haiku
-
-
-diff --git a/thumbnail/thumbnail.cpp b/thumbnail/thumbnail.cpp
-index f58255b..7e2a9f2 100644
---- a/thumbnail/thumbnail.cpp
-+++ b/thumbnail/thumbnail.cpp
-@@ -17,7 +17,9 @@
- #include <windows.h>
- #else
- #include <sys/ipc.h>
-+#ifndef Q_OS_HAIKU
- #include <sys/shm.h>
-+#endif
- #include <unistd.h> // nice()
- #endif
- 
-@@ -297,7 +299,7 @@ KIO::WorkerResult ThumbnailProtocol::get(const QUrl &url)
-         // qDebug() << "IMAGE TO STREAM";
-         stream << img;
-     }
--#ifndef Q_OS_WIN
-+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
-     else {
-         // qDebug() << "IMAGE TO SHMID";
-         void *shmaddr = shmat(shmid.toInt(), nullptr, 0);
--- 
-2.48.1
-