[Lunar-commits] <moonbase> digikam: Version bump to 2.5.0. Haven't figured a way to prevent it from

[Dennis `stumbles` Veatch]

commit c2987f34cd2b4c6dfca3a4b9f8ed5f36997d7d46
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Feb 22 14:57:59 2012 -0500

    digikam: Version bump to 2.5.0. Haven't figured a way to prevent it from
    
    conflicting with kipi-plugins.
---
 kde4/graphics/digikam/BUILD   |    4 +++-
 kde4/graphics/digikam/DEPENDS |    4 +++-
 kde4/graphics/digikam/DETAILS |    9 ++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/kde4/graphics/digikam/BUILD b/kde4/graphics/digikam/BUILD
index c5343e6..79ca0af 100644
--- a/kde4/graphics/digikam/BUILD
+++ b/kde4/graphics/digikam/BUILD
@@ -3,7 +3,9 @@
   source /etc/profile.d/qt4.rc  &&
   source /etc/profile.d/kde4.rc &&
 
-  OPTS+=" -Wno-dev" &&
+  patch_it $SOURCE2 1 &&
+
+  OPTS+=" -Wno-dev -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=1" &&
 
   default_cmake_build
 
diff --git a/kde4/graphics/digikam/DEPENDS b/kde4/graphics/digikam/DEPENDS
index 4c0596b..d306542 100644
--- a/kde4/graphics/digikam/DEPENDS
+++ b/kde4/graphics/digikam/DEPENDS
@@ -10,7 +10,9 @@ optional_depends doxygen      "-DWITH_Doxygen=ON"      "-DWITH_Doxygen=OFF"
 optional_depends gdk-pixbuf   "-DWITH_Gdk=ON"          "-DWITH_Gdk=OFF"         "for gdk-pixbuf support"
 optional_depends libxml2      "-DWITH_LibXml2=ON"      "-DWITH_LibXml2=OFF"     "for xml support"
 optional_depends libxslt      "-DWITH_LibXslt=ON"      "-DWITH_LibXslt=OFF"     "for xslt support"
-optional_depends opencv       "-DWITH_OpenCV=ON"       "-DWITH_OpenCV=OFF"      "for computer vision support"
+
+#Check this on the next version bump.
+#optional_depends opencv       "-DWITH_OpenCV=ON"       "-DWITH_OpenCV=OFF"      "for computer vision support"
 optional_depends qca2         "-DWITH_QCA2=ON"         "-DWITH_QCA2=OFF"        "for qca support"
 optional_depends qjson        "-DWITH_QJSON=ON"        "-DWITH_QJSON=OFF"       "for qjson support"
 optional_depends libusb       "-DWITH_USB=ON"          "-DWITH_USB=OFF"         "for usb device support"
diff --git a/kde4/graphics/digikam/DETAILS b/kde4/graphics/digikam/DETAILS
index c7ae316..36c39e9 100644
--- a/kde4/graphics/digikam/DETAILS
+++ b/kde4/graphics/digikam/DETAILS
@@ -1,12 +1,15 @@
           MODULE=digikam
-         VERSION=2.4.0
+         VERSION=2.5.0
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=digikam-2.5.0-boost-1.48.0.patch
       SOURCE_URL=$SFORGE_URL/digikam
-      SOURCE_VFY=sha1:cf19e36d1c7bf3514834c72843d7967029fc3fd6
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:6cadb838669d1bdcbd6abb677889f7d68d696383
+     SOURCE2_VFY=sha1:f3e850f9a1b7235445a51a3626884475db7d3215
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
         WEB_SITE=http://www.digikam.org
          ENTERED=20090318
-         UPDATED=20111206
+         UPDATED=20120222
            SHORT="kde4 version of digikam"
 
 cat << EOF