commit: 123bc00710c5a4724dd126fadcd2f24690574c56 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sat May 18 02:11:37 2019 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat May 18 02:11:48 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=123bc007
kde-plasma/discover: fix tests Bug: https://bugs.gentoo.org/678916 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> kde-plasma/discover/discover-5.15.90.ebuild | 2 ++ kde-plasma/discover/discover-5.16.49.9999.ebuild | 2 ++ .../discover/files/discover-5.15.5-tests.patch | 38 ++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/kde-plasma/discover/discover-5.15.90.ebuild b/kde-plasma/discover/discover-5.15.90.ebuild index 6317798c51..bd62c7d5af 100644 --- a/kde-plasma/discover/discover-5.15.90.ebuild +++ b/kde-plasma/discover/discover-5.15.90.ebuild @@ -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/discover-5.16.49.9999.ebuild b/kde-plasma/discover/discover-5.16.49.9999.ebuild index ae6b410e05..4b2533e516 100644 --- a/kde-plasma/discover/discover-5.16.49.9999.ebuild +++ b/kde-plasma/discover/discover-5.16.49.9999.ebuild @@ -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 0000000000..131a63b1e9 --- /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 <kensing...@gentoo.org> +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 +
