commit: 1bf3cac70302330c900e912d51537bf33d5822fb Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sat Nov 28 17:11:22 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Nov 28 17:13:23 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1bf3cac7
kde-apps/libakonadi: Add missing VIRTUALX_REQUIRED, built test tools Package-Manager: portage-2.2.26 .../libakonadi-15.11.80-testtools-optional.patch | 53 ++++++++++++++++++++++ .../libakonadi/libakonadi-15.12.49.9999.ebuild | 9 +++- kde-apps/libakonadi/libakonadi-9999.ebuild | 9 +++- 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/kde-apps/libakonadi/files/libakonadi-15.11.80-testtools-optional.patch b/kde-apps/libakonadi/files/libakonadi-15.11.80-testtools-optional.patch new file mode 100644 index 0000000..5267653 --- /dev/null +++ b/kde-apps/libakonadi/files/libakonadi-15.11.80-testtools-optional.patch @@ -0,0 +1,53 @@ +commit 4647731b1fb5dfeb68d9f7b54653c050e52e48e6 +Author: Andreas Sturmlechner <[email protected]> +Date: Sat Nov 28 17:48:46 2015 +0100 + + [akonadi] Make build of testing tools possible without BUILD_TESTING + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6ee9cbe..7e8df8c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,8 @@ else() + set(KF5Akonadi_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}/akonadi") + endif() + ++option(BUILD_TOOLS "Build and install tools for testing purposes." TRUE) ++ + ########### Find packages ########### + find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) +@@ -93,7 +95,14 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") + configure_file(akonadiprivate_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonadiprivate_export.h") + + add_subdirectory(src) +-if(BUILD_TESTING) ++# add testrunner (application for managing a self-contained test ++# environment) ++if(BUILD_TOOLS) ++ add_subdirectory(autotests/testrunner) ++ add_subdirectory(autotests/testresource) ++ add_subdirectory(autotests/testsearchplugin) ++endif() ++if(BUILD_TOOLS AND BUILD_TESTING) + add_subdirectory(autotests) + add_subdirectory(tests) + endif() +diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt +index 37dc10f..dc69a26 100644 +--- a/autotests/CMakeLists.txt ++++ b/autotests/CMakeLists.txt +@@ -25,13 +25,6 @@ include_directories( + ${Boost_INCLUDE_DIR} + ) + +-# add testrunner (application for managing a self-contained test +-# environment) +- +-add_subdirectory(testrunner) +-add_subdirectory(testresource) +-add_subdirectory(testsearchplugin) +- + # convenience macro to add akonadi qtestlib unit-tests + macro(add_akonadi_test _source) + set(_test ${_source}) diff --git a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild index 9fb8aa2..8bdb137 100644 --- a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild +++ b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild @@ -7,6 +7,7 @@ EAPI=5 KDE_DOXYGEN=true KDE_TEST=true KMNAME=kdepimlibs +VIRTUALX_REQUIRED=test inherit kde5 DESCRIPTION="Common akonadi libraries for PIM apps" @@ -57,8 +58,11 @@ REQUIRED_USE="test? ( tools )" S="${WORKDIR}/${P}/akonadi" src_prepare() { - use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \ - -i src/CMakeLists.txt + epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch" + if ! use tools ; then + sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \ + -i src/CMakeLists.txt || die + fi kde5_src_prepare } @@ -66,6 +70,7 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package designer Qt5Designer) + $(cmake-utils_use_build tools) $(cmake-utils_use_build test TESTING) ) kde5_src_configure diff --git a/kde-apps/libakonadi/libakonadi-9999.ebuild b/kde-apps/libakonadi/libakonadi-9999.ebuild index 9fb8aa2..8bdb137 100644 --- a/kde-apps/libakonadi/libakonadi-9999.ebuild +++ b/kde-apps/libakonadi/libakonadi-9999.ebuild @@ -7,6 +7,7 @@ EAPI=5 KDE_DOXYGEN=true KDE_TEST=true KMNAME=kdepimlibs +VIRTUALX_REQUIRED=test inherit kde5 DESCRIPTION="Common akonadi libraries for PIM apps" @@ -57,8 +58,11 @@ REQUIRED_USE="test? ( tools )" S="${WORKDIR}/${P}/akonadi" src_prepare() { - use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \ - -i src/CMakeLists.txt + epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch" + if ! use tools ; then + sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \ + -i src/CMakeLists.txt || die + fi kde5_src_prepare } @@ -66,6 +70,7 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package designer Qt5Designer) + $(cmake-utils_use_build tools) $(cmake-utils_use_build test TESTING) ) kde5_src_configure
