4 files changed, 46 insertions, 31 deletions
diff --git a/graphics/digikam/README b/graphics/digikam/README
index 74e3e8be86..b28e6e19d7 100644
--- a/graphics/digikam/README
+++ b/graphics/digikam/README
@@ -1,10 +1,7 @@
-digiKam is a simple digital photo management application for KDE,
-which makes importing and organizing digital photos a "snap". The
-photos can be organized in albums which can be sorted chronologically,
-by directory layout or by custom collections. An easy to use interface
-is provided that enables you to connect to your camera and preview,
-download and/or delete your images.
+digiKam is a simple digital photo management application for KDE, which makes 
+importing and organizing digital photos a "snap". The photos can be organized 
+in albums which can be sorted chronologically by directory layout or by custom
+collections. An easy to use interface is provided that enables you to connect 
+to your camera and preview, download and/or delete your images.
 
-exiv2, jasper, libkdcraw, libkexiv2, and libkipi (available at SBo)
-are required to build digiKam. kipi-plugins is an optional (but
-recommended) runtime dependency.
+lensfun and kipi-plugins are optional dependencies.
diff --git a/graphics/digikam/digikam.SlackBuild b/graphics/digikam/digikam.SlackBuild
index ae5ed2c22f..88961ea04b 100644
--- a/graphics/digikam/digikam.SlackBuild
+++ b/graphics/digikam/digikam.SlackBuild
@@ -21,9 +21,10 @@
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Modified by Niklas 'Nille' Åkerström for slackware64 and to use cmake.
 
 PRGNAM=digikam
-VERSION=${VERSION:-0.9.5}
+VERSION=${VERSION:-1.0.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -56,28 +57,37 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-KDEPREF=$(kde-config --prefix)
+KDEPREF=kde4-config
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=$KDEPREF \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=$KDEPREF/man \
-  --without-included-sqlite3 \
-  --build=$ARCH-slackware-linux
+mkdir -p build
+cd build
+cmake ..\
+  -DCMAKE_C_FLAGS:STRING="${SLKCFLAGS}" \
+  -DCMAKE_CXX_FLAGS:STRING="${SLKCFLAGS}" \
+  -DCMAKE_INSTALL_PREFIX=$($KDEPREF --prefix) \
+  -DLIB_SUFFIX=/usr/lib$($KDEPREF --libsuffix) \
+  -DMAN_INSTALL_DIR=/usr/man \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_VERBOSE_MAKEFILE:BOOL="TRUE"
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
 
-( cd $PKG/$KDEPREF/man
+( 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 $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README RELEASE.rev TODO \
+cp -a AUTHORS ChangeLog COPYING* DESIGN HACKING INSTALL NEWS README tips TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -88,4 +98,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/digikam/digikam.info b/graphics/digikam/digikam.info
index 670201dfed..f68fc17629 100644
--- a/graphics/digikam/digikam.info
+++ b/graphics/digikam/digikam.info
@@ -1,8 +1,10 @@
 PRGNAM="digikam"
-VERSION="0.9.5"
+VERSION="1.0.0"
 HOMEPAGE="http://www.digikam.org/"
-DOWNLOAD="http://downloads.sourceforge.net/digikam/digikam-0.9.5.tar.bz2"
-MD5SUM="fc4085169256cffd77aa8e8025792b89"
-MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo{at}gmail{dot}com"
+DOWNLOAD="http://downloads.sourceforge.net/digikam/digikam-1.0.0.tar.bz2"
+MD5SUM="6169deb68a3d712a0c6539b09c5f8c0c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Niklas 'Nille' Åkerström"
+EMAIL="Nille dot kungen[AT]gmail dot com"
 APPROVED="dsomero"
diff --git a/graphics/digikam/doinst.sh b/graphics/digikam/doinst.sh
index aeae05cd85..36904a5040 100644
--- a/graphics/digikam/doinst.sh
+++ b/graphics/digikam/doinst.sh
@@ -1,4 +1,10 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q usr/share/applications/kde
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications/kde4 >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
 fi