[gentoo-commits] repo/gentoo:master commit in: kde-apps/kwave/files/, kde-apps/kwave/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kwave/files/, kde-apps/kwave/

[Andreas Sturmlechner]

commit:     21e8dd46e29b3d98a478532bca35647da4681aee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 11:39:57 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 11:40:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e8dd46

kde-apps/kwave: Add missing KCoreAddons link

Closes: https://bugs.gentoo.org/835581
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kwave/files/kwave-21.12.3-missing-link.patch   | 25 +++++++
 .../kwave/files/kwave-21.12.3-unused-dep.patch     | 76 ++++++++++++++++++++++
 kde-apps/kwave/kwave-21.12.3.ebuild                |  5 ++
 3 files changed, 106 insertions(+)

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)