[Lunar-commits] <moonbase> digikam4: Version bump to 2.1.0 and removing patch. Adding a CONFIGURE, adjusting BUILD

[Dennis `stumbles` Veatch]

commit 34706094a38960f8efd0a71c86103f54759e1ee5
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Sep 9 05:10:59 2011 -0400

    digikam4: Version bump to 2.1.0 and removing patch. Adding a CONFIGURE, adjusting BUILD
    
    to remove patch_it and a couple of changes to DEPENDS.
---
 kde4/apps/digikam4/BUILD     |    5 -----
 kde4/apps/digikam4/CONFIGURE |    3 +++
 kde4/apps/digikam4/DEPENDS   |    2 +-
 kde4/apps/digikam4/DETAILS   |    9 +++------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/kde4/apps/digikam4/BUILD b/kde4/apps/digikam4/BUILD
index de41132..0bf5697 100644
--- a/kde4/apps/digikam4/BUILD
+++ b/kde4/apps/digikam4/BUILD
@@ -1,10 +1,5 @@
 (
 
-# Accounting for the different file used to determine jpeg version.
-  if module_installed libjpeg-turbo ; then
-    patch_it $SOURCE2 0
-  fi &&
-
   source /etc/profile.d/qt4.rc  &&
   source /etc/profile.d/kde4.rc &&
 
diff --git a/kde4/apps/digikam4/CONFIGURE b/kde4/apps/digikam4/CONFIGURE
new file mode 100644
index 0000000..ade0ee2
--- /dev/null
+++ b/kde4/apps/digikam4/CONFIGURE
@@ -0,0 +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"
+
diff --git a/kde4/apps/digikam4/DEPENDS b/kde4/apps/digikam4/DEPENDS
index 974d361..07fece8 100644
--- a/kde4/apps/digikam4/DEPENDS
+++ b/kde4/apps/digikam4/DEPENDS
@@ -1,12 +1,12 @@
 depends libksane
 
+optional_depends expat       "-DWITH_EXPAT=ON"        "-DWITH_EXPAT=OFF"       "for XML parsing support"
 optional_depends kipi-plugins "" "" "for addition image manipulation plugin support"
 optional_depends lcms         "" "" "for color management support"
 
 optional_depends glib-2      "-DWITH_GLIB2=ON"        "-DWITH_GLIB2=OFF"        "for gobject support"
 optional_depends libgphoto2  "-DWITH_Gphoto2=ON"      "-DWITH_Gphoto2=OFF"      "for gphoto support"
 optional_depends kdepimlibs  "-DWITH_KdepimLibs=ON"   "-DWITH_KdepimLibs=OFF"   "to use various libraries from kdepimlibs"
-optional_depends marble      "-DWITH_MarbleWidget=ON" "-DWITH_MarbleWidget=OFF" "for marble widget support"
 optional_depends lensfun     "-DWITH_LensFun=ON"      "-DWITH_LensFun=OFF"      "for camera lens correction support"
 optional_depends liblqr      "-DWITH_Lqr-1=ON"        "-DWITH_Lqr-1=OFF"        "for LiquidRescale support"
 optional_depends doxygen     "-DWITH_Doxygen=ON"      "-DWITH_Doxygen=OFF"      "for documentation"
diff --git a/kde4/apps/digikam4/DETAILS b/kde4/apps/digikam4/DETAILS
index 5a843aa..9f38a34 100644
--- a/kde4/apps/digikam4/DETAILS
+++ b/kde4/apps/digikam4/DETAILS
@@ -1,16 +1,13 @@
           MODULE=digikam4
-         VERSION=1.9.0
+         VERSION=2.1.0
           SOURCE=digikam-$VERSION.tar.bz2
-         SOURCE2=digikam-1.9.0-turbojpeg.patch
       SOURCE_URL=$SFORGE_URL/digikam
-     SOURCE2_URL=$PATCH_URL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/digikam-$VERSION
-      SOURCE_VFY=sha1:3958c47756e816b3ab8709fcbf41a945bcd4903c
-     SOURCE2_VFY=sha1:d96a79db699cb29d9be4f4ce13ae4500a4652cf0
+      SOURCE_VFY=sha1:4a5477a5665fea4cfaf0b2038a9ffcf2b2d207c7
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
         WEB_SITE=http://www.digikam.org
          ENTERED=20090318
-         UPDATED=20110302
+         UPDATED=20110909
            SHORT="kde4 version of digikam"
 
 cat << EOF