From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1090851-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3CFD6138334
for <garchives@archives.gentoo.org>; Sat, 18 May 2019 02:12:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 377A2E082F;
Sat, 18 May 2019 02:12:06 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 07132E082F
for <gentoo-commits@lists.gentoo.org>; Sat, 18 May 2019 02:12:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 087D33446CD
for <gentoo-commits@lists.gentoo.org>; Sat, 18 May 2019 02:12:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CB7D5EB
for <gentoo-commits@lists.gentoo.org>; Sat, 18 May 2019 02:12:01 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1558145508.123bc00710c5a4724dd126fadcd2f24690574c56.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/files/, kde-plasma/discover/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-plasma/discover/discover-5.15.90.ebuild kde-plasma/discover/discover-5.16.49.9999.ebuild kde-plasma/discover/files/discover-5.15.5-tests.patch
X-VCS-Directories: kde-plasma/discover/files/ kde-plasma/discover/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 123bc00710c5a4724dd126fadcd2f24690574c56
X-VCS-Branch: master
Date: Sat, 18 May 2019 02:12:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5ad089e9-1a66-4884-ba88-489d1d5ec172
X-Archives-Hash: b96453605d6a34e77d9f92a7aa9807d9
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 <kensington@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
+