From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 08F9B138ACF for ; Wed, 21 Jan 2015 20:48:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AAD5E0869; Wed, 21 Jan 2015 20:48:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EC21E0869 for ; Wed, 21 Jan 2015 20:48:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3B6B3406A1 for ; Wed, 21 Jan 2015 20:48:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E42AF10148 for ; Wed, 21 Jan 2015 20:48:19 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1421873263.53093bb78eade2664b9f401cdf9641cfc72d034e.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/files/, kde-misc/kdeconnect/ X-VCS-Repository: proj/kde X-VCS-Files: kde-misc/kdeconnect/files/kdeconnect-9999-tests-optional.patch kde-misc/kdeconnect/kdeconnect-9999.ebuild X-VCS-Directories: kde-misc/kdeconnect/files/ kde-misc/kdeconnect/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 53093bb78eade2664b9f401cdf9641cfc72d034e X-VCS-Branch: master Date: Wed, 21 Jan 2015 20:48:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0e3c3783-9ec3-470e-b359-82c604b5d33f X-Archives-Hash: bdc99e5a7094bfd72cbee8262125229a commit: 53093bb78eade2664b9f401cdf9641cfc72d034e Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Jan 19 23:27:49 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Wed Jan 21 20:47:43 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=53093bb7 [kde-misc/kdeconnect] Make tests optional --- .../files/kdeconnect-9999-tests-optional.patch | 26 ++++++++++++++++++++++ kde-misc/kdeconnect/kdeconnect-9999.ebuild | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/kde-misc/kdeconnect/files/kdeconnect-9999-tests-optional.patch b/kde-misc/kdeconnect/files/kdeconnect-9999-tests-optional.patch new file mode 100644 index 0000000..8ebc0bd --- /dev/null +++ b/kde-misc/kdeconnect/files/kdeconnect-9999-tests-optional.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt 2015-01-21 01:15:05.438460864 +0100 ++++ b/CMakeLists.txt 2015-01-21 01:17:08.896283297 +0100 +@@ -2,10 +2,11 @@ + + cmake_minimum_required(VERSION 2.8.12) + ++set(QT_MIN_VERSION "5.2.0") + find_package(ECM 0.0.9 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake) + +-find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Quick) + find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes) + find_package(Qca-qt5 2.1.0 REQUIRED) + +@@ -32,6 +33,9 @@ + add_subdirectory(cli) + add_subdirectory(fileitemactionplugin) + +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED) ++ add_subdirectory(tests) ++endif() + + install(PROGRAMS kdeconnect-non-plasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild index e614c51..a3f2a0a 100644 --- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild @@ -7,7 +7,7 @@ EAPI=5 EGIT_BRANCH="frameworks" MY_PN=${PN}-kde KMNAME=${MY_PN} - +KDE_TEST="true" inherit kde5 DESCRIPTION="Adds communication between KDE and your smartphone" @@ -26,6 +26,8 @@ RDEPEND="${DEPEND} net-dns/avahi " +PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" ) + [[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P} pkg_postinst(){