2 files changed, 35 insertions, 20 deletions
diff --git a/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild b/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild
index 066f0bbf62..887a03171a 100644
--- a/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild
+++ b/desktop/QtCurve-Gtk2/QtCurve-Gtk2.SlackBuild
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # Slackware build script for QtCurve-Gtk2
-
 # Written by bughunter2 (bughunter2@googlemail.com)
 # Copyright 2008-2009  Michiel van Wessem, Manchester, United Kingdom
+# Copyright 2009 Gregory J. L. Tourte, UK (artourter@gmail.com) 
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=QtCurve-Gtk2
-VERSION=0.62.8
+VERSION=${VERSION:-1.0.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -60,17 +60,22 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Make QtCurve-Gtk2 default to reading the KDE3 settings as this is shipped 
-# Slackware. Delete the line or set -DQTC_DEFAULT_TO_KDE3 to 'false'.
-cmake \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DQTC_DEFAULT_TO_KDE3=true \
-  .
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DQTC_DEFAULT_TO_KDE3=false \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DQTC_STYLE_SUPPORT=true \
+    ..
 
-make
-make install DESTDIR=$PKG
+  make
+  make install DESTDIR=$PKG
+cd -
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -81,10 +86,18 @@ make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cp $CWD/slack-desc $PKG/install/slack-desc
+cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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}
+
+# Clean up the extra stuff:
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $TMP/$PRGNAM-$BASEVERS
+  rm -rf $PKG
+fi
+
+# vim: et ts=2
diff --git a/desktop/QtCurve-Gtk2/QtCurve-Gtk2.info b/desktop/QtCurve-Gtk2/QtCurve-Gtk2.info
index e74b7922e8..4e918cd0dd 100644
--- a/desktop/QtCurve-Gtk2/QtCurve-Gtk2.info
+++ b/desktop/QtCurve-Gtk2/QtCurve-Gtk2.info
@@ -1,8 +1,10 @@
 PRGNAM="QtCurve-Gtk2"
-VERSION="0.62.8"
+VERSION="1.0.2"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
-DOWNLOAD="http://www.slackbuilds.org/sources/12.2/QtCurve-Gtk2-0.62.8.tar.bz2"
-MD5SUM="010c1e7c607a8c0ce9600ff8700979d2"
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
+DOWNLOAD="http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-1.0.2.tar.bz2"
+MD5SUM="db32106c386031f74bffb011f1af9c3e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="ArTourter"
+EMAIL="artourter@gmail.com"
 APPROVED="dsomero"