From 9ae6c063e1046b5ec8f279b2107fa961f4520068 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 11 Nov 2019 21:38:31 +0100
Subject: KDE: update digikam

---
 kde/cmake/digikam                            |  3 ++-
 kde/patch/digikam.patch                      |  3 +++
 kde/patch/digikam/digikam_imagemagick7.patch | 40 ++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 kde/patch/digikam/digikam_imagemagick7.patch

diff --git a/kde/cmake/digikam b/kde/cmake/digikam
index 23af279..3f22318 100644
--- a/kde/cmake/digikam
+++ b/kde/cmake/digikam
@@ -29,6 +29,7 @@ cd build
     -DENABLE_MEDIAPLAYER=ON \
     -DENABLE_MYSQLSUPPORT=ON \
     -DENABLE_OPENCV3=ON \
-    -DDIGIKAMSC_COMPILE_DOC=OFF \
+    -DENABLE_QWEBENGINE=ON \
+    -DOpenGL_GL_PREFERENCE=GLVND \
     ..
 
diff --git a/kde/patch/digikam.patch b/kde/patch/digikam.patch
index ec056c9..8f50ec2 100644
--- a/kde/patch/digikam.patch
+++ b/kde/patch/digikam.patch
@@ -7,3 +7,6 @@
 #  cat $CWD/patch/digikam/digikam_databasemodel.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 #cd -
 
+# Fix crashes with imagemagick 7 (fixed post digikam 6.4.0):
+cat $CWD/patch/digikam/digikam_imagemagick7.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/digikam/digikam_imagemagick7.patch b/kde/patch/digikam/digikam_imagemagick7.patch
new file mode 100644
index 0000000..04a7752
--- /dev/null
+++ b/kde/patch/digikam/digikam_imagemagick7.patch
@@ -0,0 +1,40 @@
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Thu, 7 Nov 2019 09:25:02 +0100
+Subject: Properly initialize ExceptionInfo in libMagick
+
+Otherwise it will crash if some plugins can't be loaded.
+
+diff --git a/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp b/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
+index 1858b4d..20ef01b 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);
+ 
+-- 
+cgit v1.1
+
-- 
cgit v1.2.3