diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
| commit | 908778078736bd36f7a60a2d576d415cb8e000fa (patch) | |
| tree | c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /kde-plasma/discover | |
| parent | 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff) | |
gentoo resync : 22.05.2021
Diffstat (limited to 'kde-plasma/discover')
| -rw-r--r-- | kde-plasma/discover/Manifest | 1 | ||||
| -rw-r--r-- | kde-plasma/discover/files/discover-5.21.4-missing-link.patch | 49 |
2 files changed, 50 insertions, 0 deletions
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index 26855f73744e..44972ba0e7fb 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,4 +1,5 @@ AUX discover-5.20.5-CVE-2021-28117.patch 1434 BLAKE2B c31d0032cdfe3f8d96ad5e7f736c92c2dfcd6cc8e2b8c9b9e90a4a3d41159d961b80427d14ff6a22caa06e6dbdc17535be6243180d439e04879bbd957309859c SHA512 1059cce1be5f8f24a4345488c60decb2e4782fdc11f02ef625111164b6f8b32343528282ec4d03a015e36aa076cd6f9fcfa24e9b7d5c02fe25295cf03c7511a3 +AUX discover-5.21.4-missing-link.patch 2141 BLAKE2B 23b81f9f4e0daa05183ed3a31e98d8c1f3ac3ecfdb08511c3fb14bbf726a14086c5c834d3c7b7cc3f575500eb86f4cc85e141c48361597329a62c47c45807956 SHA512 f8201dad0e00e1a36338ab9dc956cd1baa7268ce4dd23c3d2b5a7ba9c9922da216697115396b7c32c3656faa60a107da62343af3b7a250d64e6d51c43768a9ae DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7 DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf EBUILD discover-5.20.5-r1.ebuild 2217 BLAKE2B 41d5493274bf956d46e9719c4e174a145db849ea28650e1526935e3dd07ec7b8ef158c5d166712fedff439a4187f6e508ed34f1a5df615b9d827b9d7c03fbfdd SHA512 5b1e6e3721b21f2d927bb96c8f8cc89c5e87fec0f0271257f18be0fa72581710d4902c5163d3d7e9e5c29bc1d3a9154fd6927285fd54efa207ade598b786c757 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 new file mode 100644 index 000000000000..c8c8b152ea7c --- /dev/null +++ b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch @@ -0,0 +1,49 @@ +From 3c578beeb5d3748d9fdacae4ace42fe6098d9184 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 25 Apr 2021 00:26:12 +0200 +Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries + +This was working as long as it was implicitly provided by KIO. +Other backends are fine. + +Fixes: +- DiscoverCommon w/ AppStreamQt +- packagekit-backend + +See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + libdiscover/CMakeLists.txt | 2 +- + libdiscover/backends/PackageKitBackend/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt +index 1097ea84..3e2a6c9c 100644 +--- a/libdiscover/CMakeLists.txt ++++ b/libdiscover/CMakeLists.txt +@@ -48,7 +48,7 @@ if(TARGET AppStreamQt) + appstream/AppStreamIntegration.cpp + appstream/AppStreamUtils.cpp + ) +- target_link_libraries(DiscoverCommon PRIVATE AppStreamQt) ++ target_link_libraries(DiscoverCommon PRIVATE Qt5::Concurrent AppStreamQt) + + if(AppStreamQt_VERSION VERSION_GREATER 0.12.4) + target_compile_definitions(DiscoverCommon PRIVATE -DAPPSTREAM_HAS_SPDX=1) +diff --git a/libdiscover/backends/PackageKitBackend/CMakeLists.txt b/libdiscover/backends/PackageKitBackend/CMakeLists.txt +index cfeb38f1..466dbc49 100644 +--- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt ++++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt +@@ -19,7 +19,7 @@ ecm_qt_declare_logging_category(packagekit-backend_SRCS HEADER libdiscover_backe + + add_library(packagekit-backend MODULE ${packagekit-backend_SRCS}) + +-target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt) ++target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core Qt5::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt) + install(TARGETS packagekit-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover) + + if(TARGET PkgConfig::Markdown) +-- +2.31.1 + |