1 |
commit: acdd885a073537afe5e3b93a9b3c24dabdd4ac04 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 27 12:11:08 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 27 12:17:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdd885a |
7 |
|
8 |
media-gfx/digikam: remove 5.3.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
media-gfx/digikam/Manifest | 1 - |
13 |
media-gfx/digikam/digikam-5.3.0-r1.ebuild | 172 -------------------- |
14 |
media-gfx/digikam/digikam-5.3.0-r2.ebuild | 173 --------------------- |
15 |
media-gfx/digikam/files/digikam-5.3.0-clang.patch | 160 ------------------- |
16 |
.../digikam/files/digikam-5.3.0-db-lock.patch | 135 ---------------- |
17 |
.../digikam/files/digikam-5.3.0-kf-5.31.patch | 76 --------- |
18 |
.../files/digikam-5.3.0-redeyes-crash.patch | 43 ----- |
19 |
media-gfx/digikam/metadata.xml | 1 - |
20 |
8 files changed, 761 deletions(-) |
21 |
|
22 |
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest |
23 |
index aa72b433e7d..0ccca3cbdd0 100644 |
24 |
--- a/media-gfx/digikam/Manifest |
25 |
+++ b/media-gfx/digikam/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST digikam-5.3.0.tar.xz 121417224 SHA256 b36cfa27278936d41ab5f33c99fe9ccdfd545eada3e1e32efe9f9e3fdf2c3e5c SHA512 6190944d09badec6ddac194f2029e86d0ef658e08a6a120f04c86109dc2b9d9cd2e772a900d09781b563fcd0caaff186fb5fd6cde9744ce3b4e8dcc9ff29d421 WHIRLPOOL c1c0987e23587356968484d936a0a99f10d6e6ce004ffe1f5eb4d0a42b59fc1e84ec4a03f491c91c93be172ab6b78444c684221fb515e1562cc76bcc61346158 |
28 |
DIST digikam-5.5.0.tar.xz 129499600 SHA256 df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252 SHA512 3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344 WHIRLPOOL e67b444975ad37e939b2f62bba949bcafb41eee2975470daa02e4ffdd62c6c792b6656edf4811daead52fdc1bf064951fbec7b687192e5d5ee542d5d706140be |
29 |
|
30 |
diff --git a/media-gfx/digikam/digikam-5.3.0-r1.ebuild b/media-gfx/digikam/digikam-5.3.0-r1.ebuild |
31 |
deleted file mode 100644 |
32 |
index 60fe095ca33..00000000000 |
33 |
--- a/media-gfx/digikam/digikam-5.3.0-r1.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,172 +0,0 @@ |
36 |
-# Copyright 1999-2017 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
- |
41 |
-if [[ ${KDE_BUILD_TYPE} != live ]]; then |
42 |
- KDE_HANDBOOK="true" |
43 |
- KDE_TEST="true" |
44 |
-fi |
45 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
46 |
-inherit kde5 toolchain-funcs |
47 |
- |
48 |
-DESCRIPTION="Digital photo management application" |
49 |
-HOMEPAGE="https://www.digikam.org/" |
50 |
- |
51 |
-LICENSE="GPL-2" |
52 |
-KEYWORDS="amd64 x86" |
53 |
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X" |
54 |
- |
55 |
-if [[ ${KDE_BUILD_TYPE} != live ]]; then |
56 |
- MY_PV=${PV/_/-} |
57 |
- MY_P=${PN}-${MY_PV} |
58 |
- SRC_BRANCH=stable |
59 |
- [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable |
60 |
- SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz" |
61 |
- S="${WORKDIR}/${MY_P}/core" |
62 |
-fi |
63 |
- |
64 |
-COMMON_DEPEND=" |
65 |
- $(add_frameworks_dep kconfig) |
66 |
- $(add_frameworks_dep kconfigwidgets) |
67 |
- $(add_frameworks_dep kcoreaddons) |
68 |
- $(add_frameworks_dep kiconthemes) |
69 |
- $(add_frameworks_dep ki18n) |
70 |
- $(add_frameworks_dep kio) |
71 |
- $(add_frameworks_dep knotifications) |
72 |
- $(add_frameworks_dep knotifyconfig) |
73 |
- $(add_frameworks_dep kservice) |
74 |
- $(add_frameworks_dep kwidgetsaddons) |
75 |
- $(add_frameworks_dep kwindowsystem) |
76 |
- $(add_frameworks_dep kxmlgui) |
77 |
- $(add_frameworks_dep solid) |
78 |
- $(add_qt_dep qtdbus) |
79 |
- $(add_qt_dep qtgui '-gles2') |
80 |
- $(add_qt_dep qtprintsupport) |
81 |
- $(add_qt_dep qtsql 'mysql?') |
82 |
- $(add_qt_dep qtwebkit) |
83 |
- $(add_qt_dep qtwidgets) |
84 |
- $(add_qt_dep qtxml) |
85 |
- dev-libs/expat |
86 |
- media-gfx/exiv2:= |
87 |
- media-libs/lcms:2 |
88 |
- media-libs/liblqr |
89 |
- >=media-libs/libpgf-6.12.27 |
90 |
- media-libs/libpng:0= |
91 |
- media-libs/opencv:=[-qt4(-)] |
92 |
- || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 ) |
93 |
- media-libs/tiff:0 |
94 |
- virtual/jpeg:0 |
95 |
- addressbook? ( |
96 |
- $(add_kdeapps_dep akonadi-contacts) |
97 |
- $(add_kdeapps_dep kcontacts) |
98 |
- ) |
99 |
- calendar? ( $(add_kdeapps_dep kcalcore) ) |
100 |
- gphoto2? ( media-libs/libgphoto2:= ) |
101 |
- jpeg2k? ( media-libs/jasper:= ) |
102 |
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') ) |
103 |
- lensfun? ( media-libs/lensfun ) |
104 |
- marble? ( |
105 |
- $(add_frameworks_dep kbookmarks) |
106 |
- $(add_kdeapps_dep marble) |
107 |
- $(add_qt_dep qtconcurrent) |
108 |
- $(add_qt_dep qtnetwork) |
109 |
- ) |
110 |
- mysql? ( virtual/mysql ) |
111 |
- opengl? ( |
112 |
- $(add_qt_dep qtopengl) |
113 |
- virtual/opengl |
114 |
- ) |
115 |
- panorama? ( $(add_frameworks_dep threadweaver) ) |
116 |
- scanner? ( $(add_kdeapps_dep libksane) ) |
117 |
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) |
118 |
- video? ( $(add_qt_dep qtmultimedia 'widgets') ) |
119 |
- X? ( |
120 |
- $(add_qt_dep qtx11extras) |
121 |
- x11-libs/libX11 |
122 |
- ) |
123 |
-" |
124 |
-DEPEND="${COMMON_DEPEND} |
125 |
- $(add_qt_dep qtconcurrent) |
126 |
- dev-cpp/eigen:3 |
127 |
- dev-libs/boost[threads] |
128 |
- sys-devel/gettext |
129 |
- panorama? ( |
130 |
- sys-devel/bison |
131 |
- sys-devel/flex |
132 |
- ) |
133 |
-" |
134 |
-RDEPEND="${COMMON_DEPEND} |
135 |
- media-plugins/kipi-plugins:5 |
136 |
- panorama? ( media-gfx/hugin ) |
137 |
- !media-gfx/digikam:4 |
138 |
-" |
139 |
- |
140 |
-RESTRICT=test |
141 |
-# bug 366505 |
142 |
- |
143 |
-PATCHES=( |
144 |
- "${FILESDIR}/${P}-db-lock.patch" |
145 |
- "${FILESDIR}/${P}-clang.patch" |
146 |
- "${FILESDIR}/${P}-kf-5.31.patch" |
147 |
-) |
148 |
- |
149 |
-pkg_pretend() { |
150 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
151 |
- kde5_pkg_pretend |
152 |
-} |
153 |
- |
154 |
-pkg_setup() { |
155 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
156 |
- kde5_pkg_setup |
157 |
-} |
158 |
- |
159 |
-# FIXME: Unbundle libraw (libs/rawengine/libraw) |
160 |
-src_prepare() { |
161 |
- if [[ ${KDE_BUILD_TYPE} != live ]]; then |
162 |
- # prepare the translations |
163 |
- mv "${WORKDIR}/${MY_P}/po" po || die |
164 |
- find po -name "*.po" -and -not -name "digikam.po" -delete || die |
165 |
- echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die |
166 |
- echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die |
167 |
- echo "add_subdirectory( po )" >> CMakeLists.txt || die |
168 |
- |
169 |
- if use handbook; then |
170 |
- # subdirs need to be preserved b/c relative paths... |
171 |
- # doc-translated is, in fact, broken, and ignored |
172 |
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die |
173 |
- echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die |
174 |
- echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die |
175 |
- fi |
176 |
- fi |
177 |
- |
178 |
- if ! use marble; then |
179 |
- punt_bogus_dep Qt5 Network |
180 |
- fi |
181 |
- |
182 |
- kde5_src_prepare |
183 |
-} |
184 |
- |
185 |
-src_configure() { |
186 |
- local mycmakeargs=( |
187 |
- -DENABLE_APPSTYLES=ON |
188 |
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) |
189 |
- -DENABLE_MYSQLSUPPORT=$(usex mysql) |
190 |
- -DENABLE_MEDIAPLAYER=$(usex video) |
191 |
- -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) |
192 |
- $(cmake-utils_use_find_package calendar KF5CalendarCore) |
193 |
- $(cmake-utils_use_find_package gphoto2 Gphoto2) |
194 |
- $(cmake-utils_use_find_package jpeg2k Jasper) |
195 |
- $(cmake-utils_use_find_package kipi KF5Kipi) |
196 |
- $(cmake-utils_use_find_package lensfun LensFun) |
197 |
- $(cmake-utils_use_find_package marble Marble) |
198 |
- $(cmake-utils_use_find_package opengl OpenGL) |
199 |
- $(cmake-utils_use_find_package openmp OpenMP) |
200 |
- $(cmake-utils_use_find_package panorama KF5ThreadWeaver) |
201 |
- $(cmake-utils_use_find_package scanner KF5Sane) |
202 |
- $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) |
203 |
- $(cmake-utils_use_find_package X X11) |
204 |
- ) |
205 |
- |
206 |
- kde5_src_configure |
207 |
-} |
208 |
|
209 |
diff --git a/media-gfx/digikam/digikam-5.3.0-r2.ebuild b/media-gfx/digikam/digikam-5.3.0-r2.ebuild |
210 |
deleted file mode 100644 |
211 |
index 3f924d9469a..00000000000 |
212 |
--- a/media-gfx/digikam/digikam-5.3.0-r2.ebuild |
213 |
+++ /dev/null |
214 |
@@ -1,173 +0,0 @@ |
215 |
-# Copyright 1999-2017 Gentoo Foundation |
216 |
-# Distributed under the terms of the GNU General Public License v2 |
217 |
- |
218 |
-EAPI=6 |
219 |
- |
220 |
-if [[ ${KDE_BUILD_TYPE} != live ]]; then |
221 |
- KDE_HANDBOOK="true" |
222 |
- KDE_TEST="true" |
223 |
-fi |
224 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
225 |
-inherit kde5 toolchain-funcs |
226 |
- |
227 |
-DESCRIPTION="Digital photo management application" |
228 |
-HOMEPAGE="https://www.digikam.org/" |
229 |
- |
230 |
-LICENSE="GPL-2" |
231 |
-KEYWORDS="~amd64 ~x86" |
232 |
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X" |
233 |
- |
234 |
-if [[ ${KDE_BUILD_TYPE} != live ]]; then |
235 |
- MY_PV=${PV/_/-} |
236 |
- MY_P=${PN}-${MY_PV} |
237 |
- SRC_BRANCH=stable |
238 |
- [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable |
239 |
- SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz" |
240 |
- S="${WORKDIR}/${MY_P}/core" |
241 |
-fi |
242 |
- |
243 |
-COMMON_DEPEND=" |
244 |
- $(add_frameworks_dep kconfig) |
245 |
- $(add_frameworks_dep kconfigwidgets) |
246 |
- $(add_frameworks_dep kcoreaddons) |
247 |
- $(add_frameworks_dep kiconthemes) |
248 |
- $(add_frameworks_dep ki18n) |
249 |
- $(add_frameworks_dep kio) |
250 |
- $(add_frameworks_dep knotifications) |
251 |
- $(add_frameworks_dep knotifyconfig) |
252 |
- $(add_frameworks_dep kservice) |
253 |
- $(add_frameworks_dep kwidgetsaddons) |
254 |
- $(add_frameworks_dep kwindowsystem) |
255 |
- $(add_frameworks_dep kxmlgui) |
256 |
- $(add_frameworks_dep solid) |
257 |
- $(add_qt_dep qtdbus) |
258 |
- $(add_qt_dep qtgui '-gles2') |
259 |
- $(add_qt_dep qtprintsupport) |
260 |
- $(add_qt_dep qtsql 'mysql?') |
261 |
- $(add_qt_dep qtwebkit) |
262 |
- $(add_qt_dep qtwidgets) |
263 |
- $(add_qt_dep qtxml) |
264 |
- dev-libs/expat |
265 |
- media-gfx/exiv2:= |
266 |
- media-libs/lcms:2 |
267 |
- media-libs/liblqr |
268 |
- >=media-libs/libpgf-6.12.27 |
269 |
- media-libs/libpng:0= |
270 |
- media-libs/opencv:=[-qt4(-)] |
271 |
- || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 ) |
272 |
- media-libs/tiff:0 |
273 |
- virtual/jpeg:0 |
274 |
- addressbook? ( |
275 |
- $(add_kdeapps_dep akonadi-contacts) |
276 |
- $(add_kdeapps_dep kcontacts) |
277 |
- ) |
278 |
- calendar? ( $(add_kdeapps_dep kcalcore) ) |
279 |
- gphoto2? ( media-libs/libgphoto2:= ) |
280 |
- jpeg2k? ( media-libs/jasper:= ) |
281 |
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') ) |
282 |
- lensfun? ( media-libs/lensfun ) |
283 |
- marble? ( |
284 |
- $(add_frameworks_dep kbookmarks) |
285 |
- $(add_kdeapps_dep marble) |
286 |
- $(add_qt_dep qtconcurrent) |
287 |
- $(add_qt_dep qtnetwork) |
288 |
- ) |
289 |
- mysql? ( virtual/mysql ) |
290 |
- opengl? ( |
291 |
- $(add_qt_dep qtopengl) |
292 |
- virtual/opengl |
293 |
- ) |
294 |
- panorama? ( $(add_frameworks_dep threadweaver) ) |
295 |
- scanner? ( $(add_kdeapps_dep libksane) ) |
296 |
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) |
297 |
- video? ( $(add_qt_dep qtmultimedia 'widgets') ) |
298 |
- X? ( |
299 |
- $(add_qt_dep qtx11extras) |
300 |
- x11-libs/libX11 |
301 |
- ) |
302 |
-" |
303 |
-DEPEND="${COMMON_DEPEND} |
304 |
- $(add_qt_dep qtconcurrent) |
305 |
- dev-cpp/eigen:3 |
306 |
- dev-libs/boost[threads] |
307 |
- sys-devel/gettext |
308 |
- panorama? ( |
309 |
- sys-devel/bison |
310 |
- sys-devel/flex |
311 |
- ) |
312 |
-" |
313 |
-RDEPEND="${COMMON_DEPEND} |
314 |
- media-plugins/kipi-plugins:5 |
315 |
- panorama? ( media-gfx/hugin ) |
316 |
- !media-gfx/digikam:4 |
317 |
-" |
318 |
- |
319 |
-RESTRICT=test |
320 |
-# bug 366505 |
321 |
- |
322 |
-PATCHES=( |
323 |
- "${FILESDIR}/${P}-db-lock.patch" |
324 |
- "${FILESDIR}/${P}-clang.patch" |
325 |
- "${FILESDIR}/${P}-kf-5.31.patch" |
326 |
- "${FILESDIR}/${P}-redeyes-crash.patch" |
327 |
-) |
328 |
- |
329 |
-pkg_pretend() { |
330 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
331 |
- kde5_pkg_pretend |
332 |
-} |
333 |
- |
334 |
-pkg_setup() { |
335 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
336 |
- kde5_pkg_setup |
337 |
-} |
338 |
- |
339 |
-# FIXME: Unbundle libraw (libs/rawengine/libraw) |
340 |
-src_prepare() { |
341 |
- if [[ ${KDE_BUILD_TYPE} != live ]]; then |
342 |
- # prepare the translations |
343 |
- mv "${WORKDIR}/${MY_P}/po" po || die |
344 |
- find po -name "*.po" -and -not -name "digikam.po" -delete || die |
345 |
- echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die |
346 |
- echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die |
347 |
- echo "add_subdirectory( po )" >> CMakeLists.txt || die |
348 |
- |
349 |
- if use handbook; then |
350 |
- # subdirs need to be preserved b/c relative paths... |
351 |
- # doc-translated is, in fact, broken, and ignored |
352 |
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die |
353 |
- echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die |
354 |
- echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die |
355 |
- fi |
356 |
- fi |
357 |
- |
358 |
- if ! use marble; then |
359 |
- punt_bogus_dep Qt5 Network |
360 |
- fi |
361 |
- |
362 |
- kde5_src_prepare |
363 |
-} |
364 |
- |
365 |
-src_configure() { |
366 |
- local mycmakeargs=( |
367 |
- -DENABLE_APPSTYLES=ON |
368 |
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) |
369 |
- -DENABLE_MYSQLSUPPORT=$(usex mysql) |
370 |
- -DENABLE_MEDIAPLAYER=$(usex video) |
371 |
- -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) |
372 |
- $(cmake-utils_use_find_package calendar KF5CalendarCore) |
373 |
- $(cmake-utils_use_find_package gphoto2 Gphoto2) |
374 |
- $(cmake-utils_use_find_package jpeg2k Jasper) |
375 |
- $(cmake-utils_use_find_package kipi KF5Kipi) |
376 |
- $(cmake-utils_use_find_package lensfun LensFun) |
377 |
- $(cmake-utils_use_find_package marble Marble) |
378 |
- $(cmake-utils_use_find_package opengl OpenGL) |
379 |
- $(cmake-utils_use_find_package openmp OpenMP) |
380 |
- $(cmake-utils_use_find_package panorama KF5ThreadWeaver) |
381 |
- $(cmake-utils_use_find_package scanner KF5Sane) |
382 |
- $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) |
383 |
- $(cmake-utils_use_find_package X X11) |
384 |
- ) |
385 |
- |
386 |
- kde5_src_configure |
387 |
-} |
388 |
|
389 |
diff --git a/media-gfx/digikam/files/digikam-5.3.0-clang.patch b/media-gfx/digikam/files/digikam-5.3.0-clang.patch |
390 |
deleted file mode 100644 |
391 |
index b4af04cd19e..00000000000 |
392 |
--- a/media-gfx/digikam/files/digikam-5.3.0-clang.patch |
393 |
+++ /dev/null |
394 |
@@ -1,160 +0,0 @@ |
395 |
-commit 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758 |
396 |
-Author: Gilles Caulier <caulier.gilles@×××××.com> |
397 |
-Date: Wed Jan 18 10:13:20 2017 +0100 |
398 |
- |
399 |
- Fix compilation with clang |
400 |
- |
401 |
-diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h |
402 |
-index 4ba89c9..d7e6c77 100644 |
403 |
---- a/libs/database/imagehistory/imagehistorygraph_boost.h |
404 |
-+++ b/libs/database/imagehistory/imagehistorygraph_boost.h |
405 |
-@@ -28,7 +28,7 @@ |
406 |
- #include "digikam_config.h" |
407 |
- |
408 |
- // Pragma directives to reduce warnings from Boost header files. |
409 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
410 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
411 |
- #pragma GCC diagnostic push |
412 |
- #pragma GCC diagnostic ignored "-Wunused-local-typedefs" |
413 |
- #endif |
414 |
-@@ -1554,7 +1554,7 @@ protected: |
415 |
- } // namespace Digikam |
416 |
- |
417 |
- // Restore warnings |
418 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
419 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
420 |
- #pragma GCC diagnostic pop |
421 |
- #endif |
422 |
- |
423 |
-diff --git a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp |
424 |
-index f5d0640..91e443d 100644 |
425 |
---- a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp |
426 |
-+++ b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp |
427 |
-@@ -52,7 +52,7 @@ |
428 |
- #define GREYSTORATION_USING_GFACT 1 |
429 |
- |
430 |
- // Pragma directives to reduce warnings from CImg header files. |
431 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
432 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
433 |
- #pragma GCC diagnostic push |
434 |
- #pragma GCC diagnostic ignored "-Wunused-local-typedefs" |
435 |
- #pragma GCC diagnostic ignored "-Wunused-but-set-variable" |
436 |
-@@ -71,7 +71,7 @@ |
437 |
- #include "cimg/CImg.h" |
438 |
- |
439 |
- // Restore warnings |
440 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
441 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
442 |
- #pragma GCC diagnostic pop |
443 |
- #endif |
444 |
- |
445 |
-diff --git a/libs/dimg/filters/randomnumbergenerator.cpp b/libs/dimg/filters/randomnumbergenerator.cpp |
446 |
-index 93d7cc4..d7b2ed8 100644 |
447 |
---- a/libs/dimg/filters/randomnumbergenerator.cpp |
448 |
-+++ b/libs/dimg/filters/randomnumbergenerator.cpp |
449 |
-@@ -26,7 +26,7 @@ |
450 |
- // Boost includes |
451 |
- |
452 |
- // Pragma directives to reduce warnings from Boost header files. |
453 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
454 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
455 |
- #pragma GCC diagnostic push |
456 |
- #pragma GCC diagnostic ignored "-Wundef" |
457 |
- #endif |
458 |
-@@ -44,7 +44,7 @@ |
459 |
- #include <boost/random/variate_generator.hpp> |
460 |
- |
461 |
- // Restore warnings |
462 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
463 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
464 |
- #pragma GCC diagnostic pop |
465 |
- #endif |
466 |
- |
467 |
-diff --git a/libs/dimg/filters/sharp/matrix.cpp b/libs/dimg/filters/sharp/matrix.cpp |
468 |
-index 4f32aa3..1a3c65a 100644 |
469 |
---- a/libs/dimg/filters/sharp/matrix.cpp |
470 |
-+++ b/libs/dimg/filters/sharp/matrix.cpp |
471 |
-@@ -43,7 +43,7 @@ |
472 |
- // Eigen includes |
473 |
- |
474 |
- // Pragma directives to reduce warnings from Eigen header files. |
475 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
476 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
477 |
- #pragma GCC diagnostic push |
478 |
- #pragma GCC diagnostic ignored "-Wunused-local-typedefs" |
479 |
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
480 |
-@@ -53,7 +53,7 @@ |
481 |
- #include <Eigen/LU> |
482 |
- |
483 |
- // Restore warnings |
484 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
485 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
486 |
- #pragma GCC diagnostic pop |
487 |
- #endif |
488 |
- |
489 |
-diff --git a/libs/dmetadata/metaengine_p.cpp b/libs/dmetadata/metaengine_p.cpp |
490 |
-index 2c83b58..2b44e06 100644 |
491 |
---- a/libs/dmetadata/metaengine_p.cpp |
492 |
-+++ b/libs/dmetadata/metaengine_p.cpp |
493 |
-@@ -49,7 +49,7 @@ extern "C" |
494 |
- #include "digikam_debug.h" |
495 |
- |
496 |
- // Pragma directives to reduce warnings from Exiv2. |
497 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
498 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
499 |
- #pragma GCC diagnostic push |
500 |
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
501 |
- #endif |
502 |
-@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar) |
503 |
- } // namespace Digikam |
504 |
- |
505 |
- // Restore warnings |
506 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
507 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
508 |
- #pragma GCC diagnostic pop |
509 |
- #endif |
510 |
- |
511 |
-diff --git a/libs/jpegutils/jpegutils.cpp b/libs/jpegutils/jpegutils.cpp |
512 |
-index c823f40..60c7469 100644 |
513 |
---- a/libs/jpegutils/jpegutils.cpp |
514 |
-+++ b/libs/jpegutils/jpegutils.cpp |
515 |
-@@ -53,7 +53,7 @@ extern "C" |
516 |
- } |
517 |
- |
518 |
- // Pragma directives to reduce warnings from libjpeg transupp header file. |
519 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
520 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
521 |
- #pragma GCC diagnostic push |
522 |
- #pragma GCC diagnostic ignored "-Wunused-parameter" |
523 |
- #endif |
524 |
-@@ -69,7 +69,7 @@ extern "C" |
525 |
- } |
526 |
- |
527 |
- // Restore warnings |
528 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
529 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
530 |
- #pragma GCC diagnostic pop |
531 |
- #endif |
532 |
- |
533 |
-diff --git a/libs/rawengine/drawdecoder_p.h b/libs/rawengine/drawdecoder_p.h |
534 |
-index a27e199..ea653b4 100644 |
535 |
---- a/libs/rawengine/drawdecoder_p.h |
536 |
-+++ b/libs/rawengine/drawdecoder_p.h |
537 |
-@@ -31,7 +31,7 @@ |
538 |
- #include <QByteArray> |
539 |
- |
540 |
- // Pragma directives to reduce warnings from LibRaw header files. |
541 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
542 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
543 |
- #pragma GCC diagnostic push |
544 |
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
545 |
- #endif |
546 |
-@@ -46,7 +46,7 @@ |
547 |
- #include <libraw.h> |
548 |
- |
549 |
- // Restore warnings |
550 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
551 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
552 |
- #pragma GCC diagnostic pop |
553 |
- #endif |
554 |
- |
555 |
|
556 |
diff --git a/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch b/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch |
557 |
deleted file mode 100644 |
558 |
index 50223f01184..00000000000 |
559 |
--- a/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch |
560 |
+++ /dev/null |
561 |
@@ -1,135 +0,0 @@ |
562 |
-From f37ef2c195b61a43a40e9cbb7f119fdc8e9d38f4 Mon Sep 17 00:00:00 2001 |
563 |
-From: Maik Qualmann <metzpinguin@×××××.com> |
564 |
-Date: Sat, 10 Dec 2016 11:16:50 +0100 |
565 |
-Subject: fix locked database with BQM |
566 |
- |
567 |
---- |
568 |
- utilities/queuemanager/manager/actionthread.cpp | 27 ++++++++++++++++++++++--- |
569 |
- utilities/queuemanager/manager/actionthread.h | 1 + |
570 |
- utilities/queuemanager/manager/task.cpp | 24 +++++----------------- |
571 |
- 3 files changed, 30 insertions(+), 22 deletions(-) |
572 |
- |
573 |
-diff --git a/utilities/queuemanager/manager/actionthread.cpp b/utilities/queuemanager/manager/actionthread.cpp |
574 |
-index 48c3fa3..141bb3d 100644 |
575 |
---- a/utilities/queuemanager/manager/actionthread.cpp |
576 |
-+++ b/utilities/queuemanager/manager/actionthread.cpp |
577 |
-@@ -28,6 +28,7 @@ |
578 |
- |
579 |
- #include "digikam_debug.h" |
580 |
- #include "digikam_config.h" |
581 |
-+#include "collectionscanner.h" |
582 |
- #include "task.h" |
583 |
- |
584 |
- namespace Digikam |
585 |
-@@ -82,7 +83,7 @@ void ActionThread::processQueueItems(const QList<AssignedBatchTools>& items) |
586 |
- { |
587 |
- ActionJobCollection collection; |
588 |
- |
589 |
-- for(int i = 0 ; i < items.size() ; i++) |
590 |
-+ for (int i = 0 ; i < items.size() ; i++) |
591 |
- { |
592 |
- Task* const t = new Task(); |
593 |
- t->setSettings(d->settings); |
594 |
-@@ -92,10 +93,12 @@ void ActionThread::processQueueItems(const QList<AssignedBatchTools>& items) |
595 |
- this, SIGNAL(signalStarting(Digikam::ActionData))); |
596 |
- |
597 |
- connect(t, SIGNAL(signalFinished(Digikam::ActionData)), |
598 |
-- this, SIGNAL(signalFinished(Digikam::ActionData))); |
599 |
-+ this, SLOT(slotUpdateImageInfo(Digikam::ActionData)), |
600 |
-+ Qt::BlockingQueuedConnection); |
601 |
- |
602 |
- connect(this, SIGNAL(signalCancelTask()), |
603 |
-- t, SLOT(slotCancel()), Qt::QueuedConnection); |
604 |
-+ t, SLOT(slotCancel()), |
605 |
-+ Qt::QueuedConnection); |
606 |
- |
607 |
- collection.insert(t, 0); |
608 |
- } |
609 |
-@@ -111,6 +114,24 @@ void ActionThread::cancel() |
610 |
- ActionThreadBase::cancel(); |
611 |
- } |
612 |
- |
613 |
-+void ActionThread::slotUpdateImageInfo(const Digikam::ActionData& ad) |
614 |
-+{ |
615 |
-+ if (ad.status == ActionData::BatchDone) |
616 |
-+ { |
617 |
-+ CollectionScanner scanner; |
618 |
-+ ImageInfo source = ImageInfo::fromUrl(ad.fileUrl); |
619 |
-+ qlonglong id = scanner.scanFile(ad.destUrl.toLocalFile(), CollectionScanner::NormalScan); |
620 |
-+ ImageInfo info(id); |
621 |
-+ QDateTime dateTime = info.dateTime(); |
622 |
-+ // Copy the digiKam attributes from original file to the new file |
623 |
-+ CollectionScanner::copyFileProperties(source, info); |
624 |
-+ // Restore date time from new file |
625 |
-+ info.setDateTime(dateTime); |
626 |
-+ } |
627 |
-+ |
628 |
-+ emit signalFinished(ad); |
629 |
-+} |
630 |
-+ |
631 |
- void ActionThread::slotThreadFinished() |
632 |
- { |
633 |
- if (isEmpty()) |
634 |
-diff --git a/utilities/queuemanager/manager/actionthread.h b/utilities/queuemanager/manager/actionthread.h |
635 |
-index 8cb848b..3375c2e 100644 |
636 |
---- a/utilities/queuemanager/manager/actionthread.h |
637 |
-+++ b/utilities/queuemanager/manager/actionthread.h |
638 |
-@@ -72,6 +72,7 @@ Q_SIGNALS: |
639 |
- |
640 |
- private Q_SLOTS: |
641 |
- |
642 |
-+ void slotUpdateImageInfo(const Digikam::ActionData& ad); |
643 |
- void slotThreadFinished(); |
644 |
- |
645 |
- private: |
646 |
-diff --git a/utilities/queuemanager/manager/task.cpp b/utilities/queuemanager/manager/task.cpp |
647 |
-index a94b4f9..4c6b710 100644 |
648 |
---- a/utilities/queuemanager/manager/task.cpp |
649 |
-+++ b/utilities/queuemanager/manager/task.cpp |
650 |
-@@ -46,10 +46,8 @@ extern "C" |
651 |
- #include "dimg.h" |
652 |
- #include "dmetadata.h" |
653 |
- #include "imageinfo.h" |
654 |
--#include "fileactionmngr.h" |
655 |
- #include "batchtool.h" |
656 |
- #include "batchtoolsmanager.h" |
657 |
--#include "collectionscanner.h" |
658 |
- #include "fileoperation.h" |
659 |
- |
660 |
- namespace Digikam |
661 |
-@@ -245,27 +243,15 @@ void Task::run() |
662 |
- } |
663 |
- } |
664 |
- |
665 |
-- if (!FileOperation::localFileRename(d->tools.m_itemUrl.toLocalFile(), |
666 |
-- outUrl.toLocalFile(), |
667 |
-- dest.toLocalFile())) |
668 |
-+ if (FileOperation::localFileRename(d->tools.m_itemUrl.toLocalFile(), |
669 |
-+ outUrl.toLocalFile(), |
670 |
-+ dest.toLocalFile())) |
671 |
- { |
672 |
-- emitActionData(ActionData::BatchFailed, i18n("Failed to create file..."), dest); |
673 |
-+ emitActionData(ActionData::BatchDone, i18n("Item processed successfully %1", renameMess), dest); |
674 |
- } |
675 |
- else |
676 |
- { |
677 |
-- // -- Now copy the digiKam attributes from original file to the new file ------------ |
678 |
-- |
679 |
-- CollectionScanner scanner; |
680 |
-- qlonglong id = scanner.scanFile(dest.toLocalFile(), CollectionScanner::NormalScan); |
681 |
-- |
682 |
-- ImageInfo destInfo(id); |
683 |
-- CollectionScanner::copyFileProperties(source, destInfo); |
684 |
-- |
685 |
-- // -- Read again new file that the database is up to date --------------------------- |
686 |
-- |
687 |
-- scanner.scanFile(destInfo, CollectionScanner::Rescan); |
688 |
-- |
689 |
-- emitActionData(ActionData::BatchDone, i18n("Item processed successfully %1", renameMess), dest); |
690 |
-+ emitActionData(ActionData::BatchFailed, i18n("Failed to create file..."), dest); |
691 |
- } |
692 |
- } |
693 |
- else |
694 |
--- |
695 |
-cgit v0.11.2 |
696 |
- |
697 |
|
698 |
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 |
699 |
deleted file mode 100644 |
700 |
index ab648ef3daf..00000000000 |
701 |
--- a/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch |
702 |
+++ /dev/null |
703 |
@@ -1,76 +0,0 @@ |
704 |
-commit 3793b47b6f57a627911bcce819b1ecc2dc9e422a |
705 |
-Author: Kevin Funk <kfunk@×××.org> |
706 |
-Date: Wed Jan 18 13:34:55 2017 +0100 |
707 |
- |
708 |
- Fix compilation with new KDECompilerSettings.cmake |
709 |
- |
710 |
-diff --git a/app/utils/libopencv.h.cmake.in b/app/utils/libopencv.h.cmake.in |
711 |
-index cc58b7c..6abf642 100644 |
712 |
---- a/app/utils/libopencv.h.cmake.in |
713 |
-+++ b/app/utils/libopencv.h.cmake.in |
714 |
-@@ -27,7 +27,7 @@ |
715 |
- #define LIB_OPEN_CV_H |
716 |
- |
717 |
- // Pragma directives to reduce warnings from OpenCV header files. |
718 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
719 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
720 |
- #pragma GCC diagnostic push |
721 |
- #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" |
722 |
- #pragma GCC diagnostic ignored "-Woverloaded-virtual" |
723 |
-@@ -82,7 +82,7 @@ |
724 |
- #endif |
725 |
- |
726 |
- // Restore warnings |
727 |
--#if not defined(__APPLE__) && defined(__GNUC__) |
728 |
-+#if !defined(__APPLE__) && defined(__GNUC__) |
729 |
- #pragma GCC diagnostic pop |
730 |
- #endif |
731 |
- |
732 |
-diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt |
733 |
-index c5d9c27..14a7180 100644 |
734 |
---- a/libs/database/CMakeLists.txt |
735 |
-+++ b/libs/database/CMakeLists.txt |
736 |
-@@ -10,6 +10,9 @@ if (POLICY CMP0063) |
737 |
- cmake_policy(SET CMP0063 NEW) |
738 |
- endif (POLICY CMP0063) |
739 |
- |
740 |
-+# Boost uses operator names (and, not, ...) |
741 |
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
742 |
-+ |
743 |
- set(libdatabasecore_SRCS |
744 |
- server/databaseserverstarter.cpp |
745 |
- server/databaseservererror.cpp |
746 |
-diff --git a/libs/dimg/CMakeLists.txt b/libs/dimg/CMakeLists.txt |
747 |
-index 3bcada5..04a0a22 100644 |
748 |
---- a/libs/dimg/CMakeLists.txt |
749 |
-+++ b/libs/dimg/CMakeLists.txt |
750 |
-@@ -11,6 +11,9 @@ endif (POLICY CMP0063) |
751 |
- |
752 |
- kde_enable_exceptions() |
753 |
- |
754 |
-+# Boost uses operator names (and, not, ...) |
755 |
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
756 |
-+ |
757 |
- set(libdimg_SRCS |
758 |
- dimg.cpp |
759 |
- drawdecoding.cpp |
760 |
-commit b318820530a4f001bc6621532b5416bf3c4a43cf |
761 |
-Author: Kevin Funk <kfunk@×××.org> |
762 |
-Date: Wed Jan 18 15:20:36 2017 +0100 |
763 |
- |
764 |
- tests/dimg needs -fno-operator-names dropped, too |
765 |
- |
766 |
-diff --git a/tests/dimg/CMakeLists.txt b/tests/dimg/CMakeLists.txt |
767 |
-index 6d9e6d6..5133f88 100644 |
768 |
---- a/tests/dimg/CMakeLists.txt |
769 |
-+++ b/tests/dimg/CMakeLists.txt |
770 |
-@@ -8,6 +8,9 @@ if (POLICY CMP0063) |
771 |
- cmake_policy(SET CMP0063 NEW) |
772 |
- endif (POLICY CMP0063) |
773 |
- |
774 |
-+# Boost uses operator names (and, not, ...) |
775 |
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
776 |
-+ |
777 |
- include_directories( |
778 |
- $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES> |
779 |
- $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES> |
780 |
|
781 |
diff --git a/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch b/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch |
782 |
deleted file mode 100644 |
783 |
index 055f9be3acd..00000000000 |
784 |
--- a/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch |
785 |
+++ /dev/null |
786 |
@@ -1,43 +0,0 @@ |
787 |
-commit 1dad795deb0fbfcef5ad4932f7ade781d35ce17e |
788 |
-Author: Maik Qualmann <metzpinguin@×××××.com> |
789 |
-Date: Wed Nov 23 19:37:46 2016 +0100 |
790 |
- |
791 |
- fix not found shapepredictor.dat file |
792 |
- BUGS: 372831 |
793 |
- FIXED-IN: 5.4.0 |
794 |
- |
795 |
-diff --git a/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp b/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp |
796 |
-index 1cbaefc..a834208 100644 |
797 |
---- a/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp |
798 |
-+++ b/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp |
799 |
-@@ -99,14 +99,14 @@ RedEyeCorrectionFilter::~RedEyeCorrectionFilter() |
800 |
- |
801 |
- void RedEyeCorrectionFilter::filterImage() |
802 |
- { |
803 |
-- if (d->sp == 0) |
804 |
-+ if (!d->sp) |
805 |
- { |
806 |
- // Loading the shape predictor model |
807 |
- |
808 |
-- QList<QString> path = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, |
809 |
-- QString::fromLatin1("digikam/facesengine"), |
810 |
-- QStandardPaths::LocateDirectory); |
811 |
-- QFile model(*path.begin() + QLatin1String("/ShapePredictor.dat")); |
812 |
-+ QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, |
813 |
-+ QLatin1String("digikam/facesengine/shapepredictor.dat")); |
814 |
-+ |
815 |
-+ QFile model(path); |
816 |
- |
817 |
- if (model.open(QIODevice::ReadOnly)) |
818 |
- { |
819 |
-@@ -116,6 +116,10 @@ void RedEyeCorrectionFilter::filterImage() |
820 |
- dataStream >> *temp; |
821 |
- d->sp = temp; |
822 |
- } |
823 |
-+ else |
824 |
-+ { |
825 |
-+ return; |
826 |
-+ } |
827 |
- } |
828 |
- |
829 |
- cv::Mat intermediateImage; |
830 |
|
831 |
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml |
832 |
index faac150cd06..00059c9b9d3 100644 |
833 |
--- a/media-gfx/digikam/metadata.xml |
834 |
+++ b/media-gfx/digikam/metadata.xml |
835 |
@@ -15,6 +15,5 @@ |
836 |
<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag> |
837 |
<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag> |
838 |
<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag> |
839 |
- <flag name="video">Enable video player support</flag> |
840 |
</use> |
841 |
</pkgmetadata> |