[Lunar-commits] <moonbase-kde> digikam: removing an unused switch and for the time being disabling the

[Dennis Veatch]

commit 1c9bf37692d1663ef231c8c72974b2183ea0bc1d
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Fri, 24 Oct 2014 06:49:45 -0400
URL: https://github.com/lunar-linux/moonbase-kde/commit/1c9bf37692d1663ef231c8c72974b2183ea0bc1d

digikam: removing an unused switch and for the time being disabling the
ImageMagick optional_depends, causes the make to fail.
---
  graphics/digikam/BUILD   | +2/-2     
  graphics/digikam/DEPENDS | +2/-2     
  graphics/digikam/DETAILS | +0/-1     
  3 files changed, 4 insertions(+), 5 deletions(-)

--- a/graphics/digikam/BUILD
+++ b/graphics/digikam/BUILD
@@ -2,10 +2,10 @@
   source /etc/profile.d/qt4.rc  &&
   source /etc/profile.d/kde4.rc &&
 
+
 # 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" &&
+  OPTS+=" -Wno-dev -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF -DWITH_ImageMagick=OFF" &&
 
   default_cmake_build
--- a/graphics/digikam/DEPENDS
+++ b/graphics/digikam/DEPENDS
@@ -31,7 +31,7 @@ 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"
 
-optional_depends ImageMagick  "-DWITH_ImageMagick=1"  "-DWITH_ImageMagick=0" "for ImageMagick support"
+# Causes make to fail on imageproperties/
+#optional_depends ImageMagick  "-DWITH_ImageMagick=1"  "-DWITH_ImageMagick=0" "for ImageMagick support"
 
-optional_depends nepomuk-core "-DENABLE_NEPOMUKSUPPORT=1" "-DENABLE_NEPOMUKSUPPORT=0" "for symantic desktop 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}"
--- a/graphics/digikam/DETAILS
+++ b/graphics/digikam/DETAILS
@@ -8,7 +8,6 @@
          ENTERED=20090318
          UPDATED=20141009
            SHORT="kde4 version of digikam"
-
 cat << EOF
 Digikam is a simple digital photo management application, which makes importing
 and organizing digital photos a "snap". The photos can be organized in albums