1 |
commit: da6579f8b2f62c7d0092d3528bde8311e72f3a15 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 12 22:10:16 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 12 23:07:34 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6579f8 |
7 |
|
8 |
media-gfx/digikam: Fix build with KF-5.31 or clang |
9 |
|
10 |
Gentoo-bug: 609114 |
11 |
|
12 |
Package-Manager: portage-2.3.3 |
13 |
|
14 |
media-gfx/digikam/digikam-5.3.0-r1.ebuild | 6 +- |
15 |
media-gfx/digikam/files/digikam-5.3.0-clang.patch | 160 +++++++++++++++++++++ |
16 |
.../digikam/files/digikam-5.3.0-kf-5.31.patch | 76 ++++++++++ |
17 |
3 files changed, 241 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/media-gfx/digikam/digikam-5.3.0-r1.ebuild b/media-gfx/digikam/digikam-5.3.0-r1.ebuild |
20 |
index 213652c0a5..8777c82e99 100644 |
21 |
--- a/media-gfx/digikam/digikam-5.3.0-r1.ebuild |
22 |
+++ b/media-gfx/digikam/digikam-5.3.0-r1.ebuild |
23 |
@@ -106,7 +106,11 @@ RDEPEND="${COMMON_DEPEND} |
24 |
RESTRICT=test |
25 |
# bug 366505 |
26 |
|
27 |
-PATCHES=( "${FILESDIR}/${P}-db-lock.patch" ) |
28 |
+PATCHES=( |
29 |
+ "${FILESDIR}/${P}-db-lock.patch" |
30 |
+ "${FILESDIR}/${P}-clang.patch" |
31 |
+ "${FILESDIR}/${P}-kf-5.31.patch" |
32 |
+) |
33 |
|
34 |
pkg_pretend() { |
35 |
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
36 |
|
37 |
diff --git a/media-gfx/digikam/files/digikam-5.3.0-clang.patch b/media-gfx/digikam/files/digikam-5.3.0-clang.patch |
38 |
new file mode 100644 |
39 |
index 0000000000..b4af04cd19 |
40 |
--- /dev/null |
41 |
+++ b/media-gfx/digikam/files/digikam-5.3.0-clang.patch |
42 |
@@ -0,0 +1,160 @@ |
43 |
+commit 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758 |
44 |
+Author: Gilles Caulier <caulier.gilles@×××××.com> |
45 |
+Date: Wed Jan 18 10:13:20 2017 +0100 |
46 |
+ |
47 |
+ Fix compilation with clang |
48 |
+ |
49 |
+diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h |
50 |
+index 4ba89c9..d7e6c77 100644 |
51 |
+--- a/libs/database/imagehistory/imagehistorygraph_boost.h |
52 |
++++ b/libs/database/imagehistory/imagehistorygraph_boost.h |
53 |
+@@ -28,7 +28,7 @@ |
54 |
+ #include "digikam_config.h" |
55 |
+ |
56 |
+ // Pragma directives to reduce warnings from Boost header files. |
57 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
58 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
59 |
+ #pragma GCC diagnostic push |
60 |
+ #pragma GCC diagnostic ignored "-Wunused-local-typedefs" |
61 |
+ #endif |
62 |
+@@ -1554,7 +1554,7 @@ protected: |
63 |
+ } // namespace Digikam |
64 |
+ |
65 |
+ // Restore warnings |
66 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
67 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
68 |
+ #pragma GCC diagnostic pop |
69 |
+ #endif |
70 |
+ |
71 |
+diff --git a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp |
72 |
+index f5d0640..91e443d 100644 |
73 |
+--- a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp |
74 |
++++ b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp |
75 |
+@@ -52,7 +52,7 @@ |
76 |
+ #define GREYSTORATION_USING_GFACT 1 |
77 |
+ |
78 |
+ // Pragma directives to reduce warnings from CImg header files. |
79 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
80 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
81 |
+ #pragma GCC diagnostic push |
82 |
+ #pragma GCC diagnostic ignored "-Wunused-local-typedefs" |
83 |
+ #pragma GCC diagnostic ignored "-Wunused-but-set-variable" |
84 |
+@@ -71,7 +71,7 @@ |
85 |
+ #include "cimg/CImg.h" |
86 |
+ |
87 |
+ // Restore warnings |
88 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
89 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
90 |
+ #pragma GCC diagnostic pop |
91 |
+ #endif |
92 |
+ |
93 |
+diff --git a/libs/dimg/filters/randomnumbergenerator.cpp b/libs/dimg/filters/randomnumbergenerator.cpp |
94 |
+index 93d7cc4..d7b2ed8 100644 |
95 |
+--- a/libs/dimg/filters/randomnumbergenerator.cpp |
96 |
++++ b/libs/dimg/filters/randomnumbergenerator.cpp |
97 |
+@@ -26,7 +26,7 @@ |
98 |
+ // Boost includes |
99 |
+ |
100 |
+ // Pragma directives to reduce warnings from Boost header files. |
101 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
102 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
103 |
+ #pragma GCC diagnostic push |
104 |
+ #pragma GCC diagnostic ignored "-Wundef" |
105 |
+ #endif |
106 |
+@@ -44,7 +44,7 @@ |
107 |
+ #include <boost/random/variate_generator.hpp> |
108 |
+ |
109 |
+ // Restore warnings |
110 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
111 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
112 |
+ #pragma GCC diagnostic pop |
113 |
+ #endif |
114 |
+ |
115 |
+diff --git a/libs/dimg/filters/sharp/matrix.cpp b/libs/dimg/filters/sharp/matrix.cpp |
116 |
+index 4f32aa3..1a3c65a 100644 |
117 |
+--- a/libs/dimg/filters/sharp/matrix.cpp |
118 |
++++ b/libs/dimg/filters/sharp/matrix.cpp |
119 |
+@@ -43,7 +43,7 @@ |
120 |
+ // Eigen includes |
121 |
+ |
122 |
+ // Pragma directives to reduce warnings from Eigen header files. |
123 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
124 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
125 |
+ #pragma GCC diagnostic push |
126 |
+ #pragma GCC diagnostic ignored "-Wunused-local-typedefs" |
127 |
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
128 |
+@@ -53,7 +53,7 @@ |
129 |
+ #include <Eigen/LU> |
130 |
+ |
131 |
+ // Restore warnings |
132 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
133 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
134 |
+ #pragma GCC diagnostic pop |
135 |
+ #endif |
136 |
+ |
137 |
+diff --git a/libs/dmetadata/metaengine_p.cpp b/libs/dmetadata/metaengine_p.cpp |
138 |
+index 2c83b58..2b44e06 100644 |
139 |
+--- a/libs/dmetadata/metaengine_p.cpp |
140 |
++++ b/libs/dmetadata/metaengine_p.cpp |
141 |
+@@ -49,7 +49,7 @@ extern "C" |
142 |
+ #include "digikam_debug.h" |
143 |
+ |
144 |
+ // Pragma directives to reduce warnings from Exiv2. |
145 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
146 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
147 |
+ #pragma GCC diagnostic push |
148 |
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
149 |
+ #endif |
150 |
+@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar) |
151 |
+ } // namespace Digikam |
152 |
+ |
153 |
+ // Restore warnings |
154 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
155 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
156 |
+ #pragma GCC diagnostic pop |
157 |
+ #endif |
158 |
+ |
159 |
+diff --git a/libs/jpegutils/jpegutils.cpp b/libs/jpegutils/jpegutils.cpp |
160 |
+index c823f40..60c7469 100644 |
161 |
+--- a/libs/jpegutils/jpegutils.cpp |
162 |
++++ b/libs/jpegutils/jpegutils.cpp |
163 |
+@@ -53,7 +53,7 @@ extern "C" |
164 |
+ } |
165 |
+ |
166 |
+ // Pragma directives to reduce warnings from libjpeg transupp header file. |
167 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
168 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
169 |
+ #pragma GCC diagnostic push |
170 |
+ #pragma GCC diagnostic ignored "-Wunused-parameter" |
171 |
+ #endif |
172 |
+@@ -69,7 +69,7 @@ extern "C" |
173 |
+ } |
174 |
+ |
175 |
+ // Restore warnings |
176 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
177 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
178 |
+ #pragma GCC diagnostic pop |
179 |
+ #endif |
180 |
+ |
181 |
+diff --git a/libs/rawengine/drawdecoder_p.h b/libs/rawengine/drawdecoder_p.h |
182 |
+index a27e199..ea653b4 100644 |
183 |
+--- a/libs/rawengine/drawdecoder_p.h |
184 |
++++ b/libs/rawengine/drawdecoder_p.h |
185 |
+@@ -31,7 +31,7 @@ |
186 |
+ #include <QByteArray> |
187 |
+ |
188 |
+ // Pragma directives to reduce warnings from LibRaw header files. |
189 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
190 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
191 |
+ #pragma GCC diagnostic push |
192 |
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
193 |
+ #endif |
194 |
+@@ -46,7 +46,7 @@ |
195 |
+ #include <libraw.h> |
196 |
+ |
197 |
+ // Restore warnings |
198 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
199 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
200 |
+ #pragma GCC diagnostic pop |
201 |
+ #endif |
202 |
+ |
203 |
|
204 |
diff --git a/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch b/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch |
205 |
new file mode 100644 |
206 |
index 0000000000..ab648ef3da |
207 |
--- /dev/null |
208 |
+++ b/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch |
209 |
@@ -0,0 +1,76 @@ |
210 |
+commit 3793b47b6f57a627911bcce819b1ecc2dc9e422a |
211 |
+Author: Kevin Funk <kfunk@×××.org> |
212 |
+Date: Wed Jan 18 13:34:55 2017 +0100 |
213 |
+ |
214 |
+ Fix compilation with new KDECompilerSettings.cmake |
215 |
+ |
216 |
+diff --git a/app/utils/libopencv.h.cmake.in b/app/utils/libopencv.h.cmake.in |
217 |
+index cc58b7c..6abf642 100644 |
218 |
+--- a/app/utils/libopencv.h.cmake.in |
219 |
++++ b/app/utils/libopencv.h.cmake.in |
220 |
+@@ -27,7 +27,7 @@ |
221 |
+ #define LIB_OPEN_CV_H |
222 |
+ |
223 |
+ // Pragma directives to reduce warnings from OpenCV header files. |
224 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
225 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
226 |
+ #pragma GCC diagnostic push |
227 |
+ #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" |
228 |
+ #pragma GCC diagnostic ignored "-Woverloaded-virtual" |
229 |
+@@ -82,7 +82,7 @@ |
230 |
+ #endif |
231 |
+ |
232 |
+ // Restore warnings |
233 |
+-#if not defined(__APPLE__) && defined(__GNUC__) |
234 |
++#if !defined(__APPLE__) && defined(__GNUC__) |
235 |
+ #pragma GCC diagnostic pop |
236 |
+ #endif |
237 |
+ |
238 |
+diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt |
239 |
+index c5d9c27..14a7180 100644 |
240 |
+--- a/libs/database/CMakeLists.txt |
241 |
++++ b/libs/database/CMakeLists.txt |
242 |
+@@ -10,6 +10,9 @@ if (POLICY CMP0063) |
243 |
+ cmake_policy(SET CMP0063 NEW) |
244 |
+ endif (POLICY CMP0063) |
245 |
+ |
246 |
++# Boost uses operator names (and, not, ...) |
247 |
++string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
248 |
++ |
249 |
+ set(libdatabasecore_SRCS |
250 |
+ server/databaseserverstarter.cpp |
251 |
+ server/databaseservererror.cpp |
252 |
+diff --git a/libs/dimg/CMakeLists.txt b/libs/dimg/CMakeLists.txt |
253 |
+index 3bcada5..04a0a22 100644 |
254 |
+--- a/libs/dimg/CMakeLists.txt |
255 |
++++ b/libs/dimg/CMakeLists.txt |
256 |
+@@ -11,6 +11,9 @@ endif (POLICY CMP0063) |
257 |
+ |
258 |
+ kde_enable_exceptions() |
259 |
+ |
260 |
++# Boost uses operator names (and, not, ...) |
261 |
++string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
262 |
++ |
263 |
+ set(libdimg_SRCS |
264 |
+ dimg.cpp |
265 |
+ drawdecoding.cpp |
266 |
+commit b318820530a4f001bc6621532b5416bf3c4a43cf |
267 |
+Author: Kevin Funk <kfunk@×××.org> |
268 |
+Date: Wed Jan 18 15:20:36 2017 +0100 |
269 |
+ |
270 |
+ tests/dimg needs -fno-operator-names dropped, too |
271 |
+ |
272 |
+diff --git a/tests/dimg/CMakeLists.txt b/tests/dimg/CMakeLists.txt |
273 |
+index 6d9e6d6..5133f88 100644 |
274 |
+--- a/tests/dimg/CMakeLists.txt |
275 |
++++ b/tests/dimg/CMakeLists.txt |
276 |
+@@ -8,6 +8,9 @@ if (POLICY CMP0063) |
277 |
+ cmake_policy(SET CMP0063 NEW) |
278 |
+ endif (POLICY CMP0063) |
279 |
+ |
280 |
++# Boost uses operator names (and, not, ...) |
281 |
++string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
282 |
++ |
283 |
+ include_directories( |
284 |
+ $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES> |
285 |
+ $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES> |