diff --git a/desktop/kde/graphics/digikam/actions.py b/desktop/kde/graphics/digikam/actions.py index 80da94f0ef..db52af29ca 100644 --- a/desktop/kde/graphics/digikam/actions.py +++ b/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 \ - -DWITH_LQR=ON \ - -DWITH_LENSFUN=ON \ - -DWITH_MarbleWidget=ON \ - -DENABLE_LCMS2=ON \ - -DDIGIKAMSC_COMPILE_KIPIPLUGINS=ON \ - -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON \ - -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON \ - -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \ - -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON \ - -DDIGIKAMSC_COMPILE_LIBKFACE=ON \ - -DDIGIKAMSC_COMPILE_LIBKIPI=ON ") + kde5.configure("-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") def build(): kde5.make() diff --git a/desktop/kde/graphics/digikam/files/initialize-imagemagick.patch b/desktop/kde/graphics/digikam/files/initialize-imagemagick.patch new file mode 100644 index 0000000000..d9cb83555f --- /dev/null +++ b/desktop/kde/graphics/digikam/files/initialize-imagemagick.patch @@ -0,0 +1,60 @@ +From 76ff65aec63be4036955e89bf7136a5e9411e6b1 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +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 DImgImageMagickPlugin::extraAboutData() const + QString mimes = typeMimes(); + + QMap 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 + diff --git a/desktop/kde/graphics/digikam/pspec.xml b/desktop/kde/graphics/digikam/pspec.xml index 68488d9ce0..235cb96e3f 100644 --- a/desktop/kde/graphics/digikam/pspec.xml +++ b/desktop/kde/graphics/digikam/pspec.xml @@ -95,9 +95,13 @@ boost-devel kemoticons-devel kcontacts-devel + qt5-webengine-devel + imagemagick-devel + x265-devel - digikam-opencv-4.2.patch + initialize-imagemagick.patch + digikam-opencv-4.2.patch @@ -105,6 +109,7 @@ digikam kio + x265 mesa tiff expat @@ -125,7 +130,6 @@ libgomp libkipi karchive - kcalendarcore kservice libksane lensfun @@ -140,18 +144,20 @@ kiconthemes libmediawiki threadweaver + kcalendarcore kfilemetadata knotifyconfig kwindowsystem libjpeg-turbo libkvkontakte qt5-x11extras + qt5-webengine kconfigwidgets knotifications kwidgetsaddons qt5-xmlpatterns akonadi-contacts - kdelibs4-support + kdelibs4-support /usr/bin @@ -163,7 +169,7 @@ - 2020-03-15 + 2020-03-21 6.4.0 Version bump. Mustafa Cinasal @@ -240,4 +246,4 @@ groni@pisilinux.org - + \ No newline at end of file