Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/digikam/, media-gfx/digikam/files/
Date: Tue, 03 Dec 2019 05:04:18
Message-Id: 1575349387.9e321ebdb7c1d89da49707236fd2b1b3d856bd9b.asturm@gentoo
1 commit: 9e321ebdb7c1d89da49707236fd2b1b3d856bd9b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 2 17:15:34 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 3 05:03:07 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e321ebd
7
8 media-gfx/digikam: Drop 6.2.0
9
10 Package-Manager: Portage-2.3.80, Repoman-2.3.19
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-gfx/digikam/Manifest | 1 -
14 media-gfx/digikam/digikam-6.2.0.ebuild | 151 ---------------------
15 media-gfx/digikam/files/digikam-6.2.0-cmake.patch | 66 ---------
16 .../files/digikam-6.2.0-googlephoto-upload.patch | 25 ----
17 .../files/digikam-6.2.0-imagemagick-7.0.8.60.patch | 14 --
18 5 files changed, 257 deletions(-)
19
20 diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
21 index 456779d4ba2..e3a64e0cf2b 100644
22 --- a/media-gfx/digikam/Manifest
23 +++ b/media-gfx/digikam/Manifest
24 @@ -1,2 +1 @@
25 -DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
26 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
27
28 diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild
29 deleted file mode 100644
30 index bb0556ae05e..00000000000
31 --- a/media-gfx/digikam/digikam-6.2.0.ebuild
32 +++ /dev/null
33 @@ -1,151 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -CMAKE_MIN_VERSION=3.14.3
40 -inherit kde5 toolchain-funcs
41 -
42 -if [[ ${KDE_BUILD_TYPE} != live ]]; then
43 - MY_PV=${PV/_/-}
44 - MY_P=${PN}-${MY_PV}
45 - SRC_BRANCH=stable
46 - [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
47 - SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
48 - KEYWORDS="amd64 x86"
49 - S="${WORKDIR}/${MY_P}"
50 -fi
51 -
52 -DESCRIPTION="Digital photo management application"
53 -HOMEPAGE="https://www.digikam.org/"
54 -
55 -LICENSE="GPL-2"
56 -IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
57 -
58 -BDEPEND="
59 - sys-devel/gettext
60 - panorama? (
61 - sys-devel/bison
62 - sys-devel/flex
63 - )
64 -"
65 -COMMON_DEPEND="
66 - $(add_frameworks_dep kconfig)
67 - $(add_frameworks_dep kconfigwidgets)
68 - $(add_frameworks_dep kcoreaddons)
69 - $(add_frameworks_dep ki18n)
70 - $(add_frameworks_dep kiconthemes)
71 - $(add_frameworks_dep kio)
72 - $(add_frameworks_dep knotifications)
73 - $(add_frameworks_dep knotifyconfig)
74 - $(add_frameworks_dep kservice)
75 - $(add_frameworks_dep kwidgetsaddons)
76 - $(add_frameworks_dep kwindowsystem)
77 - $(add_frameworks_dep kxmlgui)
78 - $(add_frameworks_dep solid)
79 - $(add_qt_dep qtconcurrent)
80 - $(add_qt_dep qtdbus)
81 - $(add_qt_dep qtgui '-gles2')
82 - $(add_qt_dep qtnetwork)
83 - $(add_qt_dep qtprintsupport)
84 - $(add_qt_dep qtsql 'mysql?')
85 - $(add_qt_dep qtwidgets)
86 - $(add_qt_dep qtxml)
87 - $(add_qt_dep qtxmlpatterns)
88 - dev-libs/expat
89 - >=media-gfx/exiv2-0.26:=
90 - media-libs/lcms:2
91 - media-libs/liblqr
92 - media-libs/libpng:0=
93 - >=media-libs/opencv-3.1.0:=
94 - media-libs/tiff:0
95 - virtual/jpeg:0
96 - addressbook? (
97 - $(add_kdeapps_dep akonadi-contacts)
98 - $(add_kdeapps_dep kcontacts)
99 - )
100 - calendar? ( $(add_kdeapps_dep kcalcore) )
101 - dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] )
102 - gphoto2? ( media-libs/libgphoto2:= )
103 - imagemagick? ( media-gfx/imagemagick:= )
104 - lensfun? ( media-libs/lensfun )
105 - marble? (
106 - $(add_frameworks_dep kbookmarks)
107 - $(add_kdeapps_dep marble)
108 - $(add_qt_dep qtconcurrent)
109 - )
110 - mediaplayer? (
111 - media-libs/qtav[opengl]
112 - !libav? ( media-video/ffmpeg:= )
113 - libav? ( media-video/libav:= )
114 - )
115 - opengl? (
116 - $(add_qt_dep qtopengl)
117 - virtual/opengl
118 - )
119 - panorama? ( $(add_frameworks_dep threadweaver) )
120 - scanner? ( $(add_kdeapps_dep libksane) )
121 - semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
122 - vkontakte? ( net-libs/libkvkontakte:5 )
123 - !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
124 - webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
125 - X? (
126 - $(add_qt_dep qtx11extras)
127 - x11-libs/libX11
128 - )
129 -"
130 -DEPEND="${COMMON_DEPEND}
131 - dev-cpp/eigen:3
132 - dev-libs/boost[threads]
133 -"
134 -RDEPEND="${COMMON_DEPEND}
135 - mysql? ( virtual/mysql[server] )
136 - panorama? ( media-gfx/hugin )
137 -"
138 -
139 -RESTRICT+=" test"
140 -# bug 366505
141 -
142 -PATCHES=(
143 - "${FILESDIR}/${P}-googlephoto-upload.patch"
144 - "${FILESDIR}/${P}-cmake.patch"
145 - "${FILESDIR}/${P}-imagemagick-7.0.8.60.patch"
146 -)
147 -
148 -pkg_pretend() {
149 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
150 - kde5_pkg_pretend
151 -}
152 -
153 -pkg_setup() {
154 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
155 - kde5_pkg_setup
156 -}
157 -
158 -# FIXME: Unbundle libraw (libs/rawengine/libraw)
159 -src_configure() {
160 - local mycmakeargs=(
161 - -DENABLE_APPSTYLES=ON
162 - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
163 - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
164 - $(cmake-utils_use_find_package calendar KF5CalendarCore)
165 - -DENABLE_FACESENGINE_DNN=$(usex dnn)
166 - $(cmake-utils_use_find_package gphoto2 Gphoto2)
167 - $(cmake-utils_use_find_package imagemagick ImageMagick)
168 - $(cmake-utils_use_find_package lensfun LensFun)
169 - $(cmake-utils_use_find_package marble Marble)
170 - -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
171 - $(cmake-utils_use_find_package mediaplayer QtAV)
172 - -DENABLE_MYSQLSUPPORT=$(usex mysql)
173 - -DENABLE_INTERNALMYSQL=$(usex mysql)
174 - $(cmake-utils_use_find_package opengl OpenGL)
175 - $(cmake-utils_use_find_package panorama KF5ThreadWeaver)
176 - $(cmake-utils_use_find_package scanner KF5Sane)
177 - $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
178 - $(cmake-utils_use_find_package vkontakte KF5Vkontakte)
179 - -DENABLE_QWEBENGINE=$(usex !webkit)
180 - $(cmake-utils_use_find_package X X11)
181 - )
182 -
183 - kde5_src_configure
184 -}
185
186 diff --git a/media-gfx/digikam/files/digikam-6.2.0-cmake.patch b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
187 deleted file mode 100644
188 index f25dd6306af..00000000000
189 --- a/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
190 +++ /dev/null
191 @@ -1,66 +0,0 @@
192 -From d915828e4db2e7b40e799abc01a6fdb683d2b921 Mon Sep 17 00:00:00 2001
193 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
194 -Date: Sun, 17 Feb 2019 23:51:03 +0100
195 -Subject: [PATCH] Un-break optional Qt5 detection
196 -
197 ----
198 - core/CMakeLists.txt | 26 ++++++++++----------------
199 - 1 file changed, 10 insertions(+), 16 deletions(-)
200 -
201 -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
202 -index c04ee1a9c3..c3762437e6 100644
203 ---- a/core/CMakeLists.txt
204 -+++ b/core/CMakeLists.txt
205 -@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
206 - )
207 -
208 - if(ENABLE_QWEBENGINE)
209 -- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
210 -+ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
211 - else()
212 -- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
213 -+ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
214 - endif()
215 -
216 --find_package(Qt5 ${QT_MIN_VERSION}
217 -- OPTIONAL_COMPONENTS
218 -- DBus
219 -- OpenGL
220 --)
221 -+find_package(Qt5DBus ${QT_MIN_VERSION})
222 -+
223 -+find_package(Qt5OpenGL ${QT_MIN_VERSION})
224 -
225 - if(ENABLE_DBUS)
226 - if(NOT Qt5DBus_FOUND)
227 -@@ -156,14 +154,10 @@ endif()
228 - # Dependencies For unit tests and CLI test tools
229 -
230 - if(BUILD_TESTING)
231 -- find_package(Qt5 ${QT_MIN_VERSION}
232 -- NO_MODULE COMPONENTS
233 -- Test
234 -- )
235 -- find_package(Qt5 ${QT_MIN_VERSION}
236 -- OPTIONAL_COMPONENTS
237 -- Qml WebView # Optional, for 'sialis' O2 library test tool.
238 -- )
239 -+ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
240 -+ # Optional, for 'sialis' O2 library test tool.
241 -+ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
242 -+ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
243 - endif()
244 -
245 - find_package(KF5 ${KF5_MIN_VERSION}
246 -@@ -335,7 +329,7 @@ endif()
247 - find_package(X11)
248 -
249 - if(X11_FOUND)
250 -- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
251 -+ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
252 - set(HAVE_X11 TRUE)
253 - else()
254 - set(HAVE_X11 FALSE)
255 ---
256 -2.22.0
257 -
258
259 diff --git a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
260 deleted file mode 100644
261 index 1c182ed7c9e..00000000000
262 --- a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
263 +++ /dev/null
264 @@ -1,25 +0,0 @@
265 -From 19490eb10de0444219e8b525bb75513c046d184d Mon Sep 17 00:00:00 2001
266 -From: Maik Qualmann <metzpinguin@×××××.com>
267 -Date: Wed, 7 Aug 2019 19:52:13 +0200
268 -Subject: [PATCH] fix upload error to Google Photo when description contains
269 - quotes BUGS: 410692 FIXED-IN: 6.3.0
270 -
271 ----
272 - core/dplugins/generic/webservices/google/gswindow.cpp | 1 +
273 - 1 files changed, 1 insertions(+)
274 -
275 -diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp
276 -index a03e683e65..a80eac5cdb 100644
277 ---- a/core/dplugins/generic/webservices/google/gswindow.cpp
278 -+++ b/core/dplugins/generic/webservices/google/gswindow.cpp
279 -@@ -594,6 +594,7 @@ void GSWindow::slotStartTransfer()
280 - QStringList descriptions = QStringList() << info.title() << info.comment();
281 - descriptions.removeAll(QLatin1String(""));
282 - temp.description = descriptions.join(QLatin1String("\n\n"));
283 -+ temp.description.replace(QLatin1Char('"'), QLatin1String("\\\""));
284 - break;
285 - }
286 -
287 ---
288 -2.22.0
289 -
290
291 diff --git a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
292 deleted file mode 100644
293 index 264da2c34f2..00000000000
294 --- a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
295 +++ /dev/null
296 @@ -1,14 +0,0 @@
297 ---- a/core/tests/dimg/magickloader.cpp
298 -+++ a/core/tests/dimg/magickloader.cpp
299 -@@ -139,7 +139,11 @@ int main(int argc, char** argv)
300 - if (inf->encoder) mode.append(QLatin1Char('W'));
301 - else mode.append(QLatin1Char('-'));
302 -
303 -+#if( (MagickLibVersion >= 0x708) && defined(magick_module) ) /* defined since 7.0.8.60 */
304 -+ QString module = QLatin1String(inf->magick_module);
305 -+#else
306 - QString module = QLatin1String(inf->module);
307 -+#endif
308 - QString mime = QMimeDatabase().mimeTypeForFile(QFileInfo(QString::fromLatin1("foo.%1").arg(module))).name();
309 -
310 - if (module != QLatin1String("DNG") &&
311 \ No newline at end of file
Report Message
Find on MARC Find on Google Groups