1 |
commit: a9b8decf11a9e648fc3e5cc175018b22a834f8d9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 27 16:08:05 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 27 17:18:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b8decf |
7 |
|
8 |
media-gfx/krita: 4.2.2 version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.16 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-gfx/krita/Manifest | 1 + |
14 |
media-gfx/krita/files/krita-4.2.2-fixuifiles.patch | 25 ++ |
15 |
.../krita/files/krita-4.2.2-tests-optional.patch | 405 +++++++++++++++++++++ |
16 |
media-gfx/krita/krita-4.2.2.ebuild | 121 ++++++ |
17 |
4 files changed, 552 insertions(+) |
18 |
|
19 |
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest |
20 |
index 41abb11141a..2e2c22bf373 100644 |
21 |
--- a/media-gfx/krita/Manifest |
22 |
+++ b/media-gfx/krita/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9 |
25 |
DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390 SHA512 879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1 |
26 |
+DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e SHA512 7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096 |
27 |
|
28 |
diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..1703386a3c7 |
31 |
--- /dev/null |
32 |
+++ b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch |
33 |
@@ -0,0 +1,25 @@ |
34 |
+From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001 |
35 |
+From: Pino Toscano <pino@×××.org> |
36 |
+Date: Tue, 25 Jun 2019 06:57:40 +0200 |
37 |
+Subject: fixuifiles |
38 |
+ |
39 |
+--- |
40 |
+ libs/widgetutils/tests/dialogsavertestwidget.ui | 3 --- |
41 |
+ 1 file changed, 3 deletions(-) |
42 |
+ |
43 |
+diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui b/libs/widgetutils/tests/dialogsavertestwidget.ui |
44 |
+index 66e70b3..ba0f54f 100644 |
45 |
+--- a/libs/widgetutils/tests/dialogsavertestwidget.ui |
46 |
++++ b/libs/widgetutils/tests/dialogsavertestwidget.ui |
47 |
+@@ -10,9 +10,6 @@ |
48 |
+ <height>300</height> |
49 |
+ </rect> |
50 |
+ </property> |
51 |
+- <property name="windowTitle"> |
52 |
+- <string>Form</string> |
53 |
+- </property> |
54 |
+ <widget class="QPushButton" name="pushButton"> |
55 |
+ <property name="geometry"> |
56 |
+ <rect> |
57 |
+-- |
58 |
+cgit v1.1 |
59 |
|
60 |
diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch |
61 |
new file mode 100644 |
62 |
index 00000000000..2df715be04f |
63 |
--- /dev/null |
64 |
+++ b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch |
65 |
@@ -0,0 +1,405 @@ |
66 |
+--- a/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.049823682 +0200 |
67 |
++++ b/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.056823729 +0200 |
68 |
+@@ -1,4 +1,6 @@ |
69 |
++if(BUILD_TESTING) |
70 |
+ add_subdirectory( tests ) |
71 |
++endif() |
72 |
+ add_subdirectory( blur ) |
73 |
+ add_subdirectory( colors ) |
74 |
+ add_subdirectory( colorsfilters ) |
75 |
+--- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.063823776 +0200 |
76 |
++++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.069823817 +0200 |
77 |
+@@ -1,4 +1,6 @@ |
78 |
++if(BUILD_TESTING) |
79 |
+ add_subdirectory( tests ) |
80 |
++endif() |
81 |
+ |
82 |
+ set(kritaunsharpfilter_SOURCES |
83 |
+ unsharp.cpp |
84 |
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.077823871 +0200 |
85 |
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27 18:48:55.084823918 +0200 |
86 |
+@@ -1,4 +1,6 @@ |
87 |
++if(BUILD_TESTING) |
88 |
+ add_subdirectory(brush/tests) |
89 |
++endif() |
90 |
+ |
91 |
+ include_directories(brush |
92 |
+ duplicate |
93 |
+--- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.092823972 +0200 |
94 |
++++ b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27 18:48:55.098824013 +0200 |
95 |
+@@ -104,4 +104,6 @@ |
96 |
+ install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS}) |
97 |
+ |
98 |
+ |
99 |
++if(BUILD_TESTING) |
100 |
+ add_subdirectory(tests) |
101 |
++endif() |
102 |
+--- a/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.105824060 +0200 |
103 |
++++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.112824107 +0200 |
104 |
+@@ -1,4 +1,6 @@ |
105 |
++if(BUILD_TESTING) |
106 |
+ add_subdirectory(tests) |
107 |
++endif() |
108 |
+ |
109 |
+ include_directories(SYSTEM |
110 |
+ ${OCIO_INCLUDE_DIR} |
111 |
+--- a/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.120824161 +0200 |
112 |
++++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.124824188 +0200 |
113 |
+@@ -1,5 +1,7 @@ |
114 |
+ if (NOT WIN32 AND NOT APPLE) |
115 |
+- add_subdirectory(tests) |
116 |
++ if(BUILD_TESTING) |
117 |
++add_subdirectory(tests) |
118 |
++endif() |
119 |
+ endif() |
120 |
+ |
121 |
+ set(KRITA_ANIMATIONDOCKER_SOURCES |
122 |
+--- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.132824242 +0200 |
123 |
++++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:55.136824270 +0200 |
124 |
+@@ -20,4 +20,6 @@ |
125 |
+ target_link_libraries(kritaqmic kritaui) |
126 |
+ install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) |
127 |
+ |
128 |
++if(BUILD_TESTING) |
129 |
+ add_subdirectory(tests) |
130 |
++endif() |
131 |
+--- a/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.141824303 +0200 |
132 |
++++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-27 18:48:55.146824337 +0200 |
133 |
+@@ -1,5 +1,7 @@ |
134 |
+ if (NOT APPLE) |
135 |
+- add_subdirectory(tests) |
136 |
++ if(BUILD_TESTING) |
137 |
++add_subdirectory(tests) |
138 |
++endif() |
139 |
+ endif () |
140 |
+ |
141 |
+ set(kritadefaulttools_SOURCES |
142 |
+--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.151824371 +0200 |
143 |
++++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 18:48:55.155824398 +0200 |
144 |
+@@ -1,5 +1,7 @@ |
145 |
+ if (NOT WIN32 AND NOT APPLE) |
146 |
+- add_subdirectory(tests) |
147 |
++ if(BUILD_TESTING) |
148 |
++add_subdirectory(tests) |
149 |
++endif() |
150 |
+ endif() |
151 |
+ |
152 |
+ set(kritatooltransform_SOURCES |
153 |
+--- a/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.163824452 +0200 |
154 |
++++ b/plugins/impex/ppm/CMakeLists.txt 2019-06-27 18:48:55.169824492 +0200 |
155 |
+@@ -1,4 +1,6 @@ |
156 |
++if(BUILD_TESTING) |
157 |
+ add_subdirectory(tests) |
158 |
++endif() |
159 |
+ |
160 |
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) |
161 |
+ |
162 |
+--- a/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.175824533 +0200 |
163 |
++++ b/plugins/impex/svg/CMakeLists.txt 2019-06-27 18:48:55.180824567 +0200 |
164 |
+@@ -1,4 +1,6 @@ |
165 |
++if(BUILD_TESTING) |
166 |
+ add_subdirectory(tests) |
167 |
++endif() |
168 |
+ |
169 |
+ set(kritasvgimport_SOURCES |
170 |
+ kis_svg_import.cc |
171 |
+--- a/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.186824607 +0200 |
172 |
++++ b/plugins/impex/brush/CMakeLists.txt 2019-06-27 18:48:55.190824634 +0200 |
173 |
+@@ -1,4 +1,6 @@ |
174 |
++if(BUILD_TESTING) |
175 |
+ add_subdirectory(tests) |
176 |
++endif() |
177 |
+ |
178 |
+ set(kritabrushexport_PART_SRCS |
179 |
+ kis_brush_export.cpp |
180 |
+--- a/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.195824668 +0200 |
181 |
++++ b/plugins/impex/psd/CMakeLists.txt 2019-06-27 18:48:55.199824695 +0200 |
182 |
+@@ -1,5 +1,7 @@ |
183 |
+ if (NOT MSVC AND NOT APPLE) |
184 |
+- add_subdirectory(tests) |
185 |
++ if(BUILD_TESTING) |
186 |
++add_subdirectory(tests) |
187 |
++endif() |
188 |
+ endif() |
189 |
+ |
190 |
+ configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h) |
191 |
+--- a/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.206824742 +0200 |
192 |
++++ b/plugins/impex/tga/CMakeLists.txt 2019-06-27 18:48:55.210824769 +0200 |
193 |
+@@ -1,4 +1,6 @@ |
194 |
++if(BUILD_TESTING) |
195 |
+ add_subdirectory(tests) |
196 |
++endif() |
197 |
+ |
198 |
+ set(kritatgaexport_SOURCES |
199 |
+ kis_tga_export.cpp |
200 |
+--- a/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.216824810 +0200 |
201 |
++++ b/plugins/impex/libkra/CMakeLists.txt 2019-06-27 18:48:55.221824844 +0200 |
202 |
+@@ -1,4 +1,6 @@ |
203 |
++if(BUILD_TESTING) |
204 |
+ add_subdirectory(tests) |
205 |
++endif() |
206 |
+ |
207 |
+ set(kritalibkra_LIB_SRCS |
208 |
+ kis_colorize_dom_utils.cpp |
209 |
+--- a/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.228824891 +0200 |
210 |
++++ b/plugins/impex/jpeg/CMakeLists.txt 2019-06-27 18:48:55.233824924 +0200 |
211 |
+@@ -1,4 +1,6 @@ |
212 |
++if(BUILD_TESTING) |
213 |
+ add_subdirectory(tests) |
214 |
++endif() |
215 |
+ |
216 |
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms") |
217 |
+ |
218 |
+--- a/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.239824965 +0200 |
219 |
++++ b/plugins/impex/gif/CMakeLists.txt 2019-06-27 18:48:55.243824992 +0200 |
220 |
+@@ -1,4 +1,6 @@ |
221 |
++if(BUILD_TESTING) |
222 |
+ add_subdirectory(tests) |
223 |
++endif() |
224 |
+ |
225 |
+ set(kritagifexport_SOURCES |
226 |
+ kis_gif_export.cpp |
227 |
+--- a/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.248825026 +0200 |
228 |
++++ b/plugins/impex/exr/CMakeLists.txt 2019-06-27 18:48:55.253825060 +0200 |
229 |
+@@ -1,4 +1,6 @@ |
230 |
++if(BUILD_TESTING) |
231 |
+ add_subdirectory(tests) |
232 |
++endif() |
233 |
+ |
234 |
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} ) |
235 |
+ |
236 |
+--- a/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.260825107 +0200 |
237 |
++++ b/plugins/impex/xcf/CMakeLists.txt 2019-06-27 18:48:55.268825160 +0200 |
238 |
+@@ -1,4 +1,6 @@ |
239 |
++if(BUILD_TESTING) |
240 |
+ add_subdirectory(tests) |
241 |
++endif() |
242 |
+ |
243 |
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools") |
244 |
+ |
245 |
+--- a/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.277825221 +0200 |
246 |
++++ b/plugins/impex/tiff/CMakeLists.txt 2019-06-27 18:48:55.283825262 +0200 |
247 |
+@@ -1,4 +1,6 @@ |
248 |
++if(BUILD_TESTING) |
249 |
+ add_subdirectory(tests) |
250 |
++endif() |
251 |
+ |
252 |
+ set(libkritatiffconverter_LIB_SRCS |
253 |
+ kis_tiff_converter.cc |
254 |
+--- a/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.290825310 +0200 |
255 |
++++ b/plugins/impex/ora/CMakeLists.txt 2019-06-27 18:48:55.295825343 +0200 |
256 |
+@@ -1,4 +1,6 @@ |
257 |
++if(BUILD_TESTING) |
258 |
+ add_subdirectory(tests) |
259 |
++endif() |
260 |
+ |
261 |
+ set(libkritaconverter_LIB_SRCS |
262 |
+ ora_converter.cpp |
263 |
+--- a/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.302825391 +0200 |
264 |
++++ b/plugins/impex/heif/CMakeLists.txt 2019-06-27 18:48:55.309825438 +0200 |
265 |
+@@ -1,4 +1,6 @@ |
266 |
++if(BUILD_TESTING) |
267 |
+ add_subdirectory(tests) |
268 |
++endif() |
269 |
+ |
270 |
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}") |
271 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}") |
272 |
+--- a/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.317825492 +0200 |
273 |
++++ b/plugins/impex/pdf/CMakeLists.txt 2019-06-27 18:48:55.322825526 +0200 |
274 |
+@@ -1,4 +1,6 @@ |
275 |
++if(BUILD_TESTING) |
276 |
+ add_subdirectory(tests) |
277 |
++endif() |
278 |
+ |
279 |
+ set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp ) |
280 |
+ |
281 |
+--- a/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.332825593 +0200 |
282 |
++++ b/plugins/impex/csv/CMakeLists.txt 2019-06-27 18:48:55.339825640 +0200 |
283 |
+@@ -1,4 +1,6 @@ |
284 |
++if(BUILD_TESTING) |
285 |
+ add_subdirectory(tests) |
286 |
++endif() |
287 |
+ |
288 |
+ # import |
289 |
+ |
290 |
+--- a/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.347825694 +0200 |
291 |
++++ b/plugins/impex/heightmap/CMakeLists.txt 2019-06-27 18:48:55.352825728 +0200 |
292 |
+@@ -1,4 +1,6 @@ |
293 |
++if(BUILD_TESTING) |
294 |
+ add_subdirectory(tests) |
295 |
++endif() |
296 |
+ |
297 |
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) |
298 |
+ |
299 |
+--- a/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.359825775 +0200 |
300 |
++++ b/plugins/impex/raw/CMakeLists.txt 2019-06-27 18:48:55.365825816 +0200 |
301 |
+@@ -1,4 +1,6 @@ |
302 |
++if(BUILD_TESTING) |
303 |
+ add_subdirectory(tests) |
304 |
++endif() |
305 |
+ |
306 |
+ if(OPENEXR_FOUND) |
307 |
+ include_directories(${OPENEXR_INCLUDE_DIR}) |
308 |
+--- a/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.371825857 +0200 |
309 |
++++ b/plugins/impex/qimageio/CMakeLists.txt 2019-06-27 18:48:55.376825890 +0200 |
310 |
+@@ -1,4 +1,6 @@ |
311 |
++if(BUILD_TESTING) |
312 |
+ add_subdirectory(tests) |
313 |
++endif() |
314 |
+ |
315 |
+ set(kritaqimageioexport_SOURCES |
316 |
+ kis_qimageio_export.cpp |
317 |
+--- a/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.383825938 +0200 |
318 |
++++ b/plugins/impex/qml/CMakeLists.txt 2019-06-27 18:48:55.389825978 +0200 |
319 |
+@@ -1,4 +1,6 @@ |
320 |
++if(BUILD_TESTING) |
321 |
+ add_subdirectory(tests) |
322 |
++endif() |
323 |
+ |
324 |
+ set(kritaqmlexport_SOURCES |
325 |
+ qml_converter.cc |
326 |
+--- a/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.396826025 +0200 |
327 |
++++ b/plugins/impex/png/CMakeLists.txt 2019-06-27 18:48:55.401826059 +0200 |
328 |
+@@ -1,4 +1,6 @@ |
329 |
++if(BUILD_TESTING) |
330 |
+ add_subdirectory(tests) |
331 |
++endif() |
332 |
+ |
333 |
+ set(kritapngimport_SOURCES |
334 |
+ kis_png_import.cc |
335 |
+--- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.408826106 +0200 |
336 |
++++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-27 18:48:55.412826133 +0200 |
337 |
+@@ -1,6 +1,8 @@ |
338 |
+ project( lcmsengine ) |
339 |
+ |
340 |
++if(BUILD_TESTING) |
341 |
+ add_subdirectory(tests) |
342 |
++endif() |
343 |
+ |
344 |
+ include_directories(SYSTEM |
345 |
+ ${LCMS2_INCLUDE_DIR} |
346 |
+--- a/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.417826167 +0200 |
347 |
++++ b/libs/brush/CMakeLists.txt 2019-06-27 18:48:55.421826194 +0200 |
348 |
+@@ -1,4 +1,6 @@ |
349 |
++if(BUILD_TESTING) |
350 |
+ add_subdirectory( tests ) |
351 |
++endif() |
352 |
+ |
353 |
+ include_directories(SYSTEM |
354 |
+ ${EIGEN3_INCLUDE_DIR} |
355 |
+--- a/libs/global/CMakeLists.txt 2019-06-27 18:48:55.426826228 +0200 |
356 |
++++ b/libs/global/CMakeLists.txt 2019-06-27 18:48:55.430826255 +0200 |
357 |
+@@ -1,4 +1,6 @@ |
358 |
++if(BUILD_TESTING) |
359 |
+ add_subdirectory( tests ) |
360 |
++endif() |
361 |
+ |
362 |
+ include(CheckFunctionExists) |
363 |
+ check_function_exists(backtrace HAVE_BACKTRACE) |
364 |
+--- a/libs/image/CMakeLists.txt 2019-06-27 18:48:55.435826289 +0200 |
365 |
++++ b/libs/image/CMakeLists.txt 2019-06-27 18:48:55.438826309 +0200 |
366 |
+@@ -1,4 +1,6 @@ |
367 |
++if(BUILD_TESTING) |
368 |
+ add_subdirectory( tests ) |
369 |
++endif() |
370 |
+ |
371 |
+ add_subdirectory( tiles3 ) |
372 |
+ |
373 |
+--- a/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.444826350 +0200 |
374 |
++++ b/libs/image/tiles3/CMakeLists.txt 2019-06-27 18:48:55.447826370 +0200 |
375 |
+@@ -1 +1,3 @@ |
376 |
++if(BUILD_TESTING) |
377 |
+ add_subdirectory(tests) |
378 |
++endif() |
379 |
+--- a/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.452826404 +0200 |
380 |
++++ b/libs/odf/CMakeLists.txt 2019-06-27 18:48:55.456826430 +0200 |
381 |
+@@ -1,4 +1,6 @@ |
382 |
++if(BUILD_TESTING) |
383 |
+ add_subdirectory( tests ) |
384 |
++endif() |
385 |
+ |
386 |
+ set(kritaodf_LIB_SRCS |
387 |
+ KoOdf.cpp |
388 |
+--- a/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.461826464 +0200 |
389 |
++++ b/libs/metadata/CMakeLists.txt 2019-06-27 18:48:55.465826491 +0200 |
390 |
+@@ -29,4 +29,6 @@ |
391 |
+ |
392 |
+ install(TARGETS kritametadata ${INSTALL_TARGETS_DEFAULT_ARGS}) |
393 |
+ |
394 |
++if(BUILD_TESTING) |
395 |
+ add_subdirectory(tests) |
396 |
++endif() |
397 |
+--- a/libs/store/CMakeLists.txt 2019-06-27 18:48:55.470826525 +0200 |
398 |
++++ b/libs/store/CMakeLists.txt 2019-06-27 18:48:55.473826545 +0200 |
399 |
+@@ -1,6 +1,8 @@ |
400 |
+ include_directories(${QUAZIP_INCLUDE_DIRS}) |
401 |
+ |
402 |
++if(BUILD_TESTING) |
403 |
+ add_subdirectory(tests) |
404 |
++endif() |
405 |
+ |
406 |
+ set(kritastore_LIB_SRCS |
407 |
+ KoDirectoryStore.cpp |
408 |
+--- a/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.478826579 +0200 |
409 |
++++ b/libs/libkis/CMakeLists.txt 2019-06-27 18:48:55.482826605 +0200 |
410 |
+@@ -47,4 +47,6 @@ |
411 |
+ install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS}) |
412 |
+ |
413 |
+ |
414 |
++if(BUILD_TESTING) |
415 |
+ add_subdirectory(tests) |
416 |
++endif() |
417 |
+--- a/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.487826640 +0200 |
418 |
++++ b/libs/widgetutils/CMakeLists.txt 2019-06-27 18:48:55.491826667 +0200 |
419 |
+@@ -1,4 +1,6 @@ |
420 |
++if(BUILD_TESTING) |
421 |
+ add_subdirectory(tests) |
422 |
++endif() |
423 |
+ |
424 |
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h ) |
425 |
+ |
426 |
+--- a/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.496826701 +0200 |
427 |
++++ b/libs/widgets/CMakeLists.txt 2019-06-27 18:48:55.500826727 +0200 |
428 |
+@@ -1,4 +1,6 @@ |
429 |
++if(BUILD_TESTING) |
430 |
+ add_subdirectory( tests ) |
431 |
++endif() |
432 |
+ |
433 |
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}) |
434 |
+ |
435 |
+--- a/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.505826761 +0200 |
436 |
++++ b/libs/flake/CMakeLists.txt 2019-06-27 18:48:55.510826795 +0200 |
437 |
+@@ -9,7 +9,9 @@ |
438 |
+ ) |
439 |
+ |
440 |
+ add_subdirectory(styles) |
441 |
++if(BUILD_TESTING) |
442 |
+ add_subdirectory(tests) |
443 |
++endif() |
444 |
+ |
445 |
+ set(kritaflake_SRCS |
446 |
+ KoGradientHelper.cpp |
447 |
+--- a/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.516826836 +0200 |
448 |
++++ b/libs/ui/CMakeLists.txt 2019-06-27 18:48:55.520826863 +0200 |
449 |
+@@ -7,7 +7,9 @@ |
450 |
+ ${OCIO_INCLUDE_DIR} |
451 |
+ ) |
452 |
+ |
453 |
++if(BUILD_TESTING) |
454 |
+ add_subdirectory( tests ) |
455 |
++endif() |
456 |
+ |
457 |
+ if (APPLE) |
458 |
+ find_library(FOUNDATION_LIBRARY Foundation) |
459 |
+--- a/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.526826903 +0200 |
460 |
++++ b/libs/pigment/CMakeLists.txt 2019-06-27 18:48:55.530826930 +0200 |
461 |
+@@ -31,7 +31,9 @@ |
462 |
+ message("${__per_arch_factory_objs}") |
463 |
+ endif() |
464 |
+ |
465 |
++if(BUILD_TESTING) |
466 |
+ add_subdirectory(tests) |
467 |
++endif() |
468 |
+ add_subdirectory(benchmarks) |
469 |
+ |
470 |
+ set(kritapigment_SRCS |
471 |
|
472 |
diff --git a/media-gfx/krita/krita-4.2.2.ebuild b/media-gfx/krita/krita-4.2.2.ebuild |
473 |
new file mode 100644 |
474 |
index 00000000000..5a7e08cbf68 |
475 |
--- /dev/null |
476 |
+++ b/media-gfx/krita/krita-4.2.2.ebuild |
477 |
@@ -0,0 +1,121 @@ |
478 |
+# Copyright 1999-2019 Gentoo Authors |
479 |
+# Distributed under the terms of the GNU General Public License v2 |
480 |
+ |
481 |
+EAPI=7 |
482 |
+ |
483 |
+KDE_TEST="forceoptional" |
484 |
+QT_MINIMAL="5.12.3" |
485 |
+VIRTUALX_REQUIRED="test" |
486 |
+PYTHON_COMPAT=( python3_{5,6,7} ) |
487 |
+inherit kde5 python-single-r1 |
488 |
+ |
489 |
+if [[ ${KDE_BUILD_TYPE} = release ]]; then |
490 |
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz" |
491 |
+ KEYWORDS="~amd64 ~x86" |
492 |
+fi |
493 |
+ |
494 |
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" |
495 |
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/" |
496 |
+LICENSE="GPL-3" |
497 |
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" |
498 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
499 |
+ |
500 |
+BDEPEND=" |
501 |
+ dev-cpp/eigen:3 |
502 |
+ dev-lang/perl |
503 |
+ sys-devel/gettext |
504 |
+" |
505 |
+COMMON_DEPEND="${PYTHON_DEPS} |
506 |
+ $(add_frameworks_dep karchive) |
507 |
+ $(add_frameworks_dep kcompletion) |
508 |
+ $(add_frameworks_dep kconfig) |
509 |
+ $(add_frameworks_dep kcoreaddons) |
510 |
+ $(add_frameworks_dep kcrash) |
511 |
+ $(add_frameworks_dep kguiaddons) |
512 |
+ $(add_frameworks_dep ki18n) |
513 |
+ $(add_frameworks_dep kiconthemes) |
514 |
+ $(add_frameworks_dep kitemmodels) |
515 |
+ $(add_frameworks_dep kitemviews) |
516 |
+ $(add_frameworks_dep kwidgetsaddons) |
517 |
+ $(add_frameworks_dep kwindowsystem) |
518 |
+ $(add_frameworks_dep kxmlgui) |
519 |
+ $(add_qt_dep qtconcurrent) |
520 |
+ $(add_qt_dep qtdbus) |
521 |
+ $(add_qt_dep qtdeclarative) |
522 |
+ $(add_qt_dep qtgui '-gles2' '' '5=') |
523 |
+ $(add_qt_dep qtnetwork) |
524 |
+ $(add_qt_dep qtprintsupport) |
525 |
+ $(add_qt_dep qtsvg) |
526 |
+ $(add_qt_dep qtwidgets) |
527 |
+ $(add_qt_dep qtx11extras) |
528 |
+ $(add_qt_dep qtxml) |
529 |
+ dev-libs/boost:= |
530 |
+ dev-libs/quazip |
531 |
+ dev-python/PyQt5[${PYTHON_USEDEP}] |
532 |
+ dev-python/sip[${PYTHON_USEDEP}] |
533 |
+ media-gfx/exiv2:= |
534 |
+ media-libs/lcms |
535 |
+ media-libs/libpng:0= |
536 |
+ sys-libs/zlib |
537 |
+ virtual/opengl |
538 |
+ x11-libs/libX11 |
539 |
+ x11-libs/libxcb |
540 |
+ x11-libs/libXi |
541 |
+ color-management? ( media-libs/opencolorio ) |
542 |
+ fftw? ( sci-libs/fftw:3.0= ) |
543 |
+ gif? ( media-libs/giflib ) |
544 |
+ gsl? ( sci-libs/gsl:= ) |
545 |
+ jpeg? ( virtual/jpeg:0 ) |
546 |
+ heif? ( media-libs/libheif:= ) |
547 |
+ openexr? ( |
548 |
+ media-libs/ilmbase:= |
549 |
+ media-libs/openexr |
550 |
+ ) |
551 |
+ pdf? ( app-text/poppler[qt5] ) |
552 |
+ qtmedia? ( $(add_qt_dep qtmultimedia) ) |
553 |
+ raw? ( media-libs/libraw:= ) |
554 |
+ tiff? ( media-libs/tiff:0 ) |
555 |
+" |
556 |
+DEPEND="${COMMON_DEPEND} |
557 |
+ vc? ( >=dev-libs/vc-1.1.0 ) |
558 |
+" |
559 |
+RDEPEND="${COMMON_DEPEND} |
560 |
+ !app-office/calligra:4[calligra_features_krita] |
561 |
+ !app-office/calligra-l10n:4[calligra_features_krita(+)] |
562 |
+" |
563 |
+ |
564 |
+# bug 630508 |
565 |
+RESTRICT+=" test" |
566 |
+ |
567 |
+PATCHES=( |
568 |
+ "${FILESDIR}"/${P}-tests-optional.patch |
569 |
+ "${FILESDIR}"/${P}-fixuifiles.patch |
570 |
+) |
571 |
+ |
572 |
+pkg_setup() { |
573 |
+ python-single-r1_pkg_setup |
574 |
+ kde5_pkg_setup |
575 |
+} |
576 |
+ |
577 |
+src_configure() { |
578 |
+ # Prevent sandbox violation from FindPyQt5.py module |
579 |
+ # See Gentoo-bug 655918 |
580 |
+ addpredict /dev/dri |
581 |
+ |
582 |
+ local mycmakeargs=( |
583 |
+ $(cmake-utils_use_find_package color-management OCIO) |
584 |
+ $(cmake-utils_use_find_package fftw FFTW3) |
585 |
+ $(cmake-utils_use_find_package gif GIF) |
586 |
+ $(cmake-utils_use_find_package gsl GSL) |
587 |
+ $(cmake-utils_use_find_package heif HEIF) |
588 |
+ $(cmake-utils_use_find_package jpeg JPEG) |
589 |
+ $(cmake-utils_use_find_package openexr OpenEXR) |
590 |
+ $(cmake-utils_use_find_package pdf Poppler) |
591 |
+ $(cmake-utils_use_find_package qtmedia Qt5Multimedia) |
592 |
+ $(cmake-utils_use_find_package raw LibRaw) |
593 |
+ $(cmake-utils_use_find_package tiff TIFF) |
594 |
+ $(cmake-utils_use_find_package vc Vc) |
595 |
+ ) |
596 |
+ |
597 |
+ kde5_src_configure |
598 |
+} |