[arch-commits] Commit in digikam/trunk (PKGBUILD initialize-imagemagick.patch)

[Antonio Rojas]

    Date: Thursday, November 7, 2019 @ 16:41:21
  Author: arojas
Revision: 367134

Patch upstreamed

Modified:
  digikam/trunk/PKGBUILD
Deleted:
  digikam/trunk/initialize-imagemagick.patch

------------------------------+
 PKGBUILD                     |    4 +--
 initialize-imagemagick.patch |   44 -----------------------------------------
 2 files changed, 2 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-07 16:29:40 UTC (rev 367133)
+++ PKGBUILD	2019-11-07 16:41:21 UTC (rev 367134)
@@ -19,10 +19,10 @@
             '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)
+         initialize-imagemagick.patch::"https://cgit.kde.org/digikam.git/patch/?id=76ff65ae")
 sha256sums=('6532c02d51a9861f101092dfde92f8de478b1554d3449bbf3a11e50d32d39460'
             'SKIP'
-            'bc1dc65eb62a0e339698980ee438a17efa39f293419e4134948c7ee8f6733dad')
+            'c559882c0df2243c5a5baab3373bda4084fb9a1d54959770b8846fe026eaf360')
 validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
 
 prepare() {

Deleted: initialize-imagemagick.patch
===================================================================
--- initialize-imagemagick.patch	2019-11-07 16:29:40 UTC (rev 367133)
+++ initialize-imagemagick.patch	2019-11-07 16:41:21 UTC (rev 367134)
@@ -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);
-