| 1 |
commit: adf30035141015d54d46a27b77727e9f620c7bcc |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 24 22:30:57 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 24 22:39:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf30035 |
| 7 |
|
| 8 |
kde-plasma/discover: Fix upstream linking |
| 9 |
|
| 10 |
See also: https://invent.kde.org/plasma/discover/-/merge_requests/116 |
| 11 |
|
| 12 |
Reported-by: Kenneth G. Strawn <kenny.strawn <AT> gmail.com> |
| 13 |
Closes: https://bugs.gentoo.org/785457 |
| 14 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
kde-plasma/discover/discover-5.21.4.ebuild | 2 + |
| 18 |
.../files/discover-5.21.4-missing-link.patch | 49 ++++++++++++++++++++++ |
| 19 |
2 files changed, 51 insertions(+) |
| 20 |
|
| 21 |
diff --git a/kde-plasma/discover/discover-5.21.4.ebuild b/kde-plasma/discover/discover-5.21.4.ebuild |
| 22 |
index 07a1f7d78f4..2c50bd9597f 100644 |
| 23 |
--- a/kde-plasma/discover/discover-5.21.4.ebuild |
| 24 |
+++ b/kde-plasma/discover/discover-5.21.4.ebuild |
| 25 |
@@ -56,6 +56,8 @@ RDEPEND="${DEPEND} |
| 26 |
>=kde-frameworks/kirigami-${KFMIN}:5 |
| 27 |
" |
| 28 |
|
| 29 |
+PATCHES=( "${FILESDIR}/${P}-missing-link.patch" ) # bug 785457 |
| 30 |
+ |
| 31 |
src_prepare() { |
| 32 |
ecm_src_prepare |
| 33 |
# we don't need it with PackageKitBackend off |
| 34 |
|
| 35 |
diff --git a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch |
| 36 |
new file mode 100644 |
| 37 |
index 00000000000..c8c8b152ea7 |
| 38 |
--- /dev/null |
| 39 |
+++ b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch |
| 40 |
@@ -0,0 +1,49 @@ |
| 41 |
+From 3c578beeb5d3748d9fdacae4ace42fe6098d9184 Mon Sep 17 00:00:00 2001 |
| 42 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 43 |
+Date: Sun, 25 Apr 2021 00:26:12 +0200 |
| 44 |
+Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries |
| 45 |
+ |
| 46 |
+This was working as long as it was implicitly provided by KIO. |
| 47 |
+Other backends are fine. |
| 48 |
+ |
| 49 |
+Fixes: |
| 50 |
+- DiscoverCommon w/ AppStreamQt |
| 51 |
+- packagekit-backend |
| 52 |
+ |
| 53 |
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426 |
| 54 |
+ |
| 55 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 56 |
+--- |
| 57 |
+ libdiscover/CMakeLists.txt | 2 +- |
| 58 |
+ libdiscover/backends/PackageKitBackend/CMakeLists.txt | 2 +- |
| 59 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
| 60 |
+ |
| 61 |
+diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt |
| 62 |
+index 1097ea84..3e2a6c9c 100644 |
| 63 |
+--- a/libdiscover/CMakeLists.txt |
| 64 |
++++ b/libdiscover/CMakeLists.txt |
| 65 |
+@@ -48,7 +48,7 @@ if(TARGET AppStreamQt) |
| 66 |
+ appstream/AppStreamIntegration.cpp |
| 67 |
+ appstream/AppStreamUtils.cpp |
| 68 |
+ ) |
| 69 |
+- target_link_libraries(DiscoverCommon PRIVATE AppStreamQt) |
| 70 |
++ target_link_libraries(DiscoverCommon PRIVATE Qt5::Concurrent AppStreamQt) |
| 71 |
+ |
| 72 |
+ if(AppStreamQt_VERSION VERSION_GREATER 0.12.4) |
| 73 |
+ target_compile_definitions(DiscoverCommon PRIVATE -DAPPSTREAM_HAS_SPDX=1) |
| 74 |
+diff --git a/libdiscover/backends/PackageKitBackend/CMakeLists.txt b/libdiscover/backends/PackageKitBackend/CMakeLists.txt |
| 75 |
+index cfeb38f1..466dbc49 100644 |
| 76 |
+--- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt |
| 77 |
++++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt |
| 78 |
+@@ -19,7 +19,7 @@ ecm_qt_declare_logging_category(packagekit-backend_SRCS HEADER libdiscover_backe |
| 79 |
+ |
| 80 |
+ add_library(packagekit-backend MODULE ${packagekit-backend_SRCS}) |
| 81 |
+ |
| 82 |
+-target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt) |
| 83 |
++target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core Qt5::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt) |
| 84 |
+ install(TARGETS packagekit-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover) |
| 85 |
+ |
| 86 |
+ if(TARGET PkgConfig::Markdown) |
| 87 |
+-- |
| 88 |
+2.31.1 |
| 89 |
+ |
Archives