1 |
commit: 89485e67a4051277812b8bc06ca80961b24004f4 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 12 15:14:07 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 12 15:14:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89485e67 |
7 |
|
8 |
media-gfx/digikam: Drop 6.3.0-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-gfx/digikam/Manifest | 1 - |
14 |
media-gfx/digikam/digikam-6.3.0-r1.ebuild | 157 --------------------- |
15 |
.../digikam-6.3.0-googlephoto-import-crash.patch | 85 ----------- |
16 |
3 files changed, 243 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest |
19 |
index 65079a279da..06c96471be9 100644 |
20 |
--- a/media-gfx/digikam/Manifest |
21 |
+++ b/media-gfx/digikam/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce |
24 |
DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 |
25 |
|
26 |
diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 7a9327fbcb3..00000000000 |
29 |
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,157 +0,0 @@ |
32 |
-# Copyright 1999-2019 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-inherit kde5 toolchain-funcs |
38 |
- |
39 |
-if [[ ${KDE_BUILD_TYPE} != live ]]; then |
40 |
- MY_PV=${PV/_/-} |
41 |
- MY_P=${PN}-${MY_PV} |
42 |
- SRC_BRANCH=stable |
43 |
- [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable |
44 |
- SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz" |
45 |
- KEYWORDS="amd64 x86" |
46 |
- S="${WORKDIR}/${MY_P}" |
47 |
-fi |
48 |
- |
49 |
-DESCRIPTION="Digital photo management application" |
50 |
-HOMEPAGE="https://www.digikam.org/" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" |
54 |
- |
55 |
-BDEPEND=" |
56 |
- >=dev-util/cmake-3.14.3 |
57 |
- sys-devel/gettext |
58 |
- panorama? ( |
59 |
- sys-devel/bison |
60 |
- sys-devel/flex |
61 |
- ) |
62 |
-" |
63 |
-COMMON_DEPEND=" |
64 |
- $(add_frameworks_dep kconfig) |
65 |
- $(add_frameworks_dep kconfigwidgets) |
66 |
- $(add_frameworks_dep kcoreaddons) |
67 |
- $(add_frameworks_dep ki18n) |
68 |
- $(add_frameworks_dep kiconthemes) |
69 |
- $(add_frameworks_dep kio) |
70 |
- $(add_frameworks_dep knotifications) |
71 |
- $(add_frameworks_dep knotifyconfig) |
72 |
- $(add_frameworks_dep kservice) |
73 |
- $(add_frameworks_dep kwidgetsaddons) |
74 |
- $(add_frameworks_dep kwindowsystem) |
75 |
- $(add_frameworks_dep kxmlgui) |
76 |
- $(add_frameworks_dep solid) |
77 |
- $(add_qt_dep qtconcurrent) |
78 |
- $(add_qt_dep qtdbus) |
79 |
- $(add_qt_dep qtgui '-gles2') |
80 |
- $(add_qt_dep qtnetwork) |
81 |
- $(add_qt_dep qtprintsupport) |
82 |
- $(add_qt_dep qtsql 'mysql?') |
83 |
- $(add_qt_dep qtwidgets) |
84 |
- $(add_qt_dep qtxml) |
85 |
- $(add_qt_dep qtxmlpatterns) |
86 |
- dev-libs/expat |
87 |
- >=media-gfx/exiv2-0.26:= |
88 |
- media-libs/lcms:2 |
89 |
- media-libs/liblqr |
90 |
- media-libs/libpng:0= |
91 |
- >=media-libs/opencv-3.1.0:= |
92 |
- media-libs/tiff:0 |
93 |
- virtual/jpeg:0 |
94 |
- addressbook? ( |
95 |
- || ( |
96 |
- $(add_frameworks_dep kcontacts) |
97 |
- $(add_kdeapps_dep kcontacts) |
98 |
- ) |
99 |
- $(add_kdeapps_dep akonadi-contacts) |
100 |
- ) |
101 |
- calendar? ( || ( |
102 |
- $(add_frameworks_dep kcalendarcore) |
103 |
- $(add_kdeapps_dep kcalcore) |
104 |
- ) ) |
105 |
- dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] ) |
106 |
- gphoto2? ( media-libs/libgphoto2:= ) |
107 |
- imagemagick? ( media-gfx/imagemagick:= ) |
108 |
- lensfun? ( media-libs/lensfun ) |
109 |
- marble? ( |
110 |
- $(add_frameworks_dep kbookmarks) |
111 |
- $(add_kdeapps_dep marble) |
112 |
- $(add_qt_dep qtconcurrent) |
113 |
- ) |
114 |
- mediaplayer? ( |
115 |
- media-libs/qtav[opengl] |
116 |
- !libav? ( media-video/ffmpeg:= ) |
117 |
- libav? ( media-video/libav:= ) |
118 |
- ) |
119 |
- opengl? ( |
120 |
- $(add_qt_dep qtopengl) |
121 |
- virtual/opengl |
122 |
- ) |
123 |
- panorama? ( $(add_frameworks_dep threadweaver) ) |
124 |
- scanner? ( $(add_kdeapps_dep libksane) ) |
125 |
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) |
126 |
- vkontakte? ( net-libs/libkvkontakte:5 ) |
127 |
- !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) |
128 |
- webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) |
129 |
- X? ( |
130 |
- $(add_qt_dep qtx11extras) |
131 |
- x11-libs/libX11 |
132 |
- ) |
133 |
-" |
134 |
-DEPEND="${COMMON_DEPEND} |
135 |
- dev-cpp/eigen:3 |
136 |
- dev-libs/boost[threads] |
137 |
-" |
138 |
-RDEPEND="${COMMON_DEPEND} |
139 |
- mysql? ( virtual/mysql[server] ) |
140 |
- panorama? ( media-gfx/hugin ) |
141 |
-" |
142 |
- |
143 |
-RESTRICT+=" test" |
144 |
-# bug 366505 |
145 |
- |
146 |
-PATCHES=( |
147 |
- "${FILESDIR}/${P}-cmake.patch" |
148 |
- "${FILESDIR}/${P}-googlephoto-import-crash.patch" |
149 |
-) |
150 |
- |
151 |
-pkg_pretend() { |
152 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
153 |
- kde5_pkg_pretend |
154 |
-} |
155 |
- |
156 |
-pkg_setup() { |
157 |
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
158 |
- kde5_pkg_setup |
159 |
-} |
160 |
- |
161 |
-# FIXME: Unbundle libraw (libs/rawengine/libraw) |
162 |
-src_configure() { |
163 |
- local mycmakeargs=( |
164 |
- -DBUILD_TESTING=OFF # bug #698192 |
165 |
- -DENABLE_APPSTYLES=ON |
166 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON |
167 |
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) |
168 |
- $(cmake_use_find_package calendar KF5CalendarCore) |
169 |
- -DENABLE_FACESENGINE_DNN=$(usex dnn) |
170 |
- $(cmake_use_find_package gphoto2 Gphoto2) |
171 |
- $(cmake_use_find_package imagemagick ImageMagick) |
172 |
- $(cmake_use_find_package lensfun LensFun) |
173 |
- $(cmake_use_find_package marble Marble) |
174 |
- -DENABLE_MEDIAPLAYER=$(usex mediaplayer) |
175 |
- $(cmake_use_find_package mediaplayer QtAV) |
176 |
- -DENABLE_MYSQLSUPPORT=$(usex mysql) |
177 |
- -DENABLE_INTERNALMYSQL=$(usex mysql) |
178 |
- $(cmake_use_find_package opengl OpenGL) |
179 |
- $(cmake_use_find_package panorama KF5ThreadWeaver) |
180 |
- $(cmake_use_find_package scanner KF5Sane) |
181 |
- $(cmake_use_find_package semantic-desktop KF5FileMetaData) |
182 |
- $(cmake_use_find_package vkontakte KF5Vkontakte) |
183 |
- -DENABLE_QWEBENGINE=$(usex !webkit) |
184 |
- $(cmake_use_find_package X X11) |
185 |
- ) |
186 |
- |
187 |
- kde5_src_configure |
188 |
-} |
189 |
|
190 |
diff --git a/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch b/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch |
191 |
deleted file mode 100644 |
192 |
index 7a8a7e533a1..00000000000 |
193 |
--- a/media-gfx/digikam/files/digikam-6.3.0-googlephoto-import-crash.patch |
194 |
+++ /dev/null |
195 |
@@ -1,85 +0,0 @@ |
196 |
-From ea22af510d62c85224ed430611db8818f97ecc69 Mon Sep 17 00:00:00 2001 |
197 |
-From: Maik Qualmann <metzpinguin@×××××.com> |
198 |
-Date: Wed, 4 Sep 2019 20:59:20 +0200 |
199 |
-Subject: fix crash when close/reopen Google import window BUGS: 411587 |
200 |
- FIXED-IN: 6.3.0 |
201 |
- |
202 |
---- |
203 |
- .../generic/webservices/google/gphoto/gptalker.cpp | 3 ++- |
204 |
- core/dplugins/generic/webservices/google/gswindow.cpp | 18 ++++++++++++++---- |
205 |
- 3 files changed, 17 insertions(+), 5 deletions(-) |
206 |
- |
207 |
-diff --git a/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp b/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp |
208 |
-index 1cddfbd..b5e68ef 100644 |
209 |
---- a/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp |
210 |
-+++ b/core/dplugins/generic/webservices/google/gphoto/gptalker.cpp |
211 |
-@@ -160,6 +160,7 @@ GPTalker::~GPTalker() |
212 |
- if (m_reply) |
213 |
- { |
214 |
- m_reply->abort(); |
215 |
-+ m_reply = nullptr; |
216 |
- } |
217 |
- |
218 |
- WSToolUtils::removeTemporaryDir("google"); |
219 |
-@@ -637,7 +638,7 @@ void GPTalker::slotFinished(QNetworkReply* reply) |
220 |
- { |
221 |
- emit signalAddPhotoDone(reply->error(), reply->errorString()); |
222 |
- } |
223 |
-- else |
224 |
-+ else if (reply->error() != QNetworkReply::OperationCanceledError) |
225 |
- { |
226 |
- QMessageBox::critical(QApplication::activeWindow(), |
227 |
- i18n("Error"), reply->errorString()); |
228 |
-diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp |
229 |
-index 424aee2..d5af448 100644 |
230 |
---- a/core/dplugins/generic/webservices/google/gswindow.cpp |
231 |
-+++ b/core/dplugins/generic/webservices/google/gswindow.cpp |
232 |
-@@ -266,11 +266,10 @@ GSWindow::GSWindow(DInfoInterface* const iface, |
233 |
- |
234 |
- GSWindow::~GSWindow() |
235 |
- { |
236 |
-- delete d->widget; |
237 |
-- delete d->albumDlg; |
238 |
-- delete d->gphotoAlbumDlg; |
239 |
-- delete d->talker; |
240 |
-+ d->transferQueue.clear(); |
241 |
-+ |
242 |
- delete d->gphotoTalker; |
243 |
-+ delete d->talker; |
244 |
- delete d; |
245 |
- } |
246 |
- |
247 |
-@@ -851,6 +850,11 @@ void GSWindow::downloadNextPhoto() |
248 |
- void GSWindow::slotGetPhotoDone(int errCode, const QString& errMsg, |
249 |
- const QByteArray& photoData, const QString& fileName) |
250 |
- { |
251 |
-+ if (d->transferQueue.isEmpty()) |
252 |
-+ { |
253 |
-+ return; |
254 |
-+ } |
255 |
-+ |
256 |
- GSPhoto item = d->transferQueue.first().second; |
257 |
- |
258 |
- /** |
259 |
-@@ -982,6 +986,11 @@ void GSWindow::slotGetPhotoDone(int errCode, const QString& errMsg, |
260 |
- |
261 |
- void GSWindow::slotAddPhotoDone(int err, const QString& msg) |
262 |
- { |
263 |
-+ if (d->transferQueue.isEmpty()) |
264 |
-+ { |
265 |
-+ return; |
266 |
-+ } |
267 |
-+ |
268 |
- if (err == 0) |
269 |
- { |
270 |
- d->widget->imagesList()->processed(d->transferQueue.first().first,false); |
271 |
-@@ -1245,6 +1254,7 @@ void GSWindow::buttonStateChange(bool state) |
272 |
- void GSWindow::slotFinished() |
273 |
- { |
274 |
- writeSettings(); |
275 |
-+ d->transferQueue.clear(); |
276 |
- d->widget->imagesList()->listView()->clear(); |
277 |
- } |
278 |
- |
279 |
--- |
280 |
-cgit v1.1 |