[arch-commits] Commit in digikam/repos/extra-x86_64 (3 files)
Antonio Rojas
arojas at archlinux.org
Wed Nov 20 11:04:46 UTC 2019
Date: Wednesday, November 20, 2019 @ 11:04:46
Author: arojas
Revision: 369465
archrelease: copy trunk to extra-x86_64
Added:
digikam/repos/extra-x86_64/PKGBUILD
(from rev 369464, digikam/trunk/PKGBUILD)
Deleted:
digikam/repos/extra-x86_64/PKGBUILD
digikam/repos/extra-x86_64/initialize-imagemagick.patch
------------------------------+
PKGBUILD | 106 ++++++++++++++++++++---------------------
initialize-imagemagick.patch | 44 -----------------
2 files changed, 53 insertions(+), 97 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-20 11:04:20 UTC (rev 369464)
+++ PKGBUILD 2019-11-20 11:04:46 UTC (rev 369465)
@@ -1,53 +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=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/PKGBUILD (from rev 369464, digikam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-20 11:04:46 UTC (rev 369465)
@@ -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=3
+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::"https://cgit.kde.org/digikam.git/patch/?id=76ff65ae")
+sha256sums=('775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f'
+ 'SKIP'
+ 'c559882c0df2243c5a5baab3373bda4084fb9a1d54959770b8846fe026eaf360')
+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
+}
Deleted: initialize-imagemagick.patch
===================================================================
--- initialize-imagemagick.patch 2019-11-20 11:04:20 UTC (rev 369464)
+++ initialize-imagemagick.patch 2019-11-20 11:04:46 UTC (rev 369465)
@@ -1,44 +0,0 @@
-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