| 1 |
commit: 39feb387c29bca0eb3d33b571751aff46816251b |
| 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 18:09:23 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=39feb387 |
| 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 |
Bug: 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.49.9999.ebuild | 8 +++++-- |
| 19 |
kde-apps/juk/juk-9999.ebuild | 6 +++-- |
| 20 |
3 files changed, 39 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
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 |
| 23 |
new file mode 100644 |
| 24 |
index 0000000000..cb59f81e83 |
| 25 |
--- /dev/null |
| 26 |
+++ b/kde-apps/juk/files/juk-21.04.0-missing-link.patch |
| 27 |
@@ -0,0 +1,29 @@ |
| 28 |
+From c36b4aba0946b932f9da335e77295af2e31dff6d Mon Sep 17 00:00:00 2001 |
| 29 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 30 |
+Date: Sat, 24 Apr 2021 18:44:04 +0200 |
| 31 |
+Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries |
| 32 |
+ |
| 33 |
+This was working as long as it was implicitly provided by KIO. |
| 34 |
+ |
| 35 |
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426 |
| 36 |
+ |
| 37 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 38 |
+--- |
| 39 |
+ CMakeLists.txt | 1 + |
| 40 |
+ 1 file changed, 1 insertion(+) |
| 41 |
+ |
| 42 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 43 |
+index e30cfad6..f3413e6a 100644 |
| 44 |
+--- a/CMakeLists.txt |
| 45 |
++++ b/CMakeLists.txt |
| 46 |
+@@ -162,6 +162,7 @@ if(NOT MSVC AND NOT ( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) ) |
| 47 |
+ endif() |
| 48 |
+ |
| 49 |
+ target_link_libraries(juk ${LIBMATH} |
| 50 |
++ Qt5::Concurrent |
| 51 |
+ Qt5::Gui |
| 52 |
+ Qt5::Svg |
| 53 |
+ Qt5::Widgets |
| 54 |
+-- |
| 55 |
+2.31.1 |
| 56 |
+ |
| 57 |
|
| 58 |
diff --git a/kde-apps/juk/juk-21.04.49.9999.ebuild b/kde-apps/juk/juk-21.04.49.9999.ebuild |
| 59 |
index 7b5f96f28e..e6828d79d1 100644 |
| 60 |
--- a/kde-apps/juk/juk-21.04.49.9999.ebuild |
| 61 |
+++ b/kde-apps/juk/juk-21.04.49.9999.ebuild |
| 62 |
@@ -17,7 +17,7 @@ SLOT="5" |
| 63 |
KEYWORDS="" |
| 64 |
IUSE="" |
| 65 |
|
| 66 |
-DEPEND=" |
| 67 |
+RDEPEND=" |
| 68 |
>=dev-qt/qtdbus-${QTMIN}:5 |
| 69 |
>=dev-qt/qtgui-${QTMIN}:5 |
| 70 |
>=dev-qt/qtnetwork-${QTMIN}:5 |
| 71 |
@@ -43,4 +43,8 @@ DEPEND=" |
| 72 |
>=media-libs/phonon-4.11.0 |
| 73 |
>=media-libs/taglib-1.6 |
| 74 |
" |
| 75 |
-RDEPEND="${DEPEND}" |
| 76 |
+DEPEND="${RDEPEND} |
| 77 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
| 78 |
+" |
| 79 |
+ |
| 80 |
+PATCHES=( "${FILESDIR}/${PN}-21.04.0-missing-link.patch" ) # bug 785418 |
| 81 |
|
| 82 |
diff --git a/kde-apps/juk/juk-9999.ebuild b/kde-apps/juk/juk-9999.ebuild |
| 83 |
index 338f4113ed..22c69373bc 100644 |
| 84 |
--- a/kde-apps/juk/juk-9999.ebuild |
| 85 |
+++ b/kde-apps/juk/juk-9999.ebuild |
| 86 |
@@ -17,7 +17,7 @@ SLOT="5" |
| 87 |
KEYWORDS="" |
| 88 |
IUSE="" |
| 89 |
|
| 90 |
-DEPEND=" |
| 91 |
+RDEPEND=" |
| 92 |
>=dev-qt/qtdbus-${QTMIN}:5 |
| 93 |
>=dev-qt/qtgui-${QTMIN}:5 |
| 94 |
>=dev-qt/qtnetwork-${QTMIN}:5 |
| 95 |
@@ -43,4 +43,6 @@ DEPEND=" |
| 96 |
>=media-libs/phonon-4.11.0 |
| 97 |
>=media-libs/taglib-1.6 |
| 98 |
" |
| 99 |
-RDEPEND="${DEPEND}" |
| 100 |
+DEPEND="${RDEPEND} |
| 101 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
| 102 |
+" |
Archives