summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-04-24 18:50:19 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-04-24 20:09:23 +0200
commit39feb387c29bca0eb3d33b571751aff46816251b (patch)
tree7142e71d84a609a9f4673415374f223463a8efd1
parentec04f143e0af83769d7fc9150385fea4c76d1bfb (diff)
downloadkde-39feb387c29bca0eb3d33b571751aff46816251b.tar.gz
kde-39feb387c29bca0eb3d33b571751aff46816251b.tar.bz2
kde-39feb387c29bca0eb3d33b571751aff46816251b.zip
kde-apps/juk: Fix upstream linking and add missing DEPEND
See also: https://invent.kde.org/multimedia/juk/-/merge_requests/24 Reported-by: Christophe Lermytte <gentoo@lermytte.be> Bug: https://bugs.gentoo.org/785418 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/juk/files/juk-21.04.0-missing-link.patch29
-rw-r--r--kde-apps/juk/juk-21.04.49.9999.ebuild8
-rw-r--r--kde-apps/juk/juk-9999.ebuild6
3 files changed, 39 insertions, 4 deletions
diff --git a/kde-apps/juk/files/juk-21.04.0-missing-link.patch b/kde-apps/juk/files/juk-21.04.0-missing-link.patch
new file mode 100644
index 00000000000..cb59f81e83e
--- /dev/null
+++ b/kde-apps/juk/files/juk-21.04.0-missing-link.patch
@@ -0,0 +1,29 @@
+From c36b4aba0946b932f9da335e77295af2e31dff6d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 18:44:04 +0200
+Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries
+
+This was working as long as it was implicitly provided by KIO.
+
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e30cfad6..f3413e6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -162,6 +162,7 @@ if(NOT MSVC AND NOT ( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) )
+ endif()
+
+ target_link_libraries(juk ${LIBMATH}
++ Qt5::Concurrent
+ Qt5::Gui
+ Qt5::Svg
+ Qt5::Widgets
+--
+2.31.1
+
diff --git a/kde-apps/juk/juk-21.04.49.9999.ebuild b/kde-apps/juk/juk-21.04.49.9999.ebuild
index 7b5f96f28e9..e6828d79d11 100644
--- a/kde-apps/juk/juk-21.04.49.9999.ebuild
+++ b/kde-apps/juk/juk-21.04.49.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-DEPEND="
+RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
@@ -43,4 +43,8 @@ DEPEND="
>=media-libs/phonon-4.11.0
>=media-libs/taglib-1.6
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-21.04.0-missing-link.patch" ) # bug 785418
diff --git a/kde-apps/juk/juk-9999.ebuild b/kde-apps/juk/juk-9999.ebuild
index 338f4113ed1..22c69373bce 100644
--- a/kde-apps/juk/juk-9999.ebuild
+++ b/kde-apps/juk/juk-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="5"
KEYWORDS=""
IUSE=""
-DEPEND="
+RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
@@ -43,4 +43,6 @@ DEPEND="
>=media-libs/phonon-4.11.0
>=media-libs/taglib-1.6
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+"