Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/juk/files/, kde-apps/juk/
Date: Sat, 24 Apr 2021 16:52:18
Message-Id: 1619283120.ad1de6c8cc71d1f2e28be9b744453fb91f14fa7d.asturm@gentoo
1 commit: ad1de6c8cc71d1f2e28be9b744453fb91f14fa7d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 24 16:50:19 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 24 16:52:00 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad1de6c8
7
8 kde-apps/juk: Fix upstream linking and add missing DEPEND
9
10 See also: https://invent.kde.org/multimedia/juk/-/merge_requests/24
11
12 Reported-by: Christophe Lermytte <gentoo <AT> lermytte.be>
13 Closes: https://bugs.gentoo.org/785418
14 Package-Manager: Portage-3.0.18, Repoman-3.0.3
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 kde-apps/juk/files/juk-21.04.0-missing-link.patch | 29 +++++++++++++++++++++++
18 kde-apps/juk/juk-21.04.0.ebuild | 8 +++++--
19 2 files changed, 35 insertions(+), 2 deletions(-)
20
21 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
22 new file mode 100644
23 index 00000000000..cb59f81e83e
24 --- /dev/null
25 +++ b/kde-apps/juk/files/juk-21.04.0-missing-link.patch
26 @@ -0,0 +1,29 @@
27 +From c36b4aba0946b932f9da335e77295af2e31dff6d Mon Sep 17 00:00:00 2001
28 +From: Andreas Sturmlechner <asturm@g.o>
29 +Date: Sat, 24 Apr 2021 18:44:04 +0200
30 +Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries
31 +
32 +This was working as long as it was implicitly provided by KIO.
33 +
34 +See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
35 +
36 +Signed-off-by: Andreas Sturmlechner <asturm@g.o>
37 +---
38 + CMakeLists.txt | 1 +
39 + 1 file changed, 1 insertion(+)
40 +
41 +diff --git a/CMakeLists.txt b/CMakeLists.txt
42 +index e30cfad6..f3413e6a 100644
43 +--- a/CMakeLists.txt
44 ++++ b/CMakeLists.txt
45 +@@ -162,6 +162,7 @@ if(NOT MSVC AND NOT ( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) )
46 + endif()
47 +
48 + target_link_libraries(juk ${LIBMATH}
49 ++ Qt5::Concurrent
50 + Qt5::Gui
51 + Qt5::Svg
52 + Qt5::Widgets
53 +--
54 +2.31.1
55 +
56
57 diff --git a/kde-apps/juk/juk-21.04.0.ebuild b/kde-apps/juk/juk-21.04.0.ebuild
58 index e3b9167438e..ade918bc4e5 100644
59 --- a/kde-apps/juk/juk-21.04.0.ebuild
60 +++ b/kde-apps/juk/juk-21.04.0.ebuild
61 @@ -17,7 +17,7 @@ SLOT="5"
62 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
63 IUSE=""
64
65 -DEPEND="
66 +RDEPEND="
67 >=dev-qt/qtdbus-${QTMIN}:5
68 >=dev-qt/qtgui-${QTMIN}:5
69 >=dev-qt/qtnetwork-${QTMIN}:5
70 @@ -43,4 +43,8 @@ DEPEND="
71 >=media-libs/phonon-4.11.0
72 >=media-libs/taglib-1.6
73 "
74 -RDEPEND="${DEPEND}"
75 +DEPEND="${RDEPEND}
76 + >=dev-qt/qtconcurrent-${QTMIN}:5
77 +"
78 +
79 +PATCHES=( "${FILESDIR}/${P}-missing-link.patch" ) # bug 785418