diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-12-22 18:59:28 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-12-23 19:29:30 +0100 |
commit | 866153ea43d28f1d8f7338f79add74a35a5ad586 (patch) | |
tree | 70a435fb6a2663e9eaca9c357c5cfbd5db4982a6 /kde-apps | |
parent | dev-util/ragel: Stabilize 7.0.4-r2 x86, #839048 (diff) | |
download | gentoo-866153ea43d28f1d8f7338f79add74a35a5ad586.tar.gz gentoo-866153ea43d28f1d8f7338f79add74a35a5ad586.tar.bz2 gentoo-866153ea43d28f1d8f7338f79add74a35a5ad586.zip |
kde-apps/kio-extras-kf5: Re-add IUSE activities
Relax kde-apps/kio-extras:5 blocker to <23.08.5-r100:5
Bug: https://bugs.gentoo.org/917101
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps')
3 files changed, 59 insertions, 5 deletions
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 <asturm@gentoo.org> +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 <asturm@gentoo.org> +(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-apps/kio-extras-23.08.5-r100: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 @@ <remote-id type="kde-invent">network/kio-extras</remote-id> </upstream> <use> + <flag name="activities">Enable activities KIO worker and fileitem plugin</flag> <flag name="ios">Enable AFC (Apple File Conduit) KIO worker for iOS devices support</flag> <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> <flag name="man">Enable manpages KIO worker</flag> |