Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
Date: Mon, 31 Oct 2016 19:04:17
Message-Id: 1477940628.bab43b50276c5123416de84fdce994ad3a89a7cd.johu@gentoo
1 commit: bab43b50276c5123416de84fdce994ad3a89a7cd
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 31 19:03:48 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 31 19:03:48 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab43b50
7
8 media-gfx/digikam: Remove 5.1.0 (r1)
9
10 Package-Manager: portage-2.3.2
11
12 media-gfx/digikam/Manifest | 1 -
13 media-gfx/digikam/digikam-5.1.0-r1.ebuild | 172 ---------------------
14 .../files/digikam-5.1.0-albums-crashfix.patch | 35 -----
15 .../digikam/files/digikam-5.1.0-i386-gcc61.patch | 41 -----
16 .../files/digikam-5.1.0-memalloc-crash.patch | 95 ------------
17 5 files changed, 344 deletions(-)
18
19 diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
20 index 32c254b..f67754b 100644
21 --- a/media-gfx/digikam/Manifest
22 +++ b/media-gfx/digikam/Manifest
23 @@ -1,4 +1,3 @@
24 DIST digikam-4.14.0.tar.bz2 59805228 SHA256 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad SHA512 3029e9b67d9d055bd9aee0d6d01e87950702e026f9f44b513155946ba087ec58b300f945a035a418afae45365ed007d8db6a1a90ed1d391e5e0e4cb679168ccf WHIRLPOOL 35a3caedc9a4799f161b26b3b4df51da18a31be50a8a6da5b12a339a353755d73a47f103099087e3dc8e6926f65ae19638efea3585c86f72173a086056bf48ce
25 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
26 -DIST digikam-5.1.0.tar.xz 68259780 SHA256 47915e2e41ded21071309c0b387495bd66f6cc488acbfa647d2d8d57595127f1 SHA512 aa6b6b2a2f40dc6e1e90549d3b1cdcd2e886d16cfa4bb140093b67366b4aeaa3ebab96f0a28b1aeb969dca1fa64f8377bb8af44da4feeb4356e1f884357aaa86 WHIRLPOOL c09afdcc67fa0643f84f4b026227eb6f6c651369b1452e670d4c4451d967a78c968ec56a39f724d726f251d5fb51411214aa723860a23e936ce282a7285d89bc
27 DIST digikam-5.2.0.tar.xz 143583460 SHA256 cf243fc1518b5bb6e289573c76d89b5fdcc50be89f6312b276af3320763c9260 SHA512 483c2331f8f1a145ffd04bfdfe3f3e7e68f7ac4458b8b1698339dc89433d7820548fc461a5acf163997bab086b5faed6dd635af996f2503213a6207603603b4d WHIRLPOOL 9df54368afa4c31791102211a334568c9301082899fa7970b88dcec2047ded299c0a4dc92ccc1d6db3c2efc71be7e78349d6289b68414b6cfbe76bcc0c6fb930
28
29 diff --git a/media-gfx/digikam/digikam-5.1.0-r1.ebuild b/media-gfx/digikam/digikam-5.1.0-r1.ebuild
30 deleted file mode 100644
31 index 5527034..00000000
32 --- a/media-gfx/digikam/digikam-5.1.0-r1.ebuild
33 +++ /dev/null
34 @@ -1,172 +0,0 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
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 -CMAKE_MIN_VERSION="3.0"
47 -inherit kde5 toolchain-funcs
48 -
49 -DESCRIPTION="Digital photo management application"
50 -HOMEPAGE="https://www.digikam.org/"
51 -
52 -LICENSE="GPL-2"
53 -KEYWORDS="~amd64 ~x86"
54 -IUSE="addressbook gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X"
55 -
56 -if [[ ${KDE_BUILD_TYPE} != live ]]; then
57 -
58 - MY_PV=${PV/_/-}
59 - MY_P=${PN}-${MY_PV}
60 -
61 - SRC_BRANCH=stable
62 - [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
63 - SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
64 -
65 - S="${WORKDIR}/${MY_P}/core"
66 -
67 -fi
68 -
69 -COMMON_DEPEND="
70 - $(add_frameworks_dep kcompletion)
71 - $(add_frameworks_dep kconfig)
72 - $(add_frameworks_dep kconfigwidgets)
73 - $(add_frameworks_dep kcoreaddons)
74 - $(add_frameworks_dep kiconthemes)
75 - $(add_frameworks_dep ki18n)
76 - $(add_frameworks_dep kio)
77 - $(add_frameworks_dep kjobwidgets)
78 - $(add_frameworks_dep knotifications)
79 - $(add_frameworks_dep knotifyconfig)
80 - $(add_frameworks_dep kservice)
81 - $(add_frameworks_dep ktextwidgets)
82 - $(add_frameworks_dep kwidgetsaddons)
83 - $(add_frameworks_dep kwindowsystem)
84 - $(add_frameworks_dep kxmlgui)
85 - $(add_frameworks_dep solid)
86 - $(add_kdeapps_dep libkexiv2)
87 - $(add_qt_dep qtconcurrent)
88 - $(add_qt_dep qtdbus)
89 - $(add_qt_dep qtgui)
90 - $(add_qt_dep qtprintsupport)
91 - $(add_qt_dep qtscript)
92 - $(add_qt_dep qtsql 'mysql?')
93 - $(add_qt_dep qtwebkit)
94 - $(add_qt_dep qtwidgets)
95 - $(add_qt_dep qtxml)
96 - dev-libs/boost[threads]
97 - dev-libs/expat
98 - media-gfx/exiv2:=
99 - media-libs/lcms:2
100 - media-libs/liblqr
101 - >=media-libs/libpgf-6.12.27
102 - media-libs/libpng:0=
103 - media-libs/opencv:=[-qt4]
104 - || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 )
105 - media-libs/tiff:0
106 - virtual/jpeg:0
107 - addressbook? (
108 - $(add_kdeapps_dep akonadi-contacts)
109 - $(add_kdeapps_dep kcontacts)
110 - )
111 - gphoto2? ( media-libs/libgphoto2:= )
112 - jpeg2k? ( media-libs/jasper )
113 - kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
114 - lensfun? ( media-libs/lensfun )
115 - marble? (
116 - $(add_frameworks_dep kbookmarks)
117 - $(add_frameworks_dep kitemmodels)
118 - $(add_kdeapps_dep marble)
119 - )
120 - mysql? ( virtual/mysql )
121 - opengl? (
122 - $(add_qt_dep qtopengl)
123 - virtual/opengl
124 - )
125 - panorama? ( $(add_frameworks_dep threadweaver) )
126 - scanner? ( $(add_kdeapps_dep libksane) )
127 - semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
128 - video? ( $(add_qt_dep qtmultimedia 'widgets') )
129 - X? (
130 - $(add_qt_dep qtx11extras)
131 - x11-libs/libX11
132 - )
133 -"
134 -DEPEND="${COMMON_DEPEND}
135 - dev-cpp/eigen:3
136 - sys-devel/gettext
137 - panorama? (
138 - sys-devel/bison
139 - sys-devel/flex
140 - )
141 -"
142 -RDEPEND="${COMMON_DEPEND}
143 - media-plugins/kipi-plugins:5
144 - panorama? ( media-gfx/hugin )
145 - !media-gfx/digikam:4
146 -"
147 -
148 -RESTRICT=test
149 -# bug 366505
150 -
151 -PATCHES=(
152 - "${FILESDIR}/${P}-i386-gcc61.patch"
153 - "${FILESDIR}/${P}-albums-crashfix.patch"
154 - "${FILESDIR}/${P}-memalloc-crash.patch"
155 -)
156 -
157 -# FIXME: Unbundle libraw (libs/rawengine/libraw)
158 -pkg_pretend() {
159 - if use openmp ; then
160 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
161 - fi
162 - kde5_pkg_pretend
163 -}
164 -
165 -src_prepare() {
166 - if [[ ${KDE_BUILD_TYPE} != live ]]; then
167 - # prepare the translations
168 - mv "${WORKDIR}/${MY_P}/po" po || die
169 - find po -name "*.po" -and -not -name "digikam.po" -delete || die
170 - echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
171 - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
172 - echo "add_subdirectory( po )" >> CMakeLists.txt || die
173 -
174 - if use handbook; then
175 - # subdirs need to be preserved b/c relative paths...
176 - # doc-translated is, in fact, broken, and ignored
177 - mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
178 - echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
179 - fi
180 - fi
181 -
182 - kde5_src_prepare
183 -}
184 -
185 -src_configure() {
186 - # LQR = only allows to choose between bundled/external
187 - local mycmakeargs=(
188 - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
189 - -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
190 - -DENABLE_MYSQLSUPPORT=$(usex mysql)
191 - -DENABLE_MEDIAPLAYER=$(usex video)
192 - -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
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 X X11)
203 - )
204 -
205 - kde5_src_configure
206 -}
207
208 diff --git a/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch b/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch
209 deleted file mode 100644
210 index e22e8df..00000000
211 --- a/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch
212 +++ /dev/null
213 @@ -1,35 +0,0 @@
214 -From: Gilles Caulier <caulier.gilles@×××××.com>
215 -Date: Thu, 11 Aug 2016 11:41:08 +0000
216 -Subject: Fix CR #1368976
217 -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=7c628bac74afe24dbc4ca66b1bd5d513e46f6377
218 ----
219 -Fix CR #1368976
220 -BUGS: 366630
221 -FIXED-IN: 5.2.0
222 ----
223 -
224 -
225 ---- a/libs/album/albumtreeview.cpp
226 -+++ b/libs/album/albumtreeview.cpp
227 -@@ -1089,6 +1089,11 @@
228 -
229 - Album* const album = albumFilterModel()->albumForIndex(indexAt(event->pos()));
230 -
231 -+ if (!album)
232 -+ {
233 -+ return;
234 -+ }
235 -+
236 - if (album->isTrashAlbum())
237 - {
238 - // For the moment, disabling context menu for trash.
239 -@@ -1102,7 +1107,7 @@
240 - }
241 -
242 - // switch to the selected album if need
243 -- if (d->selectOnContextMenu && album)
244 -+ if (d->selectOnContextMenu)
245 - {
246 - setCurrentAlbums(QList<Album*>() << album);
247 - }
248 -
249
250 diff --git a/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch b/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch
251 deleted file mode 100644
252 index 710c147..00000000
253 --- a/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch
254 +++ /dev/null
255 @@ -1,41 +0,0 @@
256 -From: Gilles Caulier <caulier.gilles@×××××.com>
257 -Date: Tue, 09 Aug 2016 18:41:17 +0000
258 -Subject: apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1
259 -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=067a88d8c84a5149469961d54b1d5c93df6a3167
260 ----
261 -apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1
262 -BUGS: 366542
263 -FIXED-IN: 5.2.0
264 ----
265 -
266 -
267 ---- a/libs/rawengine/libraw/libraw/libraw_types.h
268 -+++ b/libs/rawengine/libraw/libraw/libraw_types.h
269 -@@ -612,10 +612,10 @@
270 - #elif defined(__INTEL__)
271 - #define LibRawBigEndian 0
272 -
273 --#elif defined(_M_IX86)
274 -+#elif defined(_M_IX86) || defined(__i386__)
275 - #define LibRawBigEndian 0
276 -
277 --#elif defined(_M_X64) || defined(__amd64__)
278 -+#elif defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
279 - #define LibRawBigEndian 0
280 -
281 - #elif defined(__LITTLE_ENDIAN__)
282 -@@ -625,6 +625,13 @@
283 - #define LibRawBigEndian 1
284 - #elif defined(_ARM_)
285 - #define LibRawBigEndian 0
286 -+
287 -+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
288 -+#define LibRawBigEndian 0
289 -+
290 -+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
291 -+#define LibRawBigEndian 1
292 -+
293 - #else
294 - #ifndef qXCodeRez
295 - #error Unable to figure out byte order.
296 -
297
298 diff --git a/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch b/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch
299 deleted file mode 100644
300 index 1a68f27..00000000
301 --- a/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch
302 +++ /dev/null
303 @@ -1,95 +0,0 @@
304 -From: Maik Qualmann <metzpinguin@×××××.com>
305 -Date: Thu, 11 Aug 2016 19:43:46 +0000
306 -Subject: fix check of maximum addressable memory on 64bits
307 -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=90f31456779f4aeb9ac06a385f398827fd35c985
308 ----
309 -fix check of maximum addressable memory on 64bits
310 -CCBUGS: 366621
311 ----
312 -
313 -
314 ---- a/libs/dimg/loaders/dimgloader.cpp
315 -+++ b/libs/dimg/loaders/dimgloader.cpp
316 -@@ -163,7 +163,7 @@
317 -
318 - qint64 DImgLoader::checkAllocation(qint64 fullSize)
319 - {
320 -- if (fullSize > std::numeric_limits<int>::max())
321 -+ if (fullSize > std::numeric_limits<size_t>::max())
322 - {
323 - qCWarning(DIGIKAM_DIMG_LOG) << "Cannot allocate buffer of size" << fullSize;
324 - return 0;
325 -
326 -From: Maik Qualmann <metzpinguin@×××××.com>
327 -Date: Fri, 12 Aug 2016 19:29:50 +0000
328 -Subject: fix crash by big memory allocation for DImg on 64bit
329 -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=65fa04ca097d4ff695690886a9f2be459b4279a9
330 ----
331 -fix crash by big memory allocation for DImg on 64bit
332 -CCBUGS: 366621
333 ----
334 -
335 -
336 ---- a/libs/dimg/dimg.cpp
337 -+++ b/libs/dimg/dimg.cpp
338 -@@ -211,7 +211,7 @@
339 -
340 - if (old->data)
341 - {
342 -- int size = allocateData();
343 -+ size_t size = allocateData();
344 - memcpy(m_priv->data, old->data, size);
345 - }
346 - }
347 -@@ -234,7 +234,7 @@
348 - }
349 - else if (copyData)
350 - {
351 -- int size = allocateData();
352 -+ size_t size = allocateData();
353 -
354 - if (data)
355 - {
356 -@@ -303,7 +303,7 @@
357 - setImageData(src->null, src->width, src->height, src->sixteenBit, src->alpha);
358 - }
359 -
360 --int DImg::allocateData()
361 -+size_t DImg::allocateData()
362 - {
363 - size_t size = m_priv->width * m_priv->height * (m_priv->sixteenBit ? 8 : 4);
364 - m_priv->data = DImgLoader::new_failureTolerant(size);
365 -@@ -2231,7 +2231,7 @@
366 -
367 - void DImg::resize(int w, int h)
368 - {
369 -- if (w <= 0 || h <= 0)
370 -+ if (isNull() || w <= 0 || h <= 0)
371 - {
372 - return;
373 - }
374 -
375 ---- a/libs/dimg/dimg.h
376 -+++ b/libs/dimg/dimg.h
377 -@@ -655,7 +655,7 @@
378 - void copyImageData(const Private* const src);
379 - void setImageData(bool null, uint width, uint height, bool sixteenBit, bool alpha);
380 - void setImageDimension(uint width, uint height);
381 -- int allocateData();
382 -+ size_t allocateData();
383 -
384 - static void bitBlt(const uchar* const src, uchar* const dest,
385 - int sx, int sy, int w, int h, int dx, int dy,
386 -
387 ---- a/libs/dimg/loaders/dimgloader.cpp
388 -+++ b/libs/dimg/loaders/dimgloader.cpp
389 -@@ -163,7 +163,7 @@
390 -
391 - qint64 DImgLoader::checkAllocation(qint64 fullSize)
392 - {
393 -- if (fullSize > std::numeric_limits<size_t>::max())
394 -+ if ((quint64)fullSize > std::numeric_limits<size_t>::max())
395 - {
396 - qCWarning(DIGIKAM_DIMG_LOG) << "Cannot allocate buffer of size" << fullSize;
397 - return 0;
398 -