libraries/pyqt4: Updated for version 4.4.4

3 files changed, 28 insertions, 23 deletions

diff --git a/libraries/pyqt4/pyqt4.SlackBuild b/libraries/pyqt4/pyqt4.SlackBuild
index 2826f5bf5c..5488737b7c 100644
--- a/libraries/pyqt4/pyqt4.SlackBuild
+++ b/libraries/pyqt4/pyqt4.SlackBuild
@@ -2,23 +2,25 @@
 
 # Slackware build script for PyQt
 
-# Written by Aleksandar B. Samardzic <asamardzic@matf.bg.ac.yu>
+# Written by Aleksandar Samardzic <asamardzic@gmail.com>
 
-NAME=pyqt4
-VERSION=4.3.3
+PRGNAM=pyqt4
+VERSION=${VERSION:-4.4.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=${PKG:-$TMP/package-$NAME}
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -26,11 +28,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $NAME-$VERSION
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/PyQt-x11-gpl-$VERSION.tar.gz
 cd PyQt-x11-gpl-$VERSION
 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 {} \;
 
 echo "yes" | python configure.py -q \
   /usr/bin/qmake-qt4 \
@@ -40,17 +46,16 @@ echo "yes" | python configure.py -q \
 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 || true
-  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 || true
 
-mkdir -p $PKG/usr/doc/$NAME-$VERSION
-cp -a ChangeLog LICENSE NEWS README THANKS doc/* $PKG/usr/doc/$NAME-$VERSION
-cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT \
+  README THANKS doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$NAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/libraries/pyqt4/pyqt4.info b/libraries/pyqt4/pyqt4.info
index 27cf5889a9..d3001aa7db 100644
--- a/libraries/pyqt4/pyqt4.info
+++ b/libraries/pyqt4/pyqt4.info
@@ -1,8 +1,8 @@
 PRGNAM="pyqt4"
-VERSION="4.3.3"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
-DOWNLOAD="http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-4.3.3.tar.gz"
-MD5SUM="a2ead359f57d84c24bdd10de387e80b4"
-MAINTAINER="Aleksandar B. Samardzic"
-EMAIL="asamardzic@matf.bg.ac.yu"
-APPROVED="rworkman"
+VERSION="4.4.4"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/"
+DOWNLOAD="http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.4.4.tar.gz"
+MD5SUM="4bd346d56d10452e47ac71e2cbe04229"
+MAINTAINER="Aleksandar Samardzic"
+EMAIL="asamardzic@gmail.com"
+APPROVED="dsomero"
diff --git a/libraries/pyqt4/slack-desc b/libraries/pyqt4/slack-desc
index 040d5d8efe..8e0eced283 100644
--- a/libraries/pyqt4/slack-desc
+++ b/libraries/pyqt4/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-pyqt4: PyQt (Python binding for Qt)
+pyqt4: PyQt (Python bindings for Qt)
 pyqt4:
 pyqt4: PyQt is a set of Python bindings for Trolltech's Qt application
 pyqt4: framework and runs on all platforms supported by Qt including
 pyqt4: Windows, MacOS/X and Linux.  This package contains bindings for
 pyqt4: Qt v4.
 pyqt4:
-pyqt4: PyQt home page is http://www.riverbankcomputing.co.uk/pyqt/
+pyqt4: Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
 pyqt4:
 pyqt4:
 pyqt4: