Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
Date: Fri, 15 Nov 2019 17:37:54
Message-Id: 1573839459.952ce9a0b17778e2341199167661a106eb073665.asturm@gentoo
1 commit: 952ce9a0b17778e2341199167661a106eb073665
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 15 14:25:57 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 15 17:37:39 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952ce9a0
7
8 media-gfx/krita: Drop 4.1.8-r1
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-gfx/krita/Manifest | 1 -
14 .../krita/files/krita-4.0.3-tests-optional.patch | 324 ---------------------
15 .../krita-4.1.8-fix-pre-5.12-tablet-support.patch | 49 ----
16 ...-qt-5.12-fix-unsupported-composition-mode.patch | 38 ---
17 media-gfx/krita/krita-4.1.8-r1.ebuild | 123 --------
18 5 files changed, 535 deletions(-)
19
20 diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
21 index 6fff880799d..e27248b96e5 100644
22 --- a/media-gfx/krita/Manifest
23 +++ b/media-gfx/krita/Manifest
24 @@ -1,2 +1 @@
25 -DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
26 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
27
28 diff --git a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
29 deleted file mode 100644
30 index c9e3ddc2aea..00000000000
31 --- a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
32 +++ /dev/null
33 @@ -1,324 +0,0 @@
34 -Autogenerated by KDE_TEST=forceoptional-recursive and edited.
35 -
36 ---- a/plugins/paintops/libpaintop/CMakeLists.txt 2018-08-29 18:17:38.843385842 +0200
37 -+++ b/plugins/paintops/libpaintop/CMakeLists.txt 2018-08-29 18:17:38.846385865 +0200
38 -@@ -104,4 +104,6 @@
39 - install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
40 -
41 -
42 -+if(BUILD_TESTING)
43 - add_subdirectory(tests)
44 -+endif()
45 ---- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2018-08-29 18:17:38.851385903 +0200
46 -+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2018-08-29 18:17:38.854385926 +0200
47 -@@ -1,4 +1,6 @@
48 -+if(BUILD_TESTING)
49 - add_subdirectory(brush/tests)
50 -+endif()
51 -
52 - include_directories(brush
53 - duplicate
54 ---- a/plugins/impex/libkra/CMakeLists.txt 2018-08-29 18:17:38.858385956 +0200
55 -+++ b/plugins/impex/libkra/CMakeLists.txt 2018-08-29 18:17:38.861385978 +0200
56 -@@ -1,4 +1,6 @@
57 -+if(BUILD_TESTING)
58 - add_subdirectory(tests)
59 -+endif()
60 -
61 - set(kritalibkra_LIB_SRCS
62 - kis_colorize_dom_utils.cpp
63 ---- a/plugins/impex/exr/CMakeLists.txt 2018-08-29 18:17:38.866386016 +0200
64 -+++ b/plugins/impex/exr/CMakeLists.txt 2018-08-29 18:17:38.869386039 +0200
65 -@@ -1,4 +1,6 @@
66 -+if(BUILD_TESTING)
67 - add_subdirectory(tests)
68 -+endif()
69 -
70 - include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
71 -
72 ---- a/plugins/impex/svg/CMakeLists.txt 2018-08-29 18:17:38.874386077 +0200
73 -+++ b/plugins/impex/svg/CMakeLists.txt 2018-08-29 18:17:38.878386107 +0200
74 -@@ -1,4 +1,6 @@
75 -+if(BUILD_TESTING)
76 - add_subdirectory(tests)
77 -+endif()
78 -
79 - set(kritasvgimport_SOURCES
80 - kis_svg_import.cc
81 ---- a/plugins/impex/jpeg/CMakeLists.txt 2018-08-29 18:17:38.883386145 +0200
82 -+++ b/plugins/impex/jpeg/CMakeLists.txt 2018-08-29 18:17:38.887386175 +0200
83 -@@ -1,4 +1,6 @@
84 -+if(BUILD_TESTING)
85 - add_subdirectory(tests)
86 -+endif()
87 -
88 - set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
89 -
90 ---- a/plugins/impex/heightmap/CMakeLists.txt 2018-08-29 18:17:38.892386213 +0200
91 -+++ b/plugins/impex/heightmap/CMakeLists.txt 2018-08-29 18:17:38.896386243 +0200
92 -@@ -1,4 +1,6 @@
93 -+if(BUILD_TESTING)
94 - add_subdirectory(tests)
95 -+endif()
96 -
97 - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
98 -
99 ---- a/plugins/impex/psd/CMakeLists.txt 2018-08-29 18:17:38.901386281 +0200
100 -+++ b/plugins/impex/psd/CMakeLists.txt 2018-08-29 18:17:38.904386304 +0200
101 -@@ -1,5 +1,7 @@
102 - if (NOT MSVC AND NOT APPLE)
103 -- add_subdirectory(tests)
104 -+ if(BUILD_TESTING)
105 -+ add_subdirectory(tests)
106 -+ endif()
107 - endif()
108 -
109 - configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
110 ---- a/plugins/impex/ppm/CMakeLists.txt 2018-08-29 18:17:38.909386342 +0200
111 -+++ b/plugins/impex/ppm/CMakeLists.txt 2018-08-29 18:17:38.913386372 +0200
112 -@@ -1,4 +1,6 @@
113 -+if(BUILD_TESTING)
114 - add_subdirectory(tests)
115 -+endif()
116 -
117 - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
118 -
119 ---- a/plugins/impex/png/CMakeLists.txt 2018-08-29 18:17:38.918386410 +0200
120 -+++ b/plugins/impex/png/CMakeLists.txt 2018-08-29 18:17:38.922386440 +0200
121 -@@ -1,4 +1,6 @@
122 -+if(BUILD_TESTING)
123 - add_subdirectory(tests)
124 -+endif()
125 -
126 - set(kritapngimport_SOURCES
127 - kis_png_import.cc
128 ---- a/plugins/impex/csv/CMakeLists.txt 2018-08-29 18:17:38.927386478 +0200
129 -+++ b/plugins/impex/csv/CMakeLists.txt 2018-08-29 18:17:38.931386508 +0200
130 -@@ -1,4 +1,6 @@
131 -+if(BUILD_TESTING)
132 - add_subdirectory(tests)
133 -+endif()
134 -
135 - # import
136 -
137 ---- a/plugins/impex/xcf/CMakeLists.txt 2018-08-29 18:17:38.936386546 +0200
138 -+++ b/plugins/impex/xcf/CMakeLists.txt 2018-08-29 18:17:38.940386576 +0200
139 -@@ -1,4 +1,6 @@
140 -+if(BUILD_TESTING)
141 - add_subdirectory(tests)
142 -+endif()
143 -
144 - set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
145 -
146 ---- a/plugins/impex/tiff/CMakeLists.txt 2018-08-29 18:17:38.944386606 +0200
147 -+++ b/plugins/impex/tiff/CMakeLists.txt 2018-08-29 18:17:38.947386630 +0200
148 -@@ -1,4 +1,6 @@
149 -+if(BUILD_TESTING)
150 - add_subdirectory(tests)
151 -+endif()
152 -
153 - set(libkritatiffconverter_LIB_SRCS
154 - kis_tiff_converter.cc
155 ---- a/plugins/extensions/qmic/CMakeLists.txt 2018-08-29 18:17:38.952386667 +0200
156 -+++ b/plugins/extensions/qmic/CMakeLists.txt 2018-08-29 18:17:38.955386690 +0200
157 -@@ -20,4 +20,6 @@
158 - target_link_libraries(kritaqmic kritaui)
159 - install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
160 -
161 -+if(BUILD_TESTING)
162 - add_subdirectory(tests)
163 -+endif()
164 ---- a/plugins/filters/CMakeLists.txt 2018-08-29 18:17:38.959386720 +0200
165 -+++ b/plugins/filters/CMakeLists.txt 2018-08-29 18:17:38.963386750 +0200
166 -@@ -1,4 +1,6 @@
167 -+if(BUILD_TESTING)
168 - add_subdirectory( tests )
169 -+endif()
170 - add_subdirectory( blur )
171 - add_subdirectory( colors )
172 - add_subdirectory( colorsfilters )
173 ---- a/plugins/filters/unsharp/CMakeLists.txt 2018-08-29 18:17:38.968386788 +0200
174 -+++ b/plugins/filters/unsharp/CMakeLists.txt 2018-08-29 18:17:38.971386811 +0200
175 -@@ -1,4 +1,6 @@
176 -+if(BUILD_TESTING)
177 - add_subdirectory( tests )
178 -+endif()
179 -
180 - set(kritaunsharpfilter_SOURCES
181 - unsharp.cpp
182 ---- a/plugins/tools/basictools/CMakeLists.txt 2018-08-29 18:17:38.976386849 +0200
183 -+++ b/plugins/tools/basictools/CMakeLists.txt 2018-08-29 18:17:38.980386879 +0200
184 -@@ -1,5 +1,7 @@
185 - if (NOT APPLE)
186 -- add_subdirectory(tests)
187 -+ if(BUILD_TESTING)
188 -+ add_subdirectory(tests)
189 -+ endif()
190 - endif ()
191 -
192 - set(kritadefaulttools_SOURCES
193 ---- a/plugins/tools/tool_transform2/CMakeLists.txt 2018-08-29 18:17:38.985386917 +0200
194 -+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2018-08-29 18:17:38.989386947 +0200
195 -@@ -1,5 +1,7 @@
196 - if (NOT WIN32 AND NOT APPLE)
197 -- add_subdirectory(tests)
198 -+ if(BUILD_TESTING)
199 -+ add_subdirectory(tests)
200 -+ endif()
201 - endif()
202 -
203 - set(kritatooltransform_SOURCES
204 ---- a/plugins/color/lcms2engine/CMakeLists.txt 2018-08-29 18:17:38.994386985 +0200
205 -+++ b/plugins/color/lcms2engine/CMakeLists.txt 2018-08-29 18:17:38.998387015 +0200
206 -@@ -1,6 +1,8 @@
207 - project( lcmsengine )
208 -
209 -+if(BUILD_TESTING)
210 - add_subdirectory(tests)
211 -+endif()
212 -
213 - include_directories(SYSTEM
214 - ${LCMS2_INCLUDE_DIR}
215 ---- a/plugins/dockers/defaultdockers/CMakeLists.txt 2018-08-29 18:17:39.003387053 +0200
216 -+++ b/plugins/dockers/defaultdockers/CMakeLists.txt 2018-08-29 18:17:39.007387084 +0200
217 -@@ -1,4 +1,6 @@
218 -+if(BUILD_TESTING)
219 - add_subdirectory( tests )
220 -+endif()
221 -
222 - set(kritadefaultdockers_SOURCES
223 - kis_layer_box.cpp
224 ---- a/plugins/dockers/animation/CMakeLists.txt 2018-08-29 18:17:39.012387121 +0200
225 -+++ b/plugins/dockers/animation/CMakeLists.txt 2018-08-29 18:17:39.016387151 +0200
226 -@@ -1,5 +1,7 @@
227 - if (NOT WIN32 AND NOT APPLE)
228 -- add_subdirectory(tests)
229 -+ if(BUILD_TESTING)
230 -+ add_subdirectory(tests)
231 -+ endif()
232 - endif()
233 -
234 - set(KRITA_ANIMATIONDOCKER_SOURCES
235 ---- a/plugins/dockers/lut/CMakeLists.txt 2018-08-29 18:17:39.021387189 +0200
236 -+++ b/plugins/dockers/lut/CMakeLists.txt 2018-08-29 18:17:39.025387220 +0200
237 -@@ -1,4 +1,6 @@
238 -+if(BUILD_TESTING)
239 - add_subdirectory(tests)
240 -+endif()
241 -
242 - include_directories(SYSTEM
243 - ${OCIO_INCLUDE_DIR}
244 ---- a/libs/store/CMakeLists.txt 2018-08-29 18:17:39.030387258 +0200
245 -+++ b/libs/store/CMakeLists.txt 2018-08-29 18:17:39.033387280 +0200
246 -@@ -1,4 +1,6 @@
247 -+if(BUILD_TESTING)
248 - add_subdirectory(tests)
249 -+endif()
250 -
251 - set(kritastore_LIB_SRCS
252 - KoDirectoryStore.cpp
253 ---- a/libs/flake/CMakeLists.txt 2018-08-29 18:17:39.038387318 +0200
254 -+++ b/libs/flake/CMakeLists.txt 2018-08-29 18:17:39.042387349 +0200
255 -@@ -9,7 +9,9 @@
256 - )
257 -
258 - add_subdirectory(styles)
259 -+if(BUILD_TESTING)
260 - add_subdirectory(tests)
261 -+endif()
262 -
263 - set(kritaflake_SRCS
264 - KoGradientHelper.cpp
265 ---- a/libs/widgetutils/CMakeLists.txt 2018-08-29 18:17:39.046387379 +0200
266 -+++ b/libs/widgetutils/CMakeLists.txt 2018-08-29 18:17:39.049387401 +0200
267 -@@ -1,4 +1,6 @@
268 -+if(BUILD_TESTING)
269 - add_subdirectory(tests)
270 -+endif()
271 -
272 - configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
273 -
274 ---- a/libs/odf/CMakeLists.txt 2018-08-29 18:17:39.054387439 +0200
275 -+++ b/libs/odf/CMakeLists.txt 2018-08-29 18:17:39.058387469 +0200
276 -@@ -1,4 +1,6 @@
277 -+if(BUILD_TESTING)
278 - add_subdirectory( tests )
279 -+endif()
280 -
281 - set(kritaodf_LIB_SRCS
282 - KoOdf.cpp
283 ---- a/libs/pigment/CMakeLists.txt 2018-08-29 18:17:39.062387500 +0200
284 -+++ b/libs/pigment/CMakeLists.txt 2018-08-29 18:17:39.067387538 +0200
285 -@@ -31,7 +31,9 @@
286 - message("${__per_arch_factory_objs}")
287 - endif()
288 -
289 -+if(BUILD_TESTING)
290 - add_subdirectory(tests)
291 -+endif()
292 - add_subdirectory(benchmarks)
293 -
294 - set(kritapigment_SRCS
295 ---- a/libs/widgets/CMakeLists.txt 2018-08-29 18:17:39.073387583 +0200
296 -+++ b/libs/widgets/CMakeLists.txt 2018-08-29 18:17:39.078387621 +0200
297 -@@ -1,4 +1,6 @@
298 -+if(BUILD_TESTING)
299 - add_subdirectory( tests )
300 -+endif()
301 -
302 - include_directories(${CMAKE_CURRENT_BINARY_DIR})
303 -
304 ---- a/libs/ui/CMakeLists.txt 2018-08-29 18:17:39.084387666 +0200
305 -+++ b/libs/ui/CMakeLists.txt 2018-08-29 18:17:39.088387697 +0200
306 -@@ -8,7 +8,9 @@
307 - ${OCIO_INCLUDE_DIR}
308 - )
309 -
310 -+if(BUILD_TESTING)
311 - add_subdirectory( tests )
312 -+endif()
313 -
314 - if (APPLE)
315 - find_library(FOUNDATION_LIBRARY Foundation)
316 ---- a/libs/image/CMakeLists.txt 2018-08-29 18:17:39.092387727 +0200
317 -+++ b/libs/image/CMakeLists.txt 2018-08-29 18:17:39.096387757 +0200
318 -@@ -1,4 +1,6 @@
319 -+if(BUILD_TESTING)
320 - add_subdirectory( tests )
321 -+endif()
322 -
323 - add_subdirectory( tiles3 )
324 -
325 ---- a/libs/image/tiles3/CMakeLists.txt 2018-08-29 18:17:39.101387795 +0200
326 -+++ b/libs/image/tiles3/CMakeLists.txt 2018-08-29 18:17:39.105387825 +0200
327 -@@ -1 +1,3 @@
328 -+if(BUILD_TESTING)
329 - add_subdirectory(tests)
330 -+endif()
331 ---- a/libs/global/CMakeLists.txt 2018-08-29 18:17:39.110387863 +0200
332 -+++ b/libs/global/CMakeLists.txt 2018-08-29 18:17:39.113387886 +0200
333 -@@ -1,4 +1,6 @@
334 -+if(BUILD_TESTING)
335 - add_subdirectory( tests )
336 -+endif()
337 -
338 - include(CheckFunctionExists)
339 - check_function_exists(backtrace HAVE_BACKTRACE)
340 ---- a/libs/brush/CMakeLists.txt 2018-08-29 18:17:39.117387916 +0200
341 -+++ b/libs/brush/CMakeLists.txt 2018-08-29 18:17:39.121387946 +0200
342 -@@ -1,4 +1,6 @@
343 -+if(BUILD_TESTING)
344 - add_subdirectory( tests )
345 -+endif()
346 -
347 - include_directories(SYSTEM
348 - ${EIGEN3_INCLUDE_DIR}
349 ---- a/libs/libkis/CMakeLists.txt 2018-08-29 18:17:39.126387984 +0200
350 -+++ b/libs/libkis/CMakeLists.txt 2018-08-29 18:17:39.131388022 +0200
351 -@@ -46,4 +46,6 @@
352 - install(TARGETS kritalibkis ${INSTALL_TARGETS_DEFAULT_ARGS})
353 -
354 -
355 -+if(BUILD_TESTING)
356 - add_subdirectory(tests)
357 -+endif()
358
359 diff --git a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
360 deleted file mode 100644
361 index 2928247e57a..00000000000
362 --- a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
363 +++ /dev/null
364 @@ -1,49 +0,0 @@
365 -From 0218025b1725aa810f108d08802b590ce62f1044 Mon Sep 17 00:00:00 2001
366 -From: Dmitry Kazakov <dimula73@×××××.com>
367 -Date: Mon, 25 Mar 2019 21:16:41 +0300
368 -Subject: Add a workaround for Qt 5.9...5.11.X to fix tablet support
369 -
370 -Basically, the patch mimics this Qt's patch that has been
371 -added in Qt 5.12.0 only:
372 -https://codereview.qt-project.org/#/c/239918/
373 -
374 -BUG:399696
375 ----
376 - libs/ui/input/kis_input_manager_p.cpp | 22 ++++++++++++++++++++++
377 - 1 file changed, 22 insertions(+)
378 -
379 -diff --git a/libs/ui/input/kis_input_manager_p.cpp b/libs/ui/input/kis_input_manager_p.cpp
380 -index 4f5a58f..0a26655 100644
381 ---- a/libs/ui/input/kis_input_manager_p.cpp
382 -+++ b/libs/ui/input/kis_input_manager_p.cpp
383 -@@ -333,6 +333,28 @@ KisInputManager::Private::ProximityNotifier::ProximityNotifier(KisInputManager::
384 -
385 - bool KisInputManager::Private::ProximityNotifier::eventFilter(QObject* object, QEvent* event )
386 - {
387 -+ /**
388 -+ * All Qt builds in range 5.7.0...5.11.X on X11 had a problem that made all
389 -+ * the tablet events be accepted by default. It meant that no mouse
390 -+ * events were synthesized, and, therefore, no Enter/Leave were generated.
391 -+ *
392 -+ * The fix for this bug has been added only in Qt 5.12.0:
393 -+ * https://codereview.qt-project.org/#/c/239918/
394 -+ *
395 -+ * To avoid this problem we should explicitly ignore all the tablet events.
396 -+ */
397 -+#if defined Q_OS_LINUX && \
398 -+ QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && \
399 -+ QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
400 -+
401 -+ if (event->type() == QEvent::TabletMove ||
402 -+ event->type() == QEvent::TabletPress ||
403 -+ event->type() == QEvent::TabletRelease) {
404 -+
405 -+ event->ignore();
406 -+ }
407 -+#endif
408 -+
409 - switch (event->type()) {
410 - case QEvent::TabletEnterProximity:
411 - d->debugEvent<QEvent, false>(event);
412 ---
413 -cgit v1.1
414
415 diff --git a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
416 deleted file mode 100644
417 index dc65b1c49d2..00000000000
418 --- a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
419 +++ /dev/null
420 @@ -1,38 +0,0 @@
421 -From 9347112a77b3b628af8c0b8d4d7cbc0929eede9e Mon Sep 17 00:00:00 2001
422 -From: =?UTF-8?q?Wolthera=20van=20H=C3=B6vell=20tot=20Westerflier?=
423 - <griffinvalley@×××××.com>
424 -Date: Sat, 30 Mar 2019 21:47:37 +0100
425 -Subject: BUG:406032 Fix crash caused by unsupported composition mode in QT
426 - 5.12
427 -
428 -Qt 5.12 doesn't support QPainter::RasterOp_SourceXorDestination anymore.
429 -
430 -Trying to paint with a painter that uses this while opengl is enabled
431 -will lead to a crash. The only relevant place this enum value is still used
432 -is in kis_tool.cc, where it is only painted on the regular non-accelerated canvas.
433 -
434 -Anyhow, told the smartpatch to use this function instead of doing something itself.
435 -
436 -The whole thing is a little bizar.
437 ----
438 - plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp | 5 ++---
439 - 1 file changed, 2 insertions(+), 3 deletions(-)
440 -
441 -diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
442 -index 656ba38..32577a3 100644
443 ---- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
444 -+++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
445 -@@ -245,9 +245,8 @@ void KisToolSmartPatch::paint(QPainter &painter, const KoViewConverter &converte
446 - Q_UNUSED(converter);
447 -
448 - painter.save();
449 -- painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
450 -- painter.setPen(QColor(128, 255, 128));
451 -- painter.drawPath(pixelToView(m_d->brushOutline));
452 -+ QPainterPath path = pixelToView(m_d->brushOutline);
453 -+ paintToolOutline(&painter, path);
454 - painter.restore();
455 -
456 - painter.save();
457 ---
458 -cgit v1.1
459
460 diff --git a/media-gfx/krita/krita-4.1.8-r1.ebuild b/media-gfx/krita/krita-4.1.8-r1.ebuild
461 deleted file mode 100644
462 index dae8437cd87..00000000000
463 --- a/media-gfx/krita/krita-4.1.8-r1.ebuild
464 +++ /dev/null
465 @@ -1,123 +0,0 @@
466 -# Copyright 1999-2019 Gentoo Authors
467 -# Distributed under the terms of the GNU General Public License v2
468 -
469 -EAPI=7
470 -
471 -KDE_TEST="forceoptional"
472 -QT_MINIMAL="5.11.3"
473 -VIRTUALX_REQUIRED="test"
474 -PYTHON_COMPAT=( python3_{5,6,7} )
475 -inherit kde5 python-single-r1
476 -
477 -if [[ ${KDE_BUILD_TYPE} = release ]]; then
478 - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
479 - KEYWORDS="amd64 ~x86"
480 -fi
481 -
482 -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
483 -HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
484 -LICENSE="GPL-3"
485 -IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
486 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
487 -
488 -# FIXME: drop qtgui subslot operator when QTBUG is fixed or QT_MINIMAL >= 5.12.0:
489 -# https://bugreports.qt.io/browse/QTBUG-72488
490 -BDEPEND="
491 - dev-cpp/eigen:3
492 - dev-lang/perl
493 - sys-devel/gettext
494 -"
495 -COMMON_DEPEND="${PYTHON_DEPS}
496 - $(add_frameworks_dep karchive)
497 - $(add_frameworks_dep kcompletion)
498 - $(add_frameworks_dep kconfig)
499 - $(add_frameworks_dep kcoreaddons)
500 - $(add_frameworks_dep kcrash)
501 - $(add_frameworks_dep kguiaddons)
502 - $(add_frameworks_dep ki18n)
503 - $(add_frameworks_dep kiconthemes)
504 - $(add_frameworks_dep kitemmodels)
505 - $(add_frameworks_dep kitemviews)
506 - $(add_frameworks_dep kwidgetsaddons)
507 - $(add_frameworks_dep kwindowsystem)
508 - $(add_frameworks_dep kxmlgui)
509 - $(add_qt_dep qtconcurrent)
510 - $(add_qt_dep qtdbus)
511 - $(add_qt_dep qtdeclarative)
512 - $(add_qt_dep qtgui '-gles2' '' '5=')
513 - $(add_qt_dep qtnetwork)
514 - $(add_qt_dep qtprintsupport)
515 - $(add_qt_dep qtsvg)
516 - $(add_qt_dep qtwidgets)
517 - $(add_qt_dep qtx11extras)
518 - $(add_qt_dep qtxml)
519 - dev-libs/boost:=
520 - dev-python/PyQt5[${PYTHON_USEDEP}]
521 - dev-python/sip[${PYTHON_USEDEP}]
522 - media-gfx/exiv2:=
523 - media-libs/lcms
524 - media-libs/libpng:0=
525 - sys-libs/zlib
526 - virtual/opengl
527 - x11-libs/libX11
528 - x11-libs/libxcb
529 - x11-libs/libXi
530 - color-management? ( media-libs/opencolorio )
531 - fftw? ( sci-libs/fftw:3.0= )
532 - gif? ( media-libs/giflib )
533 - gsl? ( sci-libs/gsl:= )
534 - jpeg? ( virtual/jpeg:0 )
535 - heif? ( media-libs/libheif:= )
536 - openexr? (
537 - media-libs/ilmbase:=
538 - media-libs/openexr
539 - )
540 - pdf? ( app-text/poppler[qt5] )
541 - qtmedia? ( $(add_qt_dep qtmultimedia) )
542 - raw? ( media-libs/libraw:= )
543 - tiff? ( media-libs/tiff:0 )
544 -"
545 -DEPEND="${COMMON_DEPEND}
546 - vc? ( >=dev-libs/vc-1.1.0 )
547 -"
548 -RDEPEND="${COMMON_DEPEND}
549 - !app-office/calligra:4[calligra_features_krita]
550 - !app-office/calligra-l10n:4[calligra_features_krita(+)]
551 -"
552 -
553 -# bug 630508
554 -RESTRICT+=" test"
555 -
556 -PATCHES=(
557 - "${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
558 - "${FILESDIR}/${P}-qt-5.12-fix-unsupported-composition-mode.patch"
559 - "${FILESDIR}/${P}-fix-pre-5.12-tablet-support.patch"
560 -)
561 -
562 -pkg_setup() {
563 - python-single-r1_pkg_setup
564 - kde5_pkg_setup
565 -}
566 -
567 -src_configure() {
568 - # Prevent sandbox violation from FindPyQt5.py module
569 - # See Gentoo-bug 655918
570 - addpredict /dev/dri
571 -
572 - local mycmakeargs=(
573 - $(cmake-utils_use_find_package color-management OCIO)
574 - $(cmake-utils_use_find_package fftw FFTW3)
575 - $(cmake-utils_use_find_package gif GIF)
576 - $(cmake-utils_use_find_package gsl GSL)
577 - $(cmake-utils_use_find_package heif HEIF)
578 - $(cmake-utils_use_find_package jpeg JPEG)
579 - $(cmake-utils_use_find_package openexr OpenEXR)
580 - $(cmake-utils_use_find_package pdf Poppler)
581 - $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
582 - $(cmake-utils_use_find_package raw LibRaw)
583 - $(cmake-utils_use_find_package tiff TIFF)
584 - $(cmake-utils_use_find_package vc Vc)
585 - )
586 -
587 - kde5_src_configure
588 -}