gentoo resync : 25.03.2022

4 files changed, 109 insertions, 1 deletions

diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index d55c6d17dc9a..a66f8f097983 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,7 @@
+AUX kwave-21.12.3-missing-link.patch 671 BLAKE2B 4ecda5bbb01bdcf3da67ce7aaa389d3b4338e763ba68b52aaa81f2857fabd9b12dc5fc5b4780fc0fc04348da38c3dfaffcdc2c4212018f786e3a0010e5b10944 SHA512 c8ec77849daa3713529d18e68c391c038e0c87deb2906583ce5f03f9f4e15e92c8f58337cae8bde44ea4d66e540afc755cb62f08bdf4867be1e1087402917105
+AUX kwave-21.12.3-unused-dep.patch 2072 BLAKE2B bc6ac19498532527f487cd8aa72ebc04bd4f6f7967afc426c901e7c14ea790c85a101455f3bc70ec2c0aa44b34da30670dfdaf1b64149b1d30c23bc05924d157 SHA512 4813610ef6235edd5f4c55c656eb7ce89ecc4cf3f0279722af1633244af5f08971b9ec99057ce3dac0c508ebff72665806097686f353286ad8ffb93385a3078c
 DIST kwave-21.08.3.tar.xz 6915844 BLAKE2B 47957ff8f1fcee4ad135c04dcf1bd7610b8c4b25c5a6ec7abf6e44fe6783df56de31bbe6a10a58079bf2a35fa0959a1e1f675546f59473aaf00e3fef06a40fd7 SHA512 111a2159018c93fdd9d2b2627f926c39596dcc40241e15e467bb5909516fe6c6a07cb943a8f8611532c29de9aae28ec7c4eba53f7f38245b25d8b3386c0d69e3
 DIST kwave-21.12.3.tar.xz 6954384 BLAKE2B abf171bc6585158d5b0984e93a92e599d83b81c855edbfa12f192df208912ae0d5c72c4331528e7d9e88c5486fa5664158136ccf0fe56ab34e4b82051000f43e SHA512 8fd7728af6613f290bd49e41a83822d914e1d0ea3169ca84a3e8b328bbb527a4c6e207a9ec9c47dceb5981a05f1bd30439e305417c0793e81f2731864a1ef21c
 EBUILD kwave-21.08.3.ebuild 2086 BLAKE2B fba5710ea0858ba722f4729326c1986156697621da13eb96174c590b9ad994909de0f986b3fc86fdce1fb3f9398af0d765e1e2a2164227075fd6c3433dbab71d SHA512 465702f0737406bde0c77f793df1dfa5fe836162de3b118858dc962b79e2c10f2afe218ba88b133e07076c6fec942e18e109f5790ea7fe2007a43176058d7da5
-EBUILD kwave-21.12.3.ebuild 2089 BLAKE2B 8daf0029a6cad257755123ee9a759c35151aa4d4b59f437b45fa0f46404ad23422cff864fc428ac9e382757697b0a73b67983d73664f3c93611cd0689e0a7c49 SHA512 a27f02cfd32c6c15016b198dd38ed81afc1917cd3e950da92dfd25a52107ebc5d519fd020cf9fa2fea099bca76244c0763280a365e3631f82c80cc5a38c66529
+EBUILD kwave-21.12.3.ebuild 2178 BLAKE2B c3ce9360f458207ae34120b89e11d75ae15ed05a680307fba04a751edd4fefed181319cbf435fe845bc3ff06fc378dea6ea9ea28ef4ee6a1cb37381d37f133ab SHA512 1aba20ea58cd80b90beae74884be51dde2e844c916bf0f24518ff1fa89fde848b535ac1b5dcff7f2305840871b2c9299b1ccb3e1cb4d1d0dee10946b802e6858
 MISC metadata.xml 759 BLAKE2B 6a8771c874742936e5301754db683f085d283fd53f6f9f2b3e81a9b59041a3440e9202c60230763852eb6598f15a57c35d76eef8fc4adb66b44c7eb9069cc220 SHA512 7c3e7738773fbd838fa60b18f9ccbc5b8bc182517a17691e29b9b61a57f25817f52d6ee03609ba4c9ea48398aad27939b652a5bd628722324a6f8e61f52ef718
diff --git a/kde-apps/kwave/files/kwave-21.12.3-missing-link.patch b/kde-apps/kwave/files/kwave-21.12.3-missing-link.patch
new file mode 100644
index 000000000000..03df879dcf8d
--- /dev/null
+++ b/kde-apps/kwave/files/kwave-21.12.3-missing-link.patch
@@ -0,0 +1,25 @@
+From 45d40afe8443eae3e30ce4df2790bd9ae8b0d765 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 22 Mar 2022 12:23:50 +0100
+Subject: [PATCH] Add missing KCoreAddons link
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ plugins/goto/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/goto/CMakeLists.txt b/plugins/goto/CMakeLists.txt
+index 1f1b3a07..abc9ea0a 100644
+--- a/plugins/goto/CMakeLists.txt
++++ b/plugins/goto/CMakeLists.txt
+@@ -41,6 +41,7 @@ TARGET_LINK_LIBRARIES(plugin_goto_common
+     Qt5::Core
+     Qt5::Widgets
+     KF5::ConfigWidgets
++    KF5::CoreAddons
+     KF5::I18n
+ )
+ 
+-- 
+2.35.1
+
diff --git a/kde-apps/kwave/files/kwave-21.12.3-unused-dep.patch b/kde-apps/kwave/files/kwave-21.12.3-unused-dep.patch
new file mode 100644
index 000000000000..987b14286d70
--- /dev/null
+++ b/kde-apps/kwave/files/kwave-21.12.3-unused-dep.patch
@@ -0,0 +1,76 @@
+From a178fe327935384bb476c608717c1bc0af7b05e0 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Wed, 1 Dec 2021 23:09:17 +0100
+Subject: [PATCH] Remove unused KService dep
+
+---
+ CMakeLists.txt             | 1 -
+ kwave/CMakeLists.txt       | 1 -
+ libkwave/CMakeLists.txt    | 1 -
+ libkwave/PluginManager.cpp | 1 -
+ plugins/CMakeLists.txt     | 1 -
+ 5 files changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d955576f..f9302ac0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -250,7 +250,6 @@ FIND_PACKAGE(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     I18n
+     IconThemes
+     KIO
+-    Service
+     TextWidgets
+     XmlGui
+     WidgetsAddons
+diff --git a/kwave/CMakeLists.txt b/kwave/CMakeLists.txt
+index 6e2fef89..a8ba9537 100644
+--- a/kwave/CMakeLists.txt
++++ b/kwave/CMakeLists.txt
+@@ -99,7 +99,6 @@ TARGET_LINK_LIBRARIES(kwave_core
+     KF5::I18n
+     KF5::IconThemes
+     KF5::KIOFileWidgets
+-    KF5::Service
+     KF5::XmlGui
+ )
+ 
+diff --git a/libkwave/CMakeLists.txt b/libkwave/CMakeLists.txt
+index 5f303dd8..be753d6f 100644
+--- a/libkwave/CMakeLists.txt
++++ b/libkwave/CMakeLists.txt
+@@ -159,7 +159,6 @@ TARGET_LINK_LIBRARIES(libkwave
+     KF5::ConfigCore
+     KF5::CoreAddons
+     KF5::I18n
+-    KF5::Service
+     KF5::WidgetsAddons
+     KF5::XmlGui
+     pthread
+diff --git a/libkwave/PluginManager.cpp b/libkwave/PluginManager.cpp
+index d745cb33..1785d0cd 100644
+--- a/libkwave/PluginManager.cpp
++++ b/libkwave/PluginManager.cpp
+@@ -35,7 +35,6 @@
+ #include <KConfigGroup>
+ #include <KLocalizedString>
+ #include <KMainWindow>
+-#include <KPluginInfo>
+ #include <KPluginFactory>
+ #include <KPluginMetaData>
+ #include <KSharedConfig>
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index 171d6d99..7b9934f7 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -50,7 +50,6 @@ MACRO(KWAVE_PLUGIN _plugin)
+         KF5::I18n
+         KF5::IconThemes
+         KF5::KIOFileWidgets
+-        KF5::Service
+         KF5::TextWidgets
+         KF5::WidgetsAddons
+         KF5::XmlGui
+-- 
+GitLab
+
diff --git a/kde-apps/kwave/kwave-21.12.3.ebuild b/kde-apps/kwave/kwave-21.12.3.ebuild
index 051b15651165..3afae5b4f97b 100644
--- a/kde-apps/kwave/kwave-21.12.3.ebuild
+++ b/kde-apps/kwave/kwave-21.12.3.ebuild
@@ -69,6 +69,11 @@ BDEPEND="
 
 DOCS=( AUTHORS CHANGES LICENSES README TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-unused-dep.patch"
+	"${FILESDIR}/${P}-missing-link.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DDEBUG=$(usex debug)