gentoo auto-resync : 22:12:2023 - 07:49:59

4 files changed, 49 insertions, 11 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 0f7ec62bcc96..b38e37c9a546 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 31bf61802053..8b10ade9fb10 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,8 +1,8 @@
-AUX kio-extras-24.01.80-no-activities.patch 400 BLAKE2B 043282d98d9b26b37163f6e0fd4556b57b99286b36d370b2f1e873d79d7ab731371d57c80623eb4b98afeda59c9e93ffed8b0bc27757803d68976b2aaad8b22b SHA512 7a958fc170f44f40ff67bfa51acb9db33ae518150a97f15eb143aad373b41db99f66e98c5dbd7abeae148d85ee061b3bc427bf54807208cb331d5289d2d65553
+AUX kio-extras-24.01.80-no-activities.patch 1571 BLAKE2B 4337722f2fe40fd62c891769a51cf9f876a6178b0f5e214c33a02ad996d781ed9c028cd8cf597d82b69c008a770be0954343165a6454827dd7da101bbf619b3e SHA512 d13e7eeae8fcd138f3e0445ba4a0f741f82362d45dd0e8334d8cc917f7ca3e327a6b81297984ef30f6c234c4d3d2a8620e582e77316bb8f190b7922d9d99d0a1
 DIST kio-extras-23.08.3.tar.xz 1489156 BLAKE2B 6ad66a1658ac2ad8a5b88ca5f7c66cb3fd5dfbcee9baa49feeea185eb935121a7e51035f539e84c79af066fb50c68cba850eeefaf0f99a65d457a06e1f46fe9d SHA512 dac80cce3e47a6b0686feae297cf6707bbbb2ede0930d2636a4c93b43610beea391148df92ba381fec3ba8b8eed279de19ad5315b3aa989436b0bc8e6937e680
 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
 EBUILD kio-extras-23.08.3.ebuild 2798 BLAKE2B e137158c8eed073fa0b4b441b3ad91c8d707f5cc667303829b26e630cf97e3d568dce6b6e69edeb38d3a92cac40082b6da486570ef8d19a6066641c40b70f4f5 SHA512 223e73e605103fb3bbac5c17c6858a0c6aa4f5f2232353eceab0e65b7c8b3b8c0cc48809e4fd0d44fb6eae05498adb8887d7657c6c693629eeade91164bf1bd0
 EBUILD kio-extras-23.08.4.ebuild 2801 BLAKE2B 3112d09ea49d38bf60f58a2533c1ce1b27df286aedf3303fdea1eda100b5daccee4a1050144332c18f10341846ca768165ba054bc9000655a1982f335c2e8dc2 SHA512 cce96a436f8227ce4e3167989704689f098e820a33ceeb912e71bbeacf7f3ce24bc521656c265c45bffbd7f4787373c26c7c1af58cf46fb06ef4d8697675616d
-EBUILD kio-extras-24.01.85.ebuild 2745 BLAKE2B 3abe69d5c01181aa39ffe8e76c15c0edc602ebaeb1457196ecf3722563242b1dad03bfcf85d38b87f0d3b98f9033e355a1923896745dadfc04e3bbdd9e7e7298 SHA512 510ebbfbc76327f26642d84a6128ed226e67e5c5a72ee13773497e4ba8e98e4b564a619f2f71a65f4702c4fb412d73f422b3a61cde414f9c5406bbefb00246b2
+EBUILD kio-extras-24.01.85.ebuild 2770 BLAKE2B 88ed52bfc5cee0d5c9b8ab2c4c09e3758e92cf97b22bce3f6d926f825c1ecaad5adf08ff9b8372bb309ede3a3d2f0977d2fee621e7ca433925f41e5c449bb10a SHA512 4c7377b8fc3ba9dccfb2288eb0856ff687cabc11a166b87873d5399ff850e378b54cda9b21039f88a121b92e271a9ebbe3dc4d6c747efc957a484d2e2d084418
 MISC metadata.xml 1126 BLAKE2B c0d81be1cdef0408907a5edd4475a80e1cdb5d34b64841f9f77dee91b1aac70cceab2e69a598761553bb4d39f8872bee51ccc6682d83148fc07f5ea354551f97 SHA512 a8819b4e309dbed0a35d0879de8e1b5342e8c6a1626bd9278f4ed274d714b491f3e1f6a58e291fed17e98cee3e4a6c12ddd429e4a9bd33ab9d125f7dfddde2a8
diff --git a/kde-apps/kio-extras/files/kio-extras-24.01.80-no-activities.patch b/kde-apps/kio-extras/files/kio-extras-24.01.80-no-activities.patch
index a3bcf2d6c45a..73ce35a37188 100644
--- a/kde-apps/kio-extras/files/kio-extras-24.01.80-no-activities.patch
+++ b/kde-apps/kio-extras/files/kio-extras-24.01.80-no-activities.patch
@@ -1,11 +1,48 @@
---- a/CMakeLists.txt	2023-12-17 13:30:08.829164269 +0100
-+++ b/CMakeLists.txt	2023-12-17 13:30:28.109541642 +0100
-@@ -67,7 +67,7 @@
- file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
+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)
-+if (0)
-     find_package(PlasmaActivities REQUIRED)
-     find_package(Qt6Sql REQUIRED)
-     find_package(PlasmaActivitiesStats REQUIRED)
+ 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.85.ebuild
index 7d3743de2e4d..a82cf978fa4c 100644
--- a/kde-apps/kio-extras/kio-extras-24.01.85.ebuild
+++ b/kde-apps/kio-extras/kio-extras-24.01.85.ebuild
@@ -79,6 +79,7 @@ PATCHES=( "${FILESDIR}/${PN}-24.01.80-no-activities.patch" )
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_ACTIVITIES=OFF
 		$(cmake_use_find_package ios IMobileDevice)
 		$(cmake_use_find_package ios PList)
 		$(cmake_use_find_package man Gperf)