diff --git a/kde-apps/kio-extras/kio_extras24-24.08.0.recipe b/kde-apps/kio-extras/kio_extras24-24.12.0.recipe similarity index 66% rename from kde-apps/kio-extras/kio_extras24-24.08.0.recipe rename to kde-apps/kio-extras/kio_extras24-24.12.0.recipe index 26a472aeb..5a45e276d 100644 --- a/kde-apps/kio-extras/kio_extras24-24.08.0.recipe +++ b/kde-apps/kio-extras/kio_extras24-24.12.0.recipe @@ -12,10 +12,10 @@ This package also supports the following protocols: HOMEPAGE="https://invent.kde.org/network/kio-extras/" COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kio-extras-$portVersion.tar.xz" +CHECKSUM_SHA256="5131e77f3771320d65cde43cef6fd3eb9d59bf551cad6e90753b354ff15df2c4" SOURCE_DIR="kio-extras-$portVersion" -CHECKSUM_SHA256="7590f4897962388149c0fec25e7eb8b691597dacfd4aedf3343bbeeb4b98445c" PATCHES="kio_extras-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -30,20 +30,23 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libkdsoap$secondaryArchSuffix - lib:libKDSoapWSDiscoveryClient$secondaryArchSuffix +# lib:libkdsoap_qt6$secondaryArchSuffix +# lib:libKDSoapWSDiscoveryClient$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libIex_3_2$secondaryArchSuffix + lib:libIlmThread_3_2$secondaryArchSuffix + lib:libImath_3_1$secondaryArchSuffix + lib:libKExiv2Qt6$secondaryArchSuffix lib:libmtp$secondaryArchSuffix + lib:libOpenEXR_3_2$secondaryArchSuffix + lib:libOpenEXRCore_3_2$secondaryArchSuffix lib:libphonon4Qt6$secondaryArchSuffix - lib:libsmbclient$secondaryArchSuffix +# lib:libsmbclient$secondaryArchSuffix lib:libssh$secondaryArchSuffix - lib:libssp$secondaryArchSuffix +# lib:libssp$secondaryArchSuffix + lib:libtag$secondaryArchSuffix # KF 6 - lib:libPlasmaActivities$secondaryArchSuffix lib:libKF6Archive$secondaryArchSuffix - lib:libKF6AuthCore$secondaryArchSuffix - lib:libKF6Bookmarks$secondaryArchSuffix - lib:libKF6Codecs$secondaryArchSuffix - lib:libKF6Completion$secondaryArchSuffix lib:libKF6ConfigCore$secondaryArchSuffix lib:libKF6ConfigWidgets$secondaryArchSuffix lib:libKF6CoreAddons$secondaryArchSuffix @@ -51,21 +54,19 @@ REQUIRES=" lib:libKF6DNSSD$secondaryArchSuffix lib:libKF6GuiAddons$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix - lib:libKF6IconThemes$secondaryArchSuffix - lib:libKF6ItemViews$secondaryArchSuffix + lib:libKF6KCMUtils$secondaryArchSuffix lib:libKF6KIOCore$secondaryArchSuffix - lib:libKF6JobWidgets$secondaryArchSuffix - lib:libKF6Pty$secondaryArchSuffix - lib:libKF6Service$secondaryArchSuffix lib:libKF6Solid$secondaryArchSuffix lib:libKF6SyntaxHighlighting$secondaryArchSuffix - lib:libKF6WidgetsAddons$secondaryArchSuffix - lib:libKF6WindowSystem$secondaryArchSuffix - lib:libKF6XmlGui$secondaryArchSuffix # Qt6 lib:libQt6Core$secondaryArchSuffix + lib:libQt6Core5Compat$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix lib:libQt6Network$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Svg$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + lib:libQt6Xml$secondaryArchSuffix " PROVIDES_devel=" @@ -78,55 +79,42 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - kdsoap_ws_discovery_client_qt6${secondaryArchSuffix}_devel - devel:libkdsoap_qt6$secondaryArchSuffix +# kdsoap_ws_discovery_client_qt6${secondaryArchSuffix}_devel +# devel:libdeflate$secondaryArchSuffix +# devel:libkdsoap_qt6$secondaryArchSuffix + devel:libIex_3_2$secondaryArchSuffix + devel:libIlmThread_3_2$secondaryArchSuffix + devel:libImath_3_1$secondaryArchSuffix + devel:libKExiv2Qt6$secondaryArchSuffix devel:libmtp$secondaryArchSuffix + devel:libOpenEXR_3_2$secondaryArchSuffix + devel:libOpenEXRUtil_3_2$secondaryArchSuffix devel:libphonon4Qt6$secondaryArchSuffix devel:libQCoro6Core$secondaryArchSuffix - devel:libsmbclient$secondaryArchSuffix +# devel:libsmbclient$secondaryArchSuffix devel:libssh$secondaryArchSuffix devel:libtag$secondaryArchSuffix - devel:libxml2$secondaryArchSuffix - devel:libz$secondaryArchSuffix - # KF 6 +# devel:libxml2$secondaryArchSuffix +# devel:libz$secondaryArchSuffix + # KF6 extra_cmake_modules$secondaryArchSuffix >= 6.0.0 - devel:libPlasmaActivities$secondaryArchSuffix - devel:libPlasmaActivitiesStats$secondaryArchSuffix - devel:libKExiv2Qt6$secondaryArchSuffix devel:libKF6Archive$secondaryArchSuffix - devel:libKF6AuthCore$secondaryArchSuffix - devel:libKF6Bookmarks$secondaryArchSuffix devel:libKF6Codecs$secondaryArchSuffix - devel:libKF6ColorScheme$secondaryArchSuffix - devel:libKF6Completion$secondaryArchSuffix devel:libKF6ConfigCore$secondaryArchSuffix devel:libKF6ConfigWidgets$secondaryArchSuffix devel:libKF6CoreAddons$secondaryArchSuffix - devel:libKF6DBusAddons$secondaryArchSuffix devel:libKF6DNSSD$secondaryArchSuffix devel:libKF6DocTools$secondaryArchSuffix devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix - devel:libKF6IconThemes$secondaryArchSuffix - devel:libKF6ItemViews$secondaryArchSuffix - devel:libKF6JobWidgets$secondaryArchSuffix devel:libKF6KCMUtils$secondaryArchSuffix devel:libKF6KIOCore$secondaryArchSuffix - devel:libKF6Pty$secondaryArchSuffix - devel:libKF6Service$secondaryArchSuffix devel:libKF6Solid$secondaryArchSuffix devel:libKF6SyntaxHighlighting$secondaryArchSuffix devel:libKF6TextWidgets$secondaryArchSuffix - devel:libKF6WidgetsAddons$secondaryArchSuffix - devel:libKF6WindowSystem$secondaryArchSuffix - devel:libKF6XmlGui$secondaryArchSuffix # Qt6 devel:libQt6Core$secondaryArchSuffix devel:libQt6Core5Compat$secondaryArchSuffix - devel:libQt6DBus$secondaryArchSuffix - devel:libQt6Gui$secondaryArchSuffix - devel:libQt6Network$secondaryArchSuffix - devel:libQt6Qml$secondaryArchSuffix devel:libQt6Svg$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -135,9 +123,10 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:gperf cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix +# cmd:smbclient$secondaryArchSuffix cmd:update_mime_database$secondaryArchSuffix " @@ -153,22 +142,22 @@ TEST_REQUIRES=" BUILD() { - mkdir -p build - cd build - - cmake .. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS="-fno-stack-protector" \ + $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ + -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ + -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DCMAKE_CXX_FLAGS="-fno-stack-protector" + -DBUILD_TESTING=OFF \ + -Wno-dev - make $jobArgs + make -C build $jobArgs } INSTALL() { - cd build - make $jobArgs install + make -C build install rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic} rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces} diff --git a/kde-apps/kio-extras/patches/kio_extras-24.08.0.patchset b/kde-apps/kio-extras/patches/kio_extras-24.12.0.patchset similarity index 94% rename from kde-apps/kio-extras/patches/kio_extras-24.08.0.patchset rename to kde-apps/kio-extras/patches/kio_extras-24.12.0.patchset index 0742acfeb..aaeb533c7 100644 --- a/kde-apps/kio-extras/patches/kio_extras-24.08.0.patchset +++ b/kde-apps/kio-extras/patches/kio_extras-24.12.0.patchset @@ -1,11 +1,11 @@ -From 4de6d82451ba65987e32929a9083c88b3e3af2ed Mon Sep 17 00:00:00 2001 +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 78b1e5b..c4fb28a 100644 +index 5e5f708..d77882d 100644 --- a/thumbnail/thumbnail.cpp +++ b/thumbnail/thumbnail.cpp @@ -17,7 +17,9 @@ @@ -28,10 +28,10 @@ index 78b1e5b..c4fb28a 100644 // qDebug() << "IMAGE TO SHMID"; void *shmaddr = shmat(shmid.toInt(), nullptr, 0); -- -2.45.1 +2.45.2 -From b1b397c94b985470a1bd0d69eaaaa6072478238c Mon Sep 17 00:00:00 2001 +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 @@ -96,5 +96,5 @@ index cb11a2d..fec7f03 100644 return app.exec(); } -- -2.45.1 +2.45.2