From 6f8038813c460b4f0572d5ef595cdfa94af3a94d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 May 2019 10:20:03 +0100 Subject: gentoo resync : 21.05.2019 --- kde-plasma/discover/Manifest | 3 +- kde-plasma/discover/discover-5.15.5.ebuild | 6 ++-- .../discover/files/discover-5.15.5-tests.patch | 38 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 kde-plasma/discover/files/discover-5.15.5-tests.patch (limited to 'kde-plasma/discover') diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index e83af9ec771a..1635230c6e7c 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,3 +1,4 @@ +AUX discover-5.15.5-tests.patch 1208 BLAKE2B 287a2e6ac59f012577df87ea3358514813c958e085a6aaac552add865671bf02cbaba8bc770234b5e647c02d7f097c8749d8053a8e463d5605449686a03ad6b0 SHA512 a51541e75d056c1ea6cfa16a20aca221bb56ae8a940601ea4b1d4b5431366b807d5bf6832733a86028dae9901a4eca8aaf89929ffac896bcfc5fb20eec55d914 DIST discover-5.15.5.tar.xz 10447644 BLAKE2B 456acc6bbbea216cde7a535fa591ef76316ee07f5ba57e6b3c6c20536b21877eb210f381cba8cc7c114110f3f7ffc4244163174bf8ae95cd022ca05a4be16bed SHA512 fc94bf3d93423d6327951c8ba76c2a08c7bd19aafbca7333e159af7500d1a78b464f7b5824b9168c522f052ca6cd322e9b5a26abd74657b99c734bbc7b864a3d -EBUILD discover-5.15.5.ebuild 1533 BLAKE2B 76f2b66359c67c78d6a0e8c4f75a093d0c15e8c86597582dbb76f8460d1d2bc6b7e45e4d808eac0f6d00b236aa21b360e2f9adc69bef3062338caa91167db4f2 SHA512 50b81d95bc8859af013cacba5b83cf96577797c889e2c26222a26529cecb1485d2181e2007d4e82773ecd8f1e626a42192d6951dd9f9f74800dd578d102c8dbc +EBUILD discover-5.15.5.ebuild 1584 BLAKE2B 9eab9376d186a5cd4f69a7091591384808945246d0f9e662c464e019279aefbfd8fa354c2eecf5640297c99bb15a870b4fd5d53b816182a59cc69ef5d23046c8 SHA512 29e2b6cdad1d7989987e385e3fc5167d182b71ec6de4805302b0ab95ec5ccfe8038501dbe7c4e7670c2ded95bc00ecbf6620e0a45a3f25ad2178d3c3a413cc27 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b diff --git a/kde-plasma/discover/discover-5.15.5.ebuild b/kde-plasma/discover/discover-5.15.5.ebuild index 6317798c5182..2844c35b75d7 100644 --- a/kde-plasma/discover/discover-5.15.5.ebuild +++ b/kde-plasma/discover/discover-5.15.5.ebuild @@ -9,8 +9,8 @@ inherit kde5 DESCRIPTION="KDE Plasma resources management GUI" HOMEPAGE="https://userbase.kde.org/Discover" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="firmware" +KEYWORDS="amd64 ~arm ~arm64 x86" +IUSE="+firmware" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -42,6 +42,8 @@ RDEPEND="${DEPEND} $(add_frameworks_dep kirigami) " +PATCHES=( "${FILESDIR}/${PN}-5.15.5-tests.patch" ) + src_prepare() { kde5_src_prepare # we don't need it with PackageKitBackend off diff --git a/kde-plasma/discover/files/discover-5.15.5-tests.patch b/kde-plasma/discover/files/discover-5.15.5-tests.patch new file mode 100644 index 000000000000..131a63b1e942 --- /dev/null +++ b/kde-plasma/discover/files/discover-5.15.5-tests.patch @@ -0,0 +1,38 @@ +From 03653a7d75ba8b24e28bc3adf5348ea3d0faf2b0 Mon Sep 17 00:00:00 2001 +From: Michael Palimaka +Date: Thu, 16 May 2019 19:39:44 +1000 +Subject: [PATCH] Port knsbackendtest to ecm_add_test + +Reviewers: #plasma, apol + +Reviewed By: apol + +Subscribers: asturmlechner, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D21239 +--- + libdiscover/backends/KNSBackend/tests/CMakeLists.txt | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/libdiscover/backends/KNSBackend/tests/CMakeLists.txt b/libdiscover/backends/KNSBackend/tests/CMakeLists.txt +index 4fabe5ec..e64eb8ca 100644 +--- a/libdiscover/backends/KNSBackend/tests/CMakeLists.txt ++++ b/libdiscover/backends/KNSBackend/tests/CMakeLists.txt +@@ -1,11 +1,3 @@ + include_directories(..) + +-add_executable(knsbackendtest KNSBackendTest.cpp) +-add_test(knsbackendtest knsbackendtest) +-ecm_mark_as_test(knsbackendtest) +-target_link_libraries(knsbackendtest +- Discover::Common +- +- Qt5::Test Qt5::Core +- KF5::NewStuff KF5::Attica +-) ++ecm_add_test(KNSBackendTest.cpp TEST_NAME knsbackendtest LINK_LIBRARIES Discover::Common Qt5::Core Qt5::Test KF5::Attica KF5::NewStuff) +-- +2.21.0 + -- cgit v1.2.3