[Lunar-commits] <moonbase-kde> digikam: Here's a fix.

[Dennis Veatch]

commit 11abc45a7e8c59261e404c23131834ff3f51dc6d
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Fri, 24 Oct 2014 08:31:36 -0400
URL: https://github.com/lunar-linux/moonbase-kde/commit/11abc45a7e8c59261e404c23131834ff3f51dc6d

digikam: Here's a fix.
---
  graphics/digikam/BUILD   | +3/-1     
  graphics/digikam/DEPENDS | +2/-3     
  2 files changed, 5 insertions(+), 4 deletions(-)

--- a/graphics/digikam/BUILD
+++ b/graphics/digikam/BUILD
@@ -2,10 +2,12 @@
   source /etc/profile.d/qt4.rc  &&
   source /etc/profile.d/kde4.rc &&
 
+# https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e
+  sedit "s:0x020302:0x020400:g" core/libs/imageproperties/captionedit.cpp core/libs/imageproperties/imagedescedittab.cpp &&
 
 # The -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF disables libkipi, 
 # libkexiv2 and libkdcraw normally installed by digikam causing
 # conflicts with the ones from kde.
-  OPTS+=" -Wno-dev -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF -DWITH_ImageMagick=OFF" &&
+  OPTS+=" -Wno-dev -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF" &&
 
   default_cmake_build
--- a/graphics/digikam/DEPENDS
+++ b/graphics/digikam/DEPENDS
@@ -24,6 +24,8 @@ optional_depends qjson        "-DWITH_QJSON=1"        "-DWITH_QJSON=0"       "fo
 optional_depends libusb       "-DWITH_USB=1"          "-DWITH_USB=0"         "for usb device support"
 optional_depends libgpod      "-DWITH_Ipod=1"         "-DWITH_Ipod=0"        "for for Ipod support"
 optional_depends hupnp-ng     "-DWITH_Hupnp=1"        "-DWITH_Hupnp=0"       "for upnp support"
+optional_depends ImageMagick  "-DWITH_ImageMagick=1"  "-DWITH_ImageMagick=0" "for ImageMagick support"
+
 optional_depends glib-2       "-DWITH_GLIB2=1 -DWITH_GObject=1"      \
                               "-DWITH_GLIB2=0 -DWITH_GObject=0"    \
                               "for glib-2 and gobject support"
@@ -31,7 +33,4 @@ optional_depends glib-2       "-DWITH_GLIB2=1 -DWITH_GObject=1"      \
 optional_depends libpgf       "-DPGF_INCLUDE_DIRS=/usr/include/libpgf" \
                               "" "for Progressive Graphics File, n=use internal"
 
-# Causes make to fail on imageproperties/
-#optional_depends ImageMagick  "-DWITH_ImageMagick=1"  "-DWITH_ImageMagick=0" "for ImageMagick support"
-
 optional_depends %MYSQL       "-DENABLE_INTERNALMYSQL==1" "-DENABLE_INTERNALMYSQL=0"  "for %MYSQL database support, ${PROBLEM_COLOR}say NO to use digikam provided server${DEFAULT_COLOR}"