1 files changed, 12 insertions, 9 deletions
diff --git a/source/kde/k3b/k3b.SlackBuild b/source/kde/k3b/k3b.SlackBuild
index 495edf62..a32bbc74 100755
--- a/source/kde/k3b/k3b.SlackBuild
+++ b/source/kde/k3b/k3b.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -43,12 +43,11 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
+rm -rf k3b-$VERSION
 echo "Building k3b-$VERSION..."
 tar xvf $CWD/../src/extragear/k3b-$VERSION.tar.?z*
 cd k3b-$VERSION
 
-zcat $CWD/k3b.internal.libsamplerate.diff.gz | patch -p1 || exit 1
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -56,17 +55,23 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+mkdir build
+cd build
 cmake \
+  $KDE_OPT_ARGS \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DMAN_INSTALL_DIR=/usr/man \
   -DSYSCONF_INSTALL_DIR=/etc/kde \
   -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-  .
+  ..
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
+cd -
+
+# Move the dbus configuration files to the proper place:
+mv $PKG/etc/kde/dbus-1 $PKG/etc/
 
 if [ -d $PKG/usr/man ]; then
   gzip -9 $PKG/usr/man/man?/*
@@ -77,10 +82,8 @@ cp -a \
  AUTHORS COPYING* FAQ INSTALL KNOWNBUGS PERMISSIONS README RELEASE_HOWTO TODO \
  $PKG/usr/doc/k3b-$VERSION
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc