[gentoo-commits] proj/kde:master commit in: kde-apps/spectacle/, kde-apps/spectacle/files/

[gentoo-commits] proj/kde:master commit in: kde-apps/spectacle/, kde-apps/spectacle/files/

[Andreas Sturmlechner]

commit:     ec04f143e0af83769d7fc9150385fea4c76d1bfb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 16:31:16 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 18:03:05 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec04f143

kde-apps/spectacle: Fix and add implicit dependency

See also: https://invent.kde.org/graphics/spectacle/-/merge_requests/63

Reported-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Bug: https://bugs.gentoo.org/785403
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/spectacle-21.04.0-implicit-dep.patch     | 42 ++++++++++++++++++++++
 kde-apps/spectacle/spectacle-21.04.49.9999.ebuild  |  3 ++
 kde-apps/spectacle/spectacle-9999.ebuild           |  1 +
 3 files changed, 46 insertions(+)

diff --git a/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
new file mode 100644
index 0000000000..572cc501ae
--- /dev/null
+++ b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
@@ -0,0 +1,42 @@
+From a4450b62365d5e7c511e9855d31a68808c9bcfba Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 18:22:10 +0200
+Subject: [PATCH] Add missing Qt5Concurrent
+
+Implicit use via KIO.
+
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     | 1 +
+ src/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c63dca..7aac0d2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,6 +40,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOR
+ find_package(
+     Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
+         Core
++        Concurrent
+         Widgets
+         DBus
+         PrintSupport
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3cd737b..c715a29 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -69,6 +69,7 @@ ki18n_wrap_ui(spectacle Gui/SettingsDialog/GeneralOptions.ui Gui/SettingsDialog/
+ 
+ target_link_libraries(
+     spectacle
++        Qt::Concurrent
+         Qt::DBus
+         Qt::PrintSupport
+         KF5::CoreAddons
+-- 
+2.31.1
+

diff --git a/kde-apps/spectacle/spectacle-21.04.49.9999.ebuild b/kde-apps/spectacle/spectacle-21.04.49.9999.ebuild
index 63a53f4372..96dd332ac3 100644
--- a/kde-apps/spectacle/spectacle-21.04.49.9999.ebuild
+++ b/kde-apps/spectacle/spectacle-21.04.49.9999.ebuild
@@ -21,6 +21,7 @@ IUSE="+annotate kipi share"
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
 DEPEND="
 	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
@@ -53,6 +54,8 @@ RDEPEND="${DEPEND}
 	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-21.04.0-implicit-dep.patch" ) # bug 785403
+
 src_prepare() {
 	ecm_src_prepare
 	# Unnecessary with >=media-libs/kimageannotator-0.4.0

diff --git a/kde-apps/spectacle/spectacle-9999.ebuild b/kde-apps/spectacle/spectacle-9999.ebuild
index a85c59ecc6..25d53c60f0 100644
--- a/kde-apps/spectacle/spectacle-9999.ebuild
+++ b/kde-apps/spectacle/spectacle-9999.ebuild
@@ -21,6 +21,7 @@ IUSE="+annotate kipi share"
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
 DEPEND="
 	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5