1 |
commit: 3711b047c17bf2b9e4edf2d931ed29e13c5f4413 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 14 18:34:54 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 14 18:35:30 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3711b047 |
7 |
|
8 |
kde-frameworks/extra-cmake-modules: Fix tests |
9 |
|
10 |
Reported-by: Paolo Pedroni <paolo.pedroni <AT> iol.it> |
11 |
Closes: https://bugs.gentoo.org/699804 |
12 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../extra-cmake-modules-5.64.0.ebuild | 5 +- |
16 |
.../files/extra-cmake-modules-5.64.0-tests.patch | 124 +++++++++++++++++++++ |
17 |
2 files changed, 128 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild |
20 |
index fc744aa15d8..c0a33ce5a2a 100644 |
21 |
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild |
22 |
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild |
23 |
@@ -31,7 +31,10 @@ RDEPEND=" |
24 |
|
25 |
RESTRICT+=" !test? ( test )" |
26 |
|
27 |
-PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) |
28 |
+PATCHES=( |
29 |
+ "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" |
30 |
+ "${FILESDIR}/${P}-tests.patch" |
31 |
+) |
32 |
|
33 |
python_check_deps() { |
34 |
has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
35 |
|
36 |
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch |
37 |
new file mode 100644 |
38 |
index 00000000000..511342cd2b9 |
39 |
--- /dev/null |
40 |
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch |
41 |
@@ -0,0 +1,124 @@ |
42 |
+From d2810741c2166354d7c95d4101eea52035d4fdf5 Mon Sep 17 00:00:00 2001 |
43 |
+From: "Friedrich W. H. Kossebau" <kossebau@×××.org> |
44 |
+Date: Mon, 4 Nov 2019 12:04:56 +0100 |
45 |
+Subject: Fix ECMSetupVersion tests for old policy with project() wo/ VERSION |
46 |
+ |
47 |
+With min required cmake version now bumped to 3.5, the policy for CMP0048 |
48 |
+needs to be set explicitly to old now to prepare what the tests check. |
49 |
+ |
50 |
+Fixup for 5ca01895e3c50322f79feeef5054d7f28b164d68 |
51 |
+--- |
52 |
+ tests/ECMSetupVersionTest/old_header/CMakeLists.txt | 1 + |
53 |
+ tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt | 1 + |
54 |
+ tests/ECMSetupVersionTest/old_simple/CMakeLists.txt | 1 + |
55 |
+ tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt | 1 + |
56 |
+ tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt | 1 + |
57 |
+ tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt | 1 + |
58 |
+ tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt | 1 + |
59 |
+ tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt | 1 + |
60 |
+ tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt | 1 + |
61 |
+ 9 files changed, 9 insertions(+) |
62 |
+ |
63 |
+(limited to 'tests') |
64 |
+ |
65 |
+diff --git a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt |
66 |
+index ea5ef2b..2bf8374 100644 |
67 |
+--- a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt |
68 |
++++ b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt |
69 |
+@@ -1,5 +1,6 @@ |
70 |
+ cmake_minimum_required(VERSION 3.5) |
71 |
+ |
72 |
++cmake_policy(SET CMP0048 OLD) |
73 |
+ project(old_header) |
74 |
+ |
75 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) |
76 |
+diff --git a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt |
77 |
+index 8fbc211..1080a0e 100644 |
78 |
+--- a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt |
79 |
++++ b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt |
80 |
+@@ -1,5 +1,6 @@ |
81 |
+ cmake_minimum_required(VERSION 3.5) |
82 |
+ |
83 |
++cmake_policy(SET CMP0048 OLD) |
84 |
+ project(old_header_abspath) |
85 |
+ |
86 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) |
87 |
+diff --git a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt |
88 |
+index 80e670e..30a26fd 100644 |
89 |
+--- a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt |
90 |
++++ b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt |
91 |
+@@ -1,5 +1,6 @@ |
92 |
+ cmake_minimum_required(VERSION 3.5) |
93 |
+ |
94 |
++cmake_policy(SET CMP0048 OLD) |
95 |
+ project(old_simple) |
96 |
+ |
97 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) |
98 |
+diff --git a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt |
99 |
+index 9d87e14..3e16b99 100644 |
100 |
+--- a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt |
101 |
++++ b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt |
102 |
+@@ -1,5 +1,6 @@ |
103 |
+ cmake_minimum_required(VERSION 3.5) |
104 |
+ |
105 |
++cmake_policy(SET CMP0048 OLD) |
106 |
+ project(old_soversion) |
107 |
+ |
108 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) |
109 |
+diff --git a/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt |
110 |
+index 8544e37..712a55a 100644 |
111 |
+--- a/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt |
112 |
++++ b/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt |
113 |
+@@ -1,5 +1,6 @@ |
114 |
+ cmake_minimum_required(VERSION 3.5) |
115 |
+ |
116 |
++cmake_policy(SET CMP0048 OLD) |
117 |
+ project(old_version_file) |
118 |
+ |
119 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) |
120 |
+diff --git a/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt |
121 |
+index ee4a5ee..6a17ce5 100644 |
122 |
+--- a/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt |
123 |
++++ b/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt |
124 |
+@@ -1,5 +1,6 @@ |
125 |
+ cmake_minimum_required(VERSION 3.5) |
126 |
+ |
127 |
++cmake_policy(SET CMP0048 OLD) |
128 |
+ project(old_version_file_abspath) |
129 |
+ |
130 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) |
131 |
+diff --git a/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt |
132 |
+index 445fd24..ba31da2 100644 |
133 |
+--- a/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt |
134 |
++++ b/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt |
135 |
+@@ -1,5 +1,6 @@ |
136 |
+ cmake_minimum_required(VERSION 3.5) |
137 |
+ |
138 |
++cmake_policy(SET CMP0048 OLD) |
139 |
+ project(old_version_file_anynewer) |
140 |
+ |
141 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) |
142 |
+diff --git a/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt |
143 |
+index fbf8e9a..4c80712 100644 |
144 |
+--- a/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt |
145 |
++++ b/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt |
146 |
+@@ -1,5 +1,6 @@ |
147 |
+ cmake_minimum_required(VERSION 3.5) |
148 |
+ |
149 |
++cmake_policy(SET CMP0048 OLD) |
150 |
+ project(old_version_file_exact) |
151 |
+ |
152 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) |
153 |
+diff --git a/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt |
154 |
+index 8ac01d1..27a9ba8 100644 |
155 |
+--- a/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt |
156 |
++++ b/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt |
157 |
+@@ -1,5 +1,6 @@ |
158 |
+ cmake_minimum_required(VERSION 3.5) |
159 |
+ |
160 |
++cmake_policy(SET CMP0048 OLD) |
161 |
+ project(old_version_file_samemajor) |
162 |
+ |
163 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) |
164 |
+-- |
165 |
+cgit v1.1 |