From 60360664173979c416f4acb44f2fb2368922742d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Dec 2023 19:46:42 +0000 Subject: gentoo auto-resync : 23:12:2023 - 19:46:41 --- kde-apps/kio-extras-kf5/Manifest | 5 ++- ...o-extras-kf5-24.01.85-activities-optional.patch | 48 ++++++++++++++++++++++ .../kio-extras-kf5/kio-extras-kf5-24.01.85.ebuild | 15 ++++--- kde-apps/kio-extras-kf5/metadata.xml | 1 + 4 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 kde-apps/kio-extras-kf5/files/kio-extras-kf5-24.01.85-activities-optional.patch (limited to 'kde-apps/kio-extras-kf5') diff --git a/kde-apps/kio-extras-kf5/Manifest b/kde-apps/kio-extras-kf5/Manifest index ad013d7d76c6..a3d2424399e9 100644 --- a/kde-apps/kio-extras-kf5/Manifest +++ b/kde-apps/kio-extras-kf5/Manifest @@ -1,3 +1,4 @@ +AUX kio-extras-kf5-24.01.85-activities-optional.patch 1594 BLAKE2B 48a45efeba3206fd668b3a83154e608daf04c0e26e486f7afc825522aec280b0b295ce5baa72f09cd7883769e6fa000588e30e87046fe11e9af36760553463ae SHA512 0663653da1e6ec6525a303ca0782c70bcd0a6be922e7bbe9c17f518d3b8e3384890aa5d5e451444d7a515662b53a3baf67937506a478057e5ebd511d3fe4584e DIST kio-extras-kf5-24.01.85.tar.xz 1465840 BLAKE2B 76a4af6dadd3e0df0ca0e264a961c73963b96fc768e4190915451cc58d61bf1875a0e4071c6de13e76eb124b41ed8081e23a29f9b4d60a109e869d7632adba0a SHA512 3ccbfd7c1d0b35f68143cfdd935e94658844f4f9e37d7c56e7e6d77b45b6998211d8ecb04bd5a5b96e8bda0f89644e9f0de7eac2097fca3155ade3b1a99a756b -EBUILD kio-extras-kf5-24.01.85.ebuild 2751 BLAKE2B d91e16d881f0850cc6565172f82ed52607f765b24570890ec9774c0a0db9f57ec70bb1210bbf0f70340bf8be2c19c0deb75e55d16dfb4229c986b1edb87fa352 SHA512 2d7971c55fb169b7a3c32aea78398db80ae5590bb6b7de9885a817af0f0955df9c1f238b0ed0f484997e915135313236e98eb5e7a1204d3cd5c876957119af94 -MISC metadata.xml 1148 BLAKE2B 59c7c246b60ecb16ec7ff37e38829e84c7f09338dce24d54c9cf4af2684254462a8b187ff545e24206639d5363ada62edbf16e60d6daebcab663c8ace4e62da9 SHA512 01789b1112c1db30b64194b44addbe0c639dc18ac7f9c93a2b3861a4d482e18895774379685e9bf71f8d7fe1f7f3c77d5bf27561efb0649742d1013f99251673 +EBUILD kio-extras-kf5-24.01.85.ebuild 2879 BLAKE2B ed9d8b814d2206fb92da2c43e2852aa804b759fbfd178e0e0f783274124681a14e2cbf6003e6d475fa3dc3261370f46f2d25a99d2fb78c34913b0f4a0618846d SHA512 1e806506f1e01ac5422a95a807d82478db5b395a90196cf54f41e7a36a223f6353dda264025250afdc837c89539ed7e9065ef02dfe37263cb193d52bcec060a2 +MISC metadata.xml 1230 BLAKE2B 9b567eac809ae4520744b33f1bac2230e14e8666b7d12be0dab5b99a750626ff6f87b93f15c3ebfded9ca0540b6244105ec5531aa61778e052fe9610130f3a17 SHA512 60f5c4fe5c342680b50d3c8796142d41477468edab3aeb7b45f8e4d8ae932d2ee781bb49034272ca1d726031ab14c73fa137541318dcefd62f28aeba271c4295 diff --git a/kde-apps/kio-extras-kf5/files/kio-extras-kf5-24.01.85-activities-optional.patch b/kde-apps/kio-extras-kf5/files/kio-extras-kf5-24.01.85-activities-optional.patch new file mode 100644 index 000000000000..e6cd9f7a7976 --- /dev/null +++ b/kde-apps/kio-extras-kf5/files/kio-extras-kf5-24.01.85-activities-optional.patch @@ -0,0 +1,48 @@ +From d6db8756c906db73b22faf83a3bb5d2884342ba8 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 16 Dec 2023 21:25:17 +0100 +Subject: [PATCH] Add BUILD_ACTIVITIES option (default=ON) + +Maybe we can keep this optional while the future of activities is still +not entirely clear. + +Follow-up to f220e0ebf670e64f3e7dc4d8a75c3b5dd00bfe2c + +Signed-off-by: Andreas Sturmlechner +(cherry picked from commit d74e09cace0cd533648b37e81c9d07f9a7c82043) +--- + CMakeLists.txt | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 685302eb5..faa2be999 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,9 +63,12 @@ file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) + kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) + + if (NOT WIN32) +- find_package(KF5Activities REQUIRED) +- find_package(Qt5Sql REQUIRED) +- find_package(KF5ActivitiesStats ${KF_MIN_VERSION} REQUIRED) ++ option(BUILD_ACTIVITIES "Build recentlyused:/, activities:/ KIO workers and fileitem plugin." ON) ++ if(BUILD_ACTIVITIES) ++ find_package(Qt5Sql REQUIRED) ++ find_package(KF5Activities REQUIRED) ++ find_package(KF5ActivitiesStats ${KF_MIN_VERSION} REQUIRED) ++ endif() + endif() + + find_package(Phonon4Qt5 4.6.60 NO_MODULE) +@@ -160,7 +163,7 @@ option(KF6_COMPAT_BUILD "Don't install files that conflict with KF6-based kio-ex + + add_subdirectory( doc ) + +-if(NOT WIN32) ++if(BUILD_ACTIVITIES) + add_subdirectory( activities ) + add_subdirectory( recentlyused ) + endif() +-- +2.43.0 + diff --git a/kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.85.ebuild b/kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.85.ebuild index 6ad7506e5509..b4ea776f629c 100644 --- a/kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.85.ebuild +++ b/kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.85.ebuild @@ -18,7 +18,7 @@ EGIT_BRANCH="kf5" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="ios kf6compat +man mtp nfs openexr phonon samba +sftp taglib X" +IUSE="activities ios kf6compat +man mtp nfs openexr phonon samba +sftp taglib X" # requires running Plasma environment RESTRICT="test" @@ -27,7 +27,6 @@ DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 @@ -47,8 +46,11 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - >=kde-plasma/plasma-activities-${KFMIN}:5 - >=kde-plasma/plasma-activities-stats-${KFMIN}:5 + activities? ( + >=dev-qt/qtbase-${QTMIN}:6[sql] + kde-plasma/plasma-activities:6 + kde-plasma/plasma-activities-stats:6 + ) ios? ( app-pda/libimobiledevice:= app-pda/libplist:= @@ -66,14 +68,17 @@ DEPEND=" ) " RDEPEND="${DEPEND} - !kde-apps/kio-extras:5 + !=kde-frameworks/kded-${KFMIN}:5 kf6compat? ( kde-apps/kio-extras:6 ) " BDEPEND="man? ( dev-util/gperf )" +PATCHES=( "${FILESDIR}/${P}-activities-optional.patch" ) + src_configure() { local mycmakeargs=( + -DBUILD_ACTIVITIES=$(usex activities) $(cmake_use_find_package ios IMobileDevice) $(cmake_use_find_package ios PList) $(cmake_use_find_package man Gperf) diff --git a/kde-apps/kio-extras-kf5/metadata.xml b/kde-apps/kio-extras-kf5/metadata.xml index 72853d9bad5f..f55e3c5c8bb9 100644 --- a/kde-apps/kio-extras-kf5/metadata.xml +++ b/kde-apps/kio-extras-kf5/metadata.xml @@ -11,6 +11,7 @@ network/kio-extras + Enable activities KIO worker and fileitem plugin Enable AFC (Apple File Conduit) KIO worker for iOS devices support Disable components colliding with KF6, depend on KF6 components instead Enable manpages KIO worker -- cgit v1.2.3