From e282e544d889a4388a322212a12a770eb33dfeae Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 14 Mar 2025 15:10:35 +0000 Subject: [PATCH] kio_extras_kf6, bump to 24.12.3 (#11975) --- ...0.recipe => kio_extras_kf6-24.12.3.recipe} | 23 ++-- .../patches/kio_extras-24.12.0.patchset | 100 ------------------ .../patches/kio_extras-24.12.3.patchset | 32 ++++++ 3 files changed, 45 insertions(+), 110 deletions(-) rename kde-apps/kio-extras/{kio_extras24-24.12.0.recipe => kio_extras_kf6-24.12.3.recipe} (90%) delete mode 100644 kde-apps/kio-extras/patches/kio_extras-24.12.0.patchset create mode 100644 kde-apps/kio-extras/patches/kio_extras-24.12.3.patchset diff --git a/kde-apps/kio-extras/kio_extras24-24.12.0.recipe b/kde-apps/kio-extras/kio_extras_kf6-24.12.3.recipe similarity index 90% rename from kde-apps/kio-extras/kio_extras24-24.12.0.recipe rename to kde-apps/kio-extras/kio_extras_kf6-24.12.3.recipe index 5a45e276d..64f492c03 100644 --- a/kde-apps/kio-extras/kio_extras24-24.12.0.recipe +++ b/kde-apps/kio-extras/kio_extras_kf6-24.12.3.recipe @@ -10,11 +10,11 @@ This package also supports the following protocols: * sftp * smb" HOMEPAGE="https://invent.kde.org/network/kio-extras/" -COPYRIGHT="2010-2024 KDE Organisation" +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="5131e77f3771320d65cde43cef6fd3eb9d59bf551cad6e90753b354ff15df2c4" +CHECKSUM_SHA256="c4374fe36e87e7b0eb745a1bba8f4b066f58b84139f9cd7b42cab6711bfb6e2f" SOURCE_DIR="kio-extras-$portVersion" PATCHES="kio_extras-$portVersion.patchset" @@ -25,7 +25,7 @@ libVersion="6.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - kio_extras24$secondaryArchSuffix = $portVersion + kio_extras_kf6$secondaryArchSuffix = $portVersion lib:libkioarchive6$secondaryArchSuffix = $libVersionCompat " REQUIRES=" @@ -68,20 +68,23 @@ REQUIRES=" lib:libQt6Widgets$secondaryArchSuffix lib:libQt6Xml$secondaryArchSuffix " +REPLACES=" + kio_extras24$secondaryArchSuffix + " PROVIDES_devel=" - kio_extras24${secondaryArchSuffix}_devel = $portVersion + kio_extras_kf6${secondaryArchSuffix}_devel = $portVersion devel:libkioarchive6$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - kio_extras24$secondaryArchSuffix == $portVersion base + kio_extras_kf6$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel -# kdsoap_ws_discovery_client_qt6${secondaryArchSuffix}_devel + kdsoap_ws_discovery_client_qt6${secondaryArchSuffix}_devel # devel:libdeflate$secondaryArchSuffix -# devel:libkdsoap_qt6$secondaryArchSuffix + devel:libkdsoap_qt6$secondaryArchSuffix devel:libIex_3_2$secondaryArchSuffix devel:libIlmThread_3_2$secondaryArchSuffix devel:libImath_3_1$secondaryArchSuffix @@ -94,10 +97,10 @@ BUILD_REQUIRES=" # devel:libsmbclient$secondaryArchSuffix devel:libssh$secondaryArchSuffix devel:libtag$secondaryArchSuffix -# devel:libxml2$secondaryArchSuffix -# devel:libz$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix # KF6 - extra_cmake_modules$secondaryArchSuffix >= 6.0.0 + extra_cmake_modules$secondaryArchSuffix devel:libKF6Archive$secondaryArchSuffix devel:libKF6Codecs$secondaryArchSuffix devel:libKF6ConfigCore$secondaryArchSuffix diff --git a/kde-apps/kio-extras/patches/kio_extras-24.12.0.patchset b/kde-apps/kio-extras/patches/kio_extras-24.12.0.patchset deleted file mode 100644 index aaeb533c7..000000000 --- a/kde-apps/kio-extras/patches/kio_extras-24.12.0.patchset +++ /dev/null @@ -1,100 +0,0 @@ -From 20f3d887120518c5f34d9dde1f62f4f1282a09fe 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 5e5f708..d77882d 100644 ---- a/thumbnail/thumbnail.cpp -+++ b/thumbnail/thumbnail.cpp -@@ -17,7 +17,9 @@ - #include - #else - #include -+#ifndef Q_OS_HAIKU - #include -+#endif - #include // 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.45.2 - - -From a61d9b3f15f9ea7fa3408b2d6f70d6b5d4de88c6 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 11 May 2022 10:50:23 +1000 -Subject: Disable smbclient notify - - -diff --git a/smb/kded/notifier.cpp b/smb/kded/notifier.cpp -index cb11a2d..fec7f03 100644 ---- a/smb/kded/notifier.cpp -+++ b/smb/kded/notifier.cpp -@@ -97,12 +97,14 @@ public: - if (m_url.isEmpty()) { - return; - } -+#ifndef Q_OS_HAIKU - if (action == SMBC_NOTIFY_ACTION_OLD_NAME && url == m_url) { - qCDebug(KIO_SMB_LOG) << "Discarding pending remove because it was followed by a move from the same url" << m_url; - resetWithLock(); - } else { - sendWithLock(); - } -+#endif - } - - private: -@@ -209,12 +211,14 @@ int main(int argc, char **argv) - Frontend frontend; - SMBContext smbcContext(new SMBAuthenticator(frontend)); - -+#ifndef Q_OS_HAIKU - struct NotifyContext { - const QUrl url; - // Modification happens a lot, rate limit the notifications going through dbus. - ModificationLimiter modificationLimiter; - PendingRemove pendingRemove; - }; -+ - NotifyContext context{QUrl(parser.positionalArguments().at(0)), {}, {}}; - - auto notify = [](const struct smbc_notify_callback_action *actions, size_t num_actions, void *private_data) -> int { -@@ -244,7 +248,6 @@ int main(int argc, char **argv) - } - - context->pendingRemove.newEventFor(actions->action, url); -- - switch (actions->action) { - case SMBC_NOTIFY_ACTION_ADDED: - OrgKdeKDirNotifyInterface::emitFilesAdded(context->url /* dir */); -@@ -295,7 +298,6 @@ int main(int argc, char **argv) - // Values @ 2.2.35 SMB2 CHANGE_NOTIFY Request - // https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-smb2/598f395a-e7a2-4cc8-afb3-ccb30dd2df7c - // Not subscribing to stream changes see the callback handler for details. -- - const int nh = smbc_notify(dh, - 0 /* not recursive */, - SMBC_NOTIFY_CHANGE_FILE_NAME | SMBC_NOTIFY_CHANGE_DIR_NAME | SMBC_NOTIFY_CHANGE_ATTRIBUTES | SMBC_NOTIFY_CHANGE_SIZE -@@ -309,6 +311,7 @@ int main(int argc, char **argv) - return 2; - } - Q_ASSERT(nh == 0); -+#endif - - return app.exec(); - } --- -2.45.2 - 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 new file mode 100644 index 000000000..0cf80948c --- /dev/null +++ b/kde-apps/kio-extras/patches/kio_extras-24.12.3.patchset @@ -0,0 +1,32 @@ +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 + #else + #include ++#ifndef Q_OS_HAIKU + #include ++#endif + #include // 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 +