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 14815138ACF for ; Mon, 9 Feb 2015 20:37:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94127E098A; Mon, 9 Feb 2015 20:37:22 +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 DCAFCE098A for ; Mon, 9 Feb 2015 20:37:21 +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 D71743407D4 for ; Mon, 9 Feb 2015 20:37:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86317D1FF for ; Mon, 9 Feb 2015 20:37: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: <1423514226.d4b833d89b502806ff70d080a7d16ff3d7749533.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/files/, kde-apps/libkdegames/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch kde-apps/libkdegames/libkdegames-9999.ebuild X-VCS-Directories: kde-apps/libkdegames/ kde-apps/libkdegames/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: d4b833d89b502806ff70d080a7d16ff3d7749533 X-VCS-Branch: master Date: Mon, 9 Feb 2015 20:37: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: 07a57941-5e04-47d4-9983-25694201428c X-Archives-Hash: f675009a595f35ee3b369a4684a9db52 commit: d4b833d89b502806ff70d080a7d16ff3d7749533 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Feb 7 17:35:53 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Feb 9 20:37:06 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d4b833d8 [kde-apps/libkdegames] Optional tests: kick it like kwin Use a more promising patch already submitted for review. Package-Manager: portage-2.2.14 --- .../files/libkdegames-5.9999-buildsystem.patch | 58 ---------------------- .../files/libkdegames-9999-tests-optional.patch | 33 ++++++++++++ kde-apps/libkdegames/libkdegames-9999.ebuild | 2 +- 3 files changed, 34 insertions(+), 59 deletions(-) diff --git a/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch b/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch deleted file mode 100644 index 62a7186..0000000 --- a/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/CMakeLists.txt 2015-01-18 21:48:57.436568121 +0100 -+++ b/CMakeLists.txt 2015-01-18 21:49:04.667567906 +0100 -@@ -1,5 +1,3 @@ --enable_testing() -- - project(libkdegames) - - cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) -@@ -9,7 +7,7 @@ - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - - --find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) -+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg) - find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive - DBusAddons DNSSD Declarative - I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash -@@ -51,7 +49,10 @@ - add_subdirectory( highscore ) - add_subdirectory( includes ) - add_subdirectory( libkdegamesprivate ) --add_subdirectory( tests ) -+ -+if(BUILD_TESTING) -+ add_subdirectory( tests ) -+endif() - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/highscore ---- a/tests/CMakeLists.txt 2015-01-18 21:34:42.477593601 +0100 -+++ b/tests/CMakeLists.txt 2015-01-18 21:39:09.461585644 +0100 -@@ -1,3 +1,5 @@ -+find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE) -+ - set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) - include_directories( ${CMAKE_SOURCE_DIR}/libkdegames ) - ---- a/libkdegamesprivate/CMakeLists.txt 2015-01-18 21:49:50.737566533 +0100 -+++ b/libkdegamesprivate/CMakeLists.txt 2015-01-18 21:51:18.496563917 +0100 -@@ -1,7 +1,8 @@ --enable_testing() - project(libkdegamesprivate) - --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory( tests ) -+endif() - - # NOTE: The libkdegamesprivate target is compiled in the parent directory, - # because CMake can't cope with exported libraries in two different ---- a/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:49:50.737566533 +0100 -+++ b/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:54:04.201558979 +0100 -@@ -1,3 +1,5 @@ -+find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE) -+ - set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) - diff --git a/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch b/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch new file mode 100644 index 0000000..fa07df0 --- /dev/null +++ b/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2664fd4..32f453b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,3 @@ +-enable_testing() +- + project(libkdegames) + + cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +@@ -9,12 +7,21 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg) + find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive + DBusAddons DNSSD Declarative + I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash + Bookmarks KIO NewStuff KDELibs4Support) + ++find_package(Qt5Test ${QT_MIN_VERSION} QUIET) ++set_package_properties(Qt5Test PROPERTIES ++ PURPOSE "Required for tests" ++ TYPE OPTIONAL) ++add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests") ++if (NOT Qt5Test_FOUND) ++ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") ++endif() ++ + include(FeatureSummary) + include(GenerateExportHeader) + include(ECMPackageConfigHelpers) diff --git a/kde-apps/libkdegames/libkdegames-9999.ebuild b/kde-apps/libkdegames/libkdegames-9999.ebuild index 2b635ad..0637f23 100644 --- a/kde-apps/libkdegames/libkdegames-9999.ebuild +++ b/kde-apps/libkdegames/libkdegames-9999.ebuild @@ -48,4 +48,4 @@ DEPEND=" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-5.9999-buildsystem.patch" ) +PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )