commit: 0fb8e2049e9b885175c0e2e05e953251f48f8389 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 10 22:43:29 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 10 23:18:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fb8e204
kde-apps/kio-extras-kf5: add 24.01.90, drop 24.01.85 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/kio-extras-kf5/Manifest | 2 +- ...o-extras-kf5-24.01.85-activities-optional.patch | 48 ---------------------- ...01.85.ebuild => kio-extras-kf5-24.01.90.ebuild} | 4 +- profiles/package.mask | 2 +- 4 files changed, 3 insertions(+), 53 deletions(-) diff --git a/kde-apps/kio-extras-kf5/Manifest b/kde-apps/kio-extras-kf5/Manifest index 7b0a2351c78e..033bb4f288b5 100644 --- a/kde-apps/kio-extras-kf5/Manifest +++ b/kde-apps/kio-extras-kf5/Manifest @@ -1 +1 @@ -DIST kio-extras-kf5-24.01.85.tar.xz 1465840 BLAKE2B 76a4af6dadd3e0df0ca0e264a961c73963b96fc768e4190915451cc58d61bf1875a0e4071c6de13e76eb124b41ed8081e23a29f9b4d60a109e869d7632adba0a SHA512 3ccbfd7c1d0b35f68143cfdd935e94658844f4f9e37d7c56e7e6d77b45b6998211d8ecb04bd5a5b96e8bda0f89644e9f0de7eac2097fca3155ade3b1a99a756b +DIST kio-extras-kf5-24.01.90.tar.xz 1466180 BLAKE2B 0de557b4d007205a0718610e7f37066637de377083eb632af0a4c540c4a920ba62d692b8abc07919c0449cde6ecf29e9642caa743169423ca5330dc651115f76 SHA512 cf64766340e7a6d947493094bed74aa44eb3d6459478661b0b273954b4f0f647d147880558ffdf363a8e838ca7f8a8678ff024bab432aeac12f370d71b2ef922 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 deleted file mode 100644 index e6cd9f7a7976..000000000000 --- a/kde-apps/kio-extras-kf5/files/kio-extras-kf5-24.01.85-activities-optional.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d6db8756c906db73b22faf83a3bb5d2884342ba8 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -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 <[email protected]> -(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.90.ebuild similarity index 97% rename from kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.85.ebuild rename to kde-apps/kio-extras-kf5/kio-extras-kf5-24.01.90.ebuild index 6f8abcd34195..e6245623a940 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.90.ebuild @@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoptional" ECM_TEST="optional" KDE_ORG_NAME="kio-extras" KDE_ORG_TAR_PN="kio-extras-kf5" -KFMIN=5.106.0 +KFMIN=5.113.0 QTMIN=5.15.9 inherit ecm gear.kde.org @@ -74,8 +74,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 b1c788785f72..876631e33229 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -509,7 +509,7 @@ dev-python/ruamel-std-pathlib ~kde-apps/kdegraphics-mobipocket-24.01.90 =kde-apps/kio-extras-23.08.5-r100 ~kde-apps/kio-extras-24.01.90 -~kde-apps/kio-extras-kf5-24.01.85 +~kde-apps/kio-extras-kf5-24.01.90 ~kde-apps/libkexiv2-24.01.85 ~kde-apps/spectacle-24.01.85 ~kde-misc/kio-fuse-5.1.0
