diff options
| -rw-r--r-- | kde-apps/kio-extras/Manifest | 2 | ||||
| -rw-r--r-- | kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch | 48 | ||||
| -rw-r--r-- | kde-apps/kio-extras/kio-extras-24.01.90.ebuild (renamed from kde-apps/kio-extras/kio-extras-24.01.85.ebuild) | 8 | ||||
| -rw-r--r-- | profiles/package.mask | 2 |
4 files changed, 4 insertions, 56 deletions
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest index 6f586fbd2c92..5fa52ec20c33 100644 --- a/kde-apps/kio-extras/Manifest +++ b/kde-apps/kio-extras/Manifest @@ -1,2 +1,2 @@ DIST kio-extras-23.08.4.tar.xz 1490584 BLAKE2B f38b87c9934a2d8f7862131d6ad8200035cdd55696918e1e8164e7811907a17ae583f392856fb4e709a2a09dcb560fb40c08d2485caed12331da9068bc3b3932 SHA512 ac2be6e745121962e13fe952d746281fa45778b6d491b001b9ea7a65caedfd5d6354ee75537fde0bf174638d248eb8796db6710830641149dcf35544048cfe27 -DIST kio-extras-24.01.85.tar.xz 3552164 BLAKE2B 23fcf051f47c3dc1a29923c535552201967cc213a137a70749d70bed5454e98526fcbfa1fabc89aab2f854ce84c5c18618dec8bfb0bd70187deaa53f2a5dcf39 SHA512 f0564fbd1be10f635f3e4374057f17a285fca2674592f338ed1af324710358501ef4949a79e0112e68d18636d99fccf59dfd4b7886e6827786080f9947283027 +DIST kio-extras-24.01.90.tar.xz 3552416 BLAKE2B be9ceb907df17d2494170d120b89744900b90fc079438350f631176de227ff654eda4a18a680e0e2426c32efcb2bd6f1373e70040cefd7dd00d99f8a901abea0 SHA512 cfd17fb1164c8f6a9e9ba67bb8dd90b6c744ce1ece115dcac83caed9854f26706a42d62fad4fcb9988f81cce8319b6fccda1c1052ab41376c88beb7df3929567 diff --git a/kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch b/kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch deleted file mode 100644 index 73ce35a37188..000000000000 --- a/kde-apps/kio-extras/files/kio-extras-24.01.85-activities-optional.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://invent.kde.org/network/kio-extras/-/commit/d74e09cace0cd533648b37e81c9d07f9a7c82043 - -From d74e09cace0cd533648b37e81c9d07f9a7c82043 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> ---- - CMakeLists.txt | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0e085b18c..6c5c43da9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,9 +68,12 @@ file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) - kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) - - if (NOT WIN32) -- find_package(PlasmaActivities REQUIRED) -- find_package(Qt6Sql REQUIRED) -- find_package(PlasmaActivitiesStats REQUIRED) -+ option(BUILD_ACTIVITIES "Build recentlyused:/, activities:/ KIO workers and fileitem plugin." ON) -+ if(BUILD_ACTIVITIES) -+ find_package(Qt6Sql REQUIRED) -+ find_package(PlasmaActivities REQUIRED) -+ find_package(PlasmaActivitiesStats REQUIRED) -+ endif() - endif() - - find_package(Phonon4Qt6 4.6.60 NO_MODULE) -@@ -164,7 +167,7 @@ ecm_set_disabled_deprecation_versions( - add_subdirectory(doc) - add_subdirectory(kcms) - --if(NOT WIN32) -+if(BUILD_ACTIVITIES) - add_subdirectory( activities ) - add_subdirectory( recentlyused ) - endif() --- -GitLab diff --git a/kde-apps/kio-extras/kio-extras-24.01.85.ebuild b/kde-apps/kio-extras/kio-extras-24.01.90.ebuild index fe471ef1aa7c..de423f025f84 100644 --- a/kde-apps/kio-extras/kio-extras-24.01.85.ebuild +++ b/kde-apps/kio-extras/kio-extras-24.01.90.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="optional" -KFMIN=5.247.0 +KFMIN=5.248.0 QTMIN=6.6.0 inherit ecm gear.kde.org @@ -16,8 +16,6 @@ LICENSE="GPL-2" # TODO: CHECK SLOT="6" KEYWORDS="~amd64" IUSE="activities ios +man mtp openexr phonon +sftp taglib X" -# TODO: activities: collides with Plasma-5, plus: -# https://invent.kde.org/network/kio-extras/-/merge_requests/320 # TODO: samba (net-libs/kdsoap packaging issue w/ upstream) # disabled upstream: nfs @@ -80,8 +78,6 @@ RDEPEND="${DEPEND} " BDEPEND="man? ( dev-util/gperf )" -PATCHES=( "${FILESDIR}/${P}-activities-optional.patch" ) - src_configure() { local mycmakeargs=( -DBUILD_ACTIVITIES=$(usex activities) diff --git a/profiles/package.mask b/profiles/package.mask index 3d372f894c68..b1c788785f72 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -508,7 +508,7 @@ dev-python/ruamel-std-pathlib ~kde-frameworks/qqc2-desktop-style-5.247.0 ~kde-apps/kdegraphics-mobipocket-24.01.90 =kde-apps/kio-extras-23.08.5-r100 -~kde-apps/kio-extras-24.01.85 +~kde-apps/kio-extras-24.01.90 ~kde-apps/kio-extras-kf5-24.01.85 ~kde-apps/libkexiv2-24.01.85 ~kde-apps/spectacle-24.01.85 |