libraries/gtk-qt-engine: Updated for version 1.1

3 files changed, 41 insertions, 17 deletions

diff --git a/libraries/gtk-qt-engine/gtk-qt-engine.SlackBuild b/libraries/gtk-qt-engine/gtk-qt-engine.SlackBuild
index cba9d0ec74..a2729e2828 100644
--- a/libraries/gtk-qt-engine/gtk-qt-engine.SlackBuild
+++ b/libraries/gtk-qt-engine/gtk-qt-engine.SlackBuild
@@ -1,10 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for gtk-qt-engine
-
 # Copyright 2006  Martin Lefebvre <dadexter@gmail.com>
-# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
-
+# Copyright 2007-2009  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +26,7 @@
 # Updated for version 0.8 by ppr:kut <hmwiesinger@gmx.at>
 
 PRGNAM=gtk-qt-engine
-VERSION=0.8
+VERSION=${VERSION:-1.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -39,9 +37,14 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+    SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -53,15 +56,23 @@ rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Patch the source so it won't break while building
+patch -p0 < $CWD/include.patch 
 
 cmake \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX="/usr"
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} .
 
-make
-make install DESTDIR=$PKG
+  make 
+  make install DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -69,8 +80,7 @@ make install DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -78,4 +88,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/libraries/gtk-qt-engine/gtk-qt-engine.info b/libraries/gtk-qt-engine/gtk-qt-engine.info
index 9989378e2a..bd6c27bca9 100644
--- a/libraries/gtk-qt-engine/gtk-qt-engine.info
+++ b/libraries/gtk-qt-engine/gtk-qt-engine.info
@@ -1,8 +1,11 @@
 PRGNAM="gtk-qt-engine"
-VERSION="0.8"
-HOMEPAGE="http://gtk-qt.ecs.soton.ac.uk/"
-DOWNLOAD="http://gtk-qt.ecs.soton.ac.uk/files/0.8/gtk-qt-engine-0.8.tar.bz2"
-MD5SUM="9fe75b7765b6a5b49901fcd6f4f4aa4b"
+VERSION="1.1"
+HOMEPAGE="http://code.google.com/p/gtk-qt-engine/"
+DOWNLOAD="http://gtk-qt-engine.googlecode.com/files/gtk-qt-engine-1.1.tar.bz2"
+MD5SUM="de8048baef7dfe6c97cd97c463d66152"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
 APPROVED="rworkman"
+
diff --git a/libraries/gtk-qt-engine/include.patch b/libraries/gtk-qt-engine/include.patch
new file mode 100644
index 0000000000..b60e70046e
--- /dev/null
+++ b/libraries/gtk-qt-engine/include.patch
@@ -0,0 +1,11 @@
+diff -Naur /tmp/SBo/gtk-qt-engine.orig/src/qt_theme_draw.c /tmp/SBo/gtk-qt-engine/src/qt_theme_draw.c
+--- /tmp/SBo/gtk-qt-engine.orig/src/qt_theme_draw.c	2008-03-11 01:30:19.000000000 +0000
++++ /tmp/SBo/gtk-qt-engine/src/qt_theme_draw.c	2009-07-11 14:33:46.000000000 +0000
+@@ -19,6 +19,7 @@
+  ***************************************************************************/
+ 
+ #include <math.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <gtk/gtkprogressbar.h>
+ #include <gdk/gdk.h>