gentoo auto-resync : 29:02:2024 - 11:41:17

4 files changed, 111 insertions, 1 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 0a49a5f47843..e858d73f59ec 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index 6eb1e1428c0e..aa985169cee7 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,3 +1,4 @@
+AUX dolphin-plugins-git-24.02.0-deps.patch 2825 BLAKE2B 0370217537d5194e87b8d7977d09d6fe92f0c595e820e8a1355fc3c566a5a6b4650cf56780fc99ded8caf4815a677707e413de13259027a105c69e92b48c67bc SHA512 7ecffe39bd9fa052346d056d1ce13524fe6d7c70c073ebfe5da5fb1ac0255892a400f6fcd6e051ad605fd66afccfc38f609f7530ee9acbade8b2d286d8d8debd
 DIST dolphin-plugins-23.04.3.tar.xz 272912 BLAKE2B f0eb8bbab16d66f1e964131b436af7d3ae8febc26cf4fe394489a978c701ef2f5689bea7daf9eed8d7ef2f1f2bdba000a487cf7f0704ad30bd25e2d403ce5fae SHA512 8f487ba0bcbe561915064247ddb2327c3b7c8fa6ffc5c511d9c9ef37bd4f28a624533ce7a2da2a86b10b65f37915ca10840517872b40c2fd014cead6da5972c8
 DIST dolphin-plugins-23.08.4.tar.xz 274180 BLAKE2B 586c697b5c292ed78e826b1adabb26ee1daebe995d8fac4fc64bbc84c4490387a8100f895934783180da02ad9f008c0ef98b938e8f0cb6b1a8c1dd5be31b7c1f SHA512 7cb3365221aabe411e1339230633a37d674c6e2a77e675f8a1d9c61928bd0d2b75e5d289ba8d7765bcbea47afea56e2b629726fbdcf6e0e4248c4380ce33f40e
 DIST dolphin-plugins-23.08.5.tar.xz 274124 BLAKE2B c8b43bd7f87c7221023e75e3f66b450844b379d5bfc95e37ce01dfe983ba3dc234a319da2aaf0596e6eb54319bc4310c718b57d52d070f0f86cd67c6f67a8c4b SHA512 2dd30070660df63b988cda2e14f3ddc27a0cf451119d2a6b121cb9cbeb8788b94498ef25ca434501843784a8e24c4539fe17cc0ab5a158befbc9db5792944852
@@ -5,5 +6,5 @@ DIST dolphin-plugins-24.02.0.tar.xz 294220 BLAKE2B d2d2440ac4372218350f98a98b2aa
 EBUILD dolphin-plugins-git-23.04.3.ebuild 1469 BLAKE2B ae5ca81318fd2304f5a1d84cd967cbf50b25180bf1d043630f5dccb1d57ea8acc1cf4dffa03fd99bc1848be8c093f4af1097d8e7e19f22f10e3092cfdbf9525b SHA512 f7be7a6db5c5119991b7482004295285942d002ccb20944a2557762b27636d787c08fd8242fd39a46481be34424942867d33a926b91fde6820c885438213f545
 EBUILD dolphin-plugins-git-23.08.4.ebuild 1469 BLAKE2B dc2d7c092629c630d24d7c8bedf9050ac171ee6ed3b124b1abc36e6d94fb6a10b4d883c401ddcb6bf78415dc8708fc87ed30b1db99eb66201c9dfcc2c5676cc6 SHA512 4a5ac3635c2e4cdfe24159b321486b7b252c7e973fab1cbd4b96d90df26ab500e1fed632ce57a4ebe98192fdf21081fe2e5d9c56ceeac3685b272deda62f21a4
 EBUILD dolphin-plugins-git-23.08.5.ebuild 1472 BLAKE2B e55134ccc327545f734b8fbfb7c523eb174567e033abcc619afbb93c00deee9c508cf3f67abe551146981b9a6c02ad598679b1ebeae6cc67928d18703548e33a SHA512 542abba296759c09f016903ae745b422b0a43041193b4d15d58b1d8498339ef9b253e052a75d0034efdfb3386bdec9b2615790b5bbf0b417f3b723ab3cb57dfa
-EBUILD dolphin-plugins-git-24.02.0.ebuild 1485 BLAKE2B de1b2020592a938bd0e5c27c84a73badf637c4709154bafd3f150ca9c8145e157b37e76abe53064e5eccb1776dde6ddd0ca52a61334fa4277ce5bf67b312a5a6 SHA512 f7f51cb05574bcc6dae2ea61be8bf9cfb56dab5a87afed8d5a3f74e54cf113eab2bddb1528f247b1583aa732146efd13bb90d243543730886819581601fac001
+EBUILD dolphin-plugins-git-24.02.0.ebuild 1559 BLAKE2B f8f07216ce131fd4ba64f7b4627c8944cef1f5e8e3bc16d29a720afc1c726a576e041e1f46002ce3c234fddf7e5e6100149a4c8fcb3221938b88ae9886eca394 SHA512 d566226714cf0d5961e451e6cfc7b145eda17b554cb00d6158ea6533c14a0c2579ce5ad499f71372177d0eec0fbe18c1a1f9988ffc834a79f48a9494292ff124
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.02.0.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.02.0.ebuild
index 121c2b8a45a2..e1fc494f6dc0 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.02.0.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-24.02.0.ebuild
@@ -34,6 +34,8 @@ RDEPEND="${DEPEND}
 	dev-vcs/git
 "
 
+PATCHES=( "${FILESDIR}/${P}-deps.patch" ) # bug 925728, pending upstream
+
 src_prepare() {
 	ecm_src_prepare
 	# solid, qtdbus only required by mountiso
diff --git a/kde-apps/dolphin-plugins-git/files/dolphin-plugins-git-24.02.0-deps.patch b/kde-apps/dolphin-plugins-git/files/dolphin-plugins-git-24.02.0-deps.patch
new file mode 100644
index 000000000000..c6fcc519f223
--- /dev/null
+++ b/kde-apps/dolphin-plugins-git/files/dolphin-plugins-git-24.02.0-deps.patch
@@ -0,0 +1,107 @@
+From 048df8b825286fdd5d9e5289c7e2942a038f8e1d Mon Sep 17 00:00:00 2001
+From: Mike Lothian <mike@fireburn.co.uk>
+Date: Wed, 17 Jan 2024 00:20:13 +0000
+Subject: [PATCH 1/4] Top level CMakeLists.txt needs ConfigGui
+
+Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c188a8c3..c2902144 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,6 +39,7 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS
+     I18n
+     KIO
+     TextWidgets
++    Config
+     CoreAddons
+     Solid
+ )
+-- 
+GitLab
+
+
+From 2c1ddcf7b888e4c12650ffc533187315ead564b7 Mon Sep 17 00:00:00 2001
+From: Mike Lothian <mike@fireburn.co.uk>
+Date: Thu, 4 Jan 2024 12:51:00 +0000
+Subject: [PATCH 2/4] Git plugin needs ConfigGui not XmlGui
+
+Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
+---
+ git/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/git/CMakeLists.txt b/git/CMakeLists.txt
+index 55713f53..550c4a43 100644
+--- a/git/CMakeLists.txt
++++ b/git/CMakeLists.txt
+@@ -28,8 +28,8 @@ target_link_libraries(fileviewgitplugin PRIVATE
+     Qt6::Core
+     Qt6::Core5Compat
+     Qt6::Widgets
++    KF6::ConfigGui
+     KF6::I18n
+-    KF6::XmlGui
+     KF6::KIOCore
+     KF6::KIOFileWidgets
+     KF6::TextWidgets
+-- 
+GitLab
+
+
+From fe7367a6aca3d45a3c1468de326ddcca87ef530d Mon Sep 17 00:00:00 2001
+From: Mike Lothian <mike@fireburn.co.uk>
+Date: Wed, 17 Jan 2024 00:21:13 +0000
+Subject: [PATCH 3/4] Subversion plugin needs ConfigGui not XmlGui
+
+Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
+---
+ svn/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/svn/CMakeLists.txt b/svn/CMakeLists.txt
+index 470de1ad..13b40868 100644
+--- a/svn/CMakeLists.txt
++++ b/svn/CMakeLists.txt
+@@ -34,8 +34,8 @@ kconfig_add_kcfg_files(fileviewsvnplugin
+ target_link_libraries(fileviewsvnplugin
+     Qt6::Core
+     Qt6::Widgets
++    KF6::ConfigGui
+     KF6::I18n
+-    KF6::XmlGui
+     KF6::KIOCore
+     KF6::KIOWidgets
+     DolphinVcs
+-- 
+GitLab
+
+
+From 6345cdc2f3ed90624d09e6485218ab68bd468c0b Mon Sep 17 00:00:00 2001
+From: Mike Lothian <mike@fireburn.co.uk>
+Date: Wed, 17 Jan 2024 00:38:45 +0000
+Subject: [PATCH 4/4] kde-ci.yml needs frameworks/kconfig
+
+Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
+---
+ .kde-ci.yml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/.kde-ci.yml b/.kde-ci.yml
+index d35a5569..6b5b1367 100644
+--- a/.kde-ci.yml
++++ b/.kde-ci.yml
+@@ -5,6 +5,7 @@ Dependencies:
+ - 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'macOS/Qt6']
+   'require':
+     'frameworks/extra-cmake-modules': '@latest-kf6'
++    'frameworks/kconfig': '@latest-kf6'
+     'frameworks/kcoreaddons': '@latest-kf6'
+     'frameworks/ki18n': '@latest-kf6'
+     'frameworks/kxmlgui': '@latest-kf6'
+-- 
+GitLab
+