[arch-commits] Commit in digikam/repos/extra-x86_64 (3 files)
Antonio Rojas
arojas at archlinux.org
Wed Nov 6 22:35:06 UTC 2019
Date: Wednesday, November 6, 2019 @ 22:35:06
Author: arojas
Revision: 366894
archrelease: copy trunk to extra-x86_64
Added:
digikam/repos/extra-x86_64/PKGBUILD
(from rev 366893, digikam/trunk/PKGBUILD)
digikam/repos/extra-x86_64/initialize-imagemagick.patch
(from rev 366893, digikam/trunk/initialize-imagemagick.patch)
Deleted:
digikam/repos/extra-x86_64/PKGBUILD
------------------------------+
PKGBUILD | 101 +++++++++++++++++++++--------------------
initialize-imagemagick.patch | 44 +++++++++++++++++
2 files changed, 97 insertions(+), 48 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-06 22:34:44 UTC (rev 366893)
+++ PKGBUILD 2019-11-06 22:35:06 UTC (rev 366894)
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 320127 2018-03-24 09:48:28Z arojas $
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=digikam
-_pkgver=6.4.0
-pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=1
-pkgdesc="An advanced digital photo management application"
-arch=(x86_64)
-license=(GPL)
-url="https://www.digikam.org/"
-depends=(lensfun opencv akonadi-contacts knotifyconfig libksane kfilemetadata qtav marble-common threadweaver kcalendarcore
- qt5-xmlpatterns imagemagick glu)
-makedepends=(extra-cmake-modules doxygen eigen boost kdoctools libkvkontakte)
-optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)'
- 'libkvkontakte: VKontakte plugin'
- 'rawtherapee: RAW import' 'darktable: RAW import')
-source=("https://download.kde.org/stable/$pkgname/$_pkgver/$pkgname-$_pkgver.tar.xz"{,.sig})
-sha256sums=('6532c02d51a9861f101092dfde92f8de478b1554d3449bbf3a11e50d32d39460'
- 'SKIP')
-validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
-
- cmake ../$pkgname-$_pkgver \
- -DBUILD_TESTING=OFF \
- -DENABLE_KFILEMETADATASUPPORT=ON \
- -DENABLE_MEDIAPLAYER=ON \
- -DENABLE_AKONADICONTACTSUPPORT=ON \
- -DENABLE_MYSQLSUPPORT=ON \
- -DENABLE_APPSTYLES=ON \
- -DENABLE_QWEBENGINE=ON \
- -DOpenGL_GL_PREFERENCE=GLVND
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: digikam/repos/extra-x86_64/PKGBUILD (from rev 366893, digikam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-06 22:35:06 UTC (rev 366894)
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 320127 2018-03-24 09:48:28Z arojas $
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=digikam
+_pkgver=6.4.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=2
+pkgdesc="An advanced digital photo management application"
+arch=(x86_64)
+license=(GPL)
+url="https://www.digikam.org/"
+depends=(lensfun opencv akonadi-contacts knotifyconfig libksane kfilemetadata qtav marble-common threadweaver kcalendarcore
+ qt5-xmlpatterns imagemagick glu)
+makedepends=(extra-cmake-modules doxygen eigen boost kdoctools libkvkontakte)
+optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)'
+ 'libkvkontakte: VKontakte plugin'
+ 'rawtherapee: RAW import' 'darktable: RAW import')
+source=("https://download.kde.org/stable/$pkgname/$_pkgver/$pkgname-$_pkgver.tar.xz"{,.sig}
+ initialize-imagemagick.patch)
+sha256sums=('6532c02d51a9861f101092dfde92f8de478b1554d3449bbf3a11e50d32d39460'
+ 'SKIP'
+ 'bc1dc65eb62a0e339698980ee438a17efa39f293419e4134948c7ee8f6733dad')
+validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ patch -p1 -i ../initialize-imagemagick.patch # Properly initialize exceptions in imagemagick
+}
+
+build() {
+ cd build
+
+ cmake ../$pkgname-$_pkgver \
+ -DBUILD_TESTING=OFF \
+ -DENABLE_KFILEMETADATASUPPORT=ON \
+ -DENABLE_MEDIAPLAYER=ON \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_APPSTYLES=ON \
+ -DENABLE_QWEBENGINE=ON \
+ -DOpenGL_GL_PREFERENCE=GLVND
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: digikam/repos/extra-x86_64/initialize-imagemagick.patch (from rev 366893, digikam/trunk/initialize-imagemagick.patch)
===================================================================
--- initialize-imagemagick.patch (rev 0)
+++ initialize-imagemagick.patch 2019-11-06 22:35:06 UTC (rev 366894)
@@ -0,0 +1,44 @@
+diff --git a/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp b/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
+index 1858b4d27b..20ef01be73 100644
+--- a/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
++++ b/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
+@@ -125,7 +125,7 @@ QMap<QString, QString> DImgImageMagickPlugin::extraAboutData() const
+ QString mimes = typeMimes();
+
+ QMap<QString, QString> map;
+- ExceptionInfo ex;
++ ExceptionInfo ex = *AcquireExceptionInfo();
+ size_t n = 0;
+ const MagickInfo** inflst = GetMagickInfoList("*", &n, &ex);
+
+@@ -219,7 +219,7 @@ int DImgImageMagickPlugin::canRead(const QFileInfo& fileInfo, bool magic) const
+ int DImgImageMagickPlugin::canWrite(const QString& format) const
+ {
+ QStringList formats;
+- ExceptionInfo ex;
++ ExceptionInfo ex = *AcquireExceptionInfo();
+ size_t n = 0;
+ const MagickInfo** inflst = GetMagickInfoList("*", &n, &ex);
+
+@@ -266,7 +266,7 @@ DImgLoader* DImgImageMagickPlugin::loader(DImg* const image, const DRawDecoding&
+ QStringList DImgImageMagickPlugin::decoderFormats() const
+ {
+ QStringList formats;
+- ExceptionInfo ex;
++ ExceptionInfo ex = *AcquireExceptionInfo();
+ size_t n = 0;
+ const MagickInfo** inflst = GetMagickInfoList("*", &n, &ex);
+
+diff --git a/core/tests/dimg/magickloader.cpp b/core/tests/dimg/magickloader.cpp
+index 2526779047..73f2abec0e 100644
+--- a/core/tests/dimg/magickloader.cpp
++++ b/core/tests/dimg/magickloader.cpp
+@@ -127,7 +127,7 @@ int main(int argc, char** argv)
+ {
+ MagickCoreGenesis((char*)NULL, MagickFalse);
+
+- ExceptionInfo ex;
++ ExceptionInfo ex = *AcquireExceptionInfo();
+ size_t n = 0;
+ const MagickInfo** inflst = GetMagickInfoList("*", &n, &ex);
+
More information about the arch-commits
mailing list