Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libakonadi/, kde-apps/libakonadi/files/
Date: Sun, 29 Nov 2015 15:29:42
Message-Id: 1448730803.1bf3cac70302330c900e912d51537bf33d5822fb.kensington@gentoo
1 commit: 1bf3cac70302330c900e912d51537bf33d5822fb
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sat Nov 28 17:11:22 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 28 17:13:23 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1bf3cac7
7
8 kde-apps/libakonadi: Add missing VIRTUALX_REQUIRED, built test tools
9
10 Package-Manager: portage-2.2.26
11
12 .../libakonadi-15.11.80-testtools-optional.patch | 53 ++++++++++++++++++++++
13 .../libakonadi/libakonadi-15.12.49.9999.ebuild | 9 +++-
14 kde-apps/libakonadi/libakonadi-9999.ebuild | 9 +++-
15 3 files changed, 67 insertions(+), 4 deletions(-)
16
17 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
18 new file mode 100644
19 index 0000000..5267653
20 --- /dev/null
21 +++ b/kde-apps/libakonadi/files/libakonadi-15.11.80-testtools-optional.patch
22 @@ -0,0 +1,53 @@
23 +commit 4647731b1fb5dfeb68d9f7b54653c050e52e48e6
24 +Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
25 +Date: Sat Nov 28 17:48:46 2015 +0100
26 +
27 + [akonadi] Make build of testing tools possible without BUILD_TESTING
28 +
29 +diff --git a/CMakeLists.txt b/CMakeLists.txt
30 +index 6ee9cbe..7e8df8c 100644
31 +--- a/CMakeLists.txt
32 ++++ b/CMakeLists.txt
33 +@@ -43,6 +43,8 @@ else()
34 + set(KF5Akonadi_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}/akonadi")
35 + endif()
36 +
37 ++option(BUILD_TOOLS "Build and install tools for testing purposes." TRUE)
38 ++
39 + ########### Find packages ###########
40 + find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
41 + find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
42 +@@ -93,7 +95,14 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
43 + configure_file(akonadiprivate_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonadiprivate_export.h")
44 +
45 + add_subdirectory(src)
46 +-if(BUILD_TESTING)
47 ++# add testrunner (application for managing a self-contained test
48 ++# environment)
49 ++if(BUILD_TOOLS)
50 ++ add_subdirectory(autotests/testrunner)
51 ++ add_subdirectory(autotests/testresource)
52 ++ add_subdirectory(autotests/testsearchplugin)
53 ++endif()
54 ++if(BUILD_TOOLS AND BUILD_TESTING)
55 + add_subdirectory(autotests)
56 + add_subdirectory(tests)
57 + endif()
58 +diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
59 +index 37dc10f..dc69a26 100644
60 +--- a/autotests/CMakeLists.txt
61 ++++ b/autotests/CMakeLists.txt
62 +@@ -25,13 +25,6 @@ include_directories(
63 + ${Boost_INCLUDE_DIR}
64 + )
65 +
66 +-# add testrunner (application for managing a self-contained test
67 +-# environment)
68 +-
69 +-add_subdirectory(testrunner)
70 +-add_subdirectory(testresource)
71 +-add_subdirectory(testsearchplugin)
72 +-
73 + # convenience macro to add akonadi qtestlib unit-tests
74 + macro(add_akonadi_test _source)
75 + set(_test ${_source})
76
77 diff --git a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
78 index 9fb8aa2..8bdb137 100644
79 --- a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
80 +++ b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
81 @@ -7,6 +7,7 @@ EAPI=5
82 KDE_DOXYGEN=true
83 KDE_TEST=true
84 KMNAME=kdepimlibs
85 +VIRTUALX_REQUIRED=test
86 inherit kde5
87
88 DESCRIPTION="Common akonadi libraries for PIM apps"
89 @@ -57,8 +58,11 @@ REQUIRED_USE="test? ( tools )"
90 S="${WORKDIR}/${P}/akonadi"
91
92 src_prepare() {
93 - use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
94 - -i src/CMakeLists.txt
95 + epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch"
96 + if ! use tools ; then
97 + sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \
98 + -i src/CMakeLists.txt || die
99 + fi
100
101 kde5_src_prepare
102 }
103 @@ -66,6 +70,7 @@ src_prepare() {
104 src_configure() {
105 local mycmakeargs=(
106 $(cmake-utils_use_find_package designer Qt5Designer)
107 + $(cmake-utils_use_build tools)
108 $(cmake-utils_use_build test TESTING)
109 )
110 kde5_src_configure
111
112 diff --git a/kde-apps/libakonadi/libakonadi-9999.ebuild b/kde-apps/libakonadi/libakonadi-9999.ebuild
113 index 9fb8aa2..8bdb137 100644
114 --- a/kde-apps/libakonadi/libakonadi-9999.ebuild
115 +++ b/kde-apps/libakonadi/libakonadi-9999.ebuild
116 @@ -7,6 +7,7 @@ EAPI=5
117 KDE_DOXYGEN=true
118 KDE_TEST=true
119 KMNAME=kdepimlibs
120 +VIRTUALX_REQUIRED=test
121 inherit kde5
122
123 DESCRIPTION="Common akonadi libraries for PIM apps"
124 @@ -57,8 +58,11 @@ REQUIRED_USE="test? ( tools )"
125 S="${WORKDIR}/${P}/akonadi"
126
127 src_prepare() {
128 - use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
129 - -i src/CMakeLists.txt
130 + epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch"
131 + if ! use tools ; then
132 + sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \
133 + -i src/CMakeLists.txt || die
134 + fi
135
136 kde5_src_prepare
137 }
138 @@ -66,6 +70,7 @@ src_prepare() {
139 src_configure() {
140 local mycmakeargs=(
141 $(cmake-utils_use_find_package designer Qt5Designer)
142 + $(cmake-utils_use_build tools)
143 $(cmake-utils_use_build test TESTING)
144 )
145 kde5_src_configure