[Lunar-commits] <moonbase-kde> digikam: bump to 4.6.0

[Dennis Veatch]

commit 8925aff3791767bccc237dd35df362c52afbbbb9
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Sat, 27 Dec 2014 11:11:56 -0500
URL: https://github.com/lunar-linux/moonbase-kde/commit/8925aff3791767bccc237dd35df362c52afbbbb9

digikam: bump to 4.6.0
---
  graphics/digikam/BUILD     | +7/-4     
  graphics/digikam/CONFIGURE | +3/-3     
  graphics/digikam/DETAILS   | +3/-3     
  3 files changed, 13 insertions(+), 10 deletions(-)

--- a/graphics/digikam/BUILD
+++ b/graphics/digikam/BUILD
@@ -5,9 +5,12 @@
 # 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" &&
+# Disabling these here else the digikam provided ones will conflict
+# with the ones from kde. We will use the digikam provided libkface.
+  OPTS+=" -Wno-dev  -DDIGIKAMSC_COMPILE_LIBKDCRAW=0 \
+                    -DDIGIKAMSC_COMPILE_LIBKEXIV2=0 \
+                    -DDIGIKAMSC_COMPILE_LIBKFACE=1  \
+                    -DDIGIKAMSC_COMPILE_LIBKIPI=0   \
+                    -DDIGIKAMSC_COMPILE_LIBKSANE=0" &&
 
   default_cmake_build
--- a/graphics/digikam/CONFIGURE
+++ b/graphics/digikam/CONFIGURE
@@ -1,3 +1,3 @@
-mquery ENABLE_THUMBS  "Build digiKam with thumbnails database support?" y "-DENABLE_THUMBS_DB=ON" "-DENABLE_THUMBS_DB=OFF"
-mquery BUILD_SCRIPT   "Build digiKam with experimental scripting support?" y "-DENABLE_SCRIPTIFACE=ON" "-DENABLE_SCRIPTIFACE=OFF"
-mquery BUILD_GEOMAP   "Build Digikam's geomap?" y "-DWITH_KGeoMap=ON" "-DWITH_KGeoMap=OFF"
+mquery BUILD_GEOMAP   "Build Digikam's geomap?" y "-DDIGIKAMSC_COMPILE_LIBKGEOMAP=1 -DWITH_KGeoMap=1" "-DDIGIKAMSC_COMPILE_LIBKGEOMAP=0 -DWITH_KGeoMap=0"
+mquery COMPILE_MEDIAWIKI "Compile Mediawiki?" y "-DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=1" "-DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=0"
+mquery COMPILE_LIBKVKONTAKTE "Compile Kontactte?" y "-DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=1" "-DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=0"
--- a/graphics/digikam/DETAILS
+++ b/graphics/digikam/DETAILS
@@ -1,12 +1,12 @@
           MODULE=digikam
-         VERSION=4.4.0
+         VERSION=4.6.0
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$KDE_URL/stable/$MODULE
-      SOURCE_VFY=sha1:1feb43120addda314e09761440ec2058e430171c
+      SOURCE_VFY=sha1:ee4241f02e997c7b122166bc845feb885b633f0e
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
         WEB_SITE=http://www.digikam.org
          ENTERED=20090318
-         UPDATED=20141009
+         UPDATED=20141227
            SHORT="kde4 version of digikam"
 cat << EOF
 Digikam is a simple digital photo management application, which makes importing