Merge pull request #8197 from suvari/master

digikam: fix deps..

desktop/kde/graphics/digikam/actions.py

@@ -11,18 +11,14 @@ from pisi.actionsapi import cmaketools
 #shelltools.export("HOME", get.workDIR())
 
 def setup():
-    kde5.configure("-DFORCED_UNBUNDLE=ON \
+    kde5.configure("-DBUILD_TESTING=OFF \
-                    -DWITH_LQR=ON \
+                    -DENABLE_KFILEMETADATASUPPORT=ON \
-                    -DWITH_LENSFUN=ON \
+                    -DENABLE_MEDIAPLAYER=ON \
-                    -DWITH_MarbleWidget=ON \
+                    -DENABLE_AKONADICONTACTSUPPORT=ON \
-                    -DENABLE_LCMS2=ON \
+                    -DENABLE_MYSQLSUPPORT=ON \
-                    -DDIGIKAMSC_COMPILE_KIPIPLUGINS=ON \
+                    -DENABLE_APPSTYLES=ON \
-                    -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \
+                    -DENABLE_QWEBENGINE=ON \
-                    -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \
+                    -DOpenGL_GL_PREFERENCE=GLVND")
-                    -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \
-                    -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON \
-                    -DDIGIKAMSC_COMPILE_LIBKFACE=ON \
-                    -DDIGIKAMSC_COMPILE_LIBKIPI=ON ")
 
 def build():
     kde5.make()

desktop/kde/graphics/digikam/files/initialize-imagemagick.patch

@@ -0,0 +1,60 @@
+From 76ff65aec63be4036955e89bf7136a5e9411e6b1 Mon Sep 17 00:00:00 2001
+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.
+
+Differential Revision: https://phabricator.kde.org/D25181
+---
+ core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp | 6 +++---
+ core/tests/dimg/magickloader.cpp                         | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+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);
+ 
+diff --git a/core/tests/dimg/magickloader.cpp b/core/tests/dimg/magickloader.cpp
+index 2526779..73f2abe 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);
+ 
+-- 
+cgit v1.1
+

desktop/kde/graphics/digikam/pspec.xml

@@ -95,9 +95,13 @@
             <Dependency>boost-devel</Dependency>
             <Dependency>kemoticons-devel</Dependency>
             <Dependency>kcontacts-devel</Dependency>
+            <Dependency>qt5-webengine-devel</Dependency>
+            <Dependency>imagemagick-devel</Dependency>       
+            <Dependency>x265-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">digikam-opencv-4.2.patch</Patch>
+            <Patch>initialize-imagemagick.patch</Patch>
+            <Patch>digikam-opencv-4.2.patch</Patch>
         </Patches>
     </Source>
 
@@ -105,6 +109,7 @@
         <Name>digikam</Name>
         <RuntimeDependencies>            
             <Dependency>kio</Dependency>
+            <Dependency>x265</Dependency>
             <Dependency>mesa</Dependency> 
             <Dependency>tiff</Dependency>
             <Dependency>expat</Dependency>
@@ -125,7 +130,6 @@
             <Dependency>libgomp</Dependency>
             <Dependency>libkipi</Dependency>
             <Dependency>karchive</Dependency>
-            <Dependency>kcalendarcore</Dependency>
             <Dependency>kservice</Dependency>
             <Dependency>libksane</Dependency>
             <Dependency>lensfun</Dependency>
@@ -140,12 +144,14 @@
             <Dependency>kiconthemes</Dependency>
             <Dependency>libmediawiki</Dependency>
             <Dependency>threadweaver</Dependency>
+            <Dependency>kcalendarcore</Dependency>
             <Dependency>kfilemetadata</Dependency> 
             <Dependency>knotifyconfig</Dependency>            
             <Dependency>kwindowsystem</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
             <Dependency>libkvkontakte</Dependency>
             <Dependency>qt5-x11extras</Dependency>
+            <Dependency>qt5-webengine</Dependency>    
             <Dependency>kconfigwidgets</Dependency>
             <Dependency>knotifications</Dependency>
             <Dependency>kwidgetsaddons</Dependency>
@@ -163,7 +169,7 @@
     
     <History>
         <Update release="11">
-            <Date>2020-03-15</Date>
+            <Date>2020-03-21</Date>
             <Version>6.4.0</Version>
             <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>