Updated to 0.10.0 (KDE4 release)

1 files changed, 23 insertions, 47 deletions

diff --git a/digikam/build/digikam.SlackBuild b/digikam/build/digikam.SlackBuild
index 3a90b4f9..d1af2759 100755
--- a/digikam/build/digikam.SlackBuild
+++ b/digikam/build/digikam.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2007-2008 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2007-2009 Eric Hameleers <alien@slackware.com>
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -41,6 +41,8 @@
 # 0.9.4-1:   27/jul/2008 by Eric Hameleers <alien@slackware.com>
 #            * New release. sqlite3 is no longer an external dependency
 #              since digikam now uses an internal sqlite3.
+# 0.10.0-1:  09/apr/2009 by Eric Hameleers <alien@slackware.com>
+#            * This release is for KDE4.
 # 
 # Run 'sh digikam.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -51,7 +53,7 @@
 # Set initial variables:
 
 PRGNAM=digikam
-VERSION=${VERSION:-0.9.4}
+VERSION=${VERSION:-0.10.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
@@ -68,9 +70,8 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Input URL: http://dl.sourceforge.net/digikam/digikam-0.9.2.tar.bz2
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
-SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
+SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -83,15 +84,8 @@ trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
 set -u
 P1=${1:-1}
 
-# Slackware 11 and up need other option (gcc > 3.3.x)
-if [ $(gcc -dumpversion | tr -d  '.' |cut -c 1-2) -gt 33 ]; then
-  MOPT=tune
-else
-  MOPT=cpu
-fi
-
 case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
+  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   s390)      SLKCFLAGS="-O2"
@@ -148,37 +142,26 @@ echo "++"
 cd $TMP/tmp-$PRGNAM
 
 echo "Extracting the source archive(s) for $PRGNAM..."
-if $(file ${SOURCE} | grep -q ": bzip2"); then
-  tar -xjvf ${SOURCE}
-elif $(file ${SOURCE} | grep -q ": gzip"); then
-  tar -xzvf ${SOURCE}
-fi
+tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 echo Building ...
-LDFLAGS="$SLKLDFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=${KDEPREF} \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --mandir=/usr/man \
-            --program-prefix="" \
-            --program-suffix="" \
-            --build=$ARCH-slackware-linux \
-            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-
-# Install all the needed stuff to the package dir
-# Use installwatch if available, to produce a logfile of the installation
-# process that is more easily readable:
-if $(which installwatch > /dev/null 2>&1); then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
-else
-  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-fi
+mkdir -p build
+cd build
+cmake \
+  -DCMAKE_C_FLAGS:STRING="${SLKCFLAGS}" \
+  -DCMAKE_CXX_FLAGS:STRING="${SLKCFLAGS}" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=${KDEPREF} \
+  -DMAN_INSTALL_DIR=/usr/man \
+  -DSYSCONF_INSTALL_DIR=/etc/kde \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  ..
+make 2>&1 |tee $OUTPUT/make-${PRGNAM}.log
+make install DESTDIR=${PKG} 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+cd ..
 
 # Update the desktop menus after install:
 mkdir -p $PKG/install
@@ -203,10 +186,8 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # Strip binaries:
-cd $PKG
-find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-cd -
+find ${PKG} | xargs file | grep -e "executable" -e "shared object" \
+        | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # Add a package description:
 mkdir -p $PKG/install
@@ -229,8 +210,3 @@ if [ -f $PKG/install/slack-required ]; then
   cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 fi
 
-# Clean up the extra stuff:
-if [ "$P1" = "--cleanup" ]; then
-  rm -rf $TMP/tmp-$PRGNAM
-  rm -rf $PKG
-fi