Slackware 13.1slackware-13.1

Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits.  The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription.  Consider picking up
a copy to help support the project.  Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality.  :-)
Enjoy!

4 files changed, 44 insertions, 14 deletions

diff --git a/source/l/PyQt/PyQt.SlackBuild b/source/l/PyQt/PyQt.SlackBuild
index 4232d5f4..7d89221a 100755
--- a/source/l/PyQt/PyQt.SlackBuild
+++ b/source/l/PyQt/PyQt.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for PyQt
 
 # Copyright 2008  Aleksandar Samardzic <asamardzic@gmail.com>
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,22 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by Robby Workman <rworkman@slackware.com>
+# Modified by Eric Hameleers <alien@slackware.com>
 
-VERSION=${VERSION:-4.4.4}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.7.3}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j6}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-PyQt
@@ -40,14 +50,20 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+else
+  SLKCFLAGS="-O2"
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf PyQt-$VERSION
-tar xvf $CWD/PyQt-x11-gpl-$VERSION.tar.bz2 || exit 1
+rm -rf PyQt-x11-gpl-$VERSION
+tar xvf $CWD/PyQt-x11-gpl-$VERSION.tar.?z* || exit 1
 cd PyQt-x11-gpl-$VERSION || exit 1
+
+# Fix phonon detection:
+zcat $CWD/PyQt.phonon.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,10 +71,13 @@ find . \
  \( -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 \
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS"
+# This avoids compiling a version number into KDE's .la files:
+export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
+
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+
+python configure.py --confirm-license --verbose
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -75,5 +94,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/PyQt-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/PyQt-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz
 
diff --git a/source/l/PyQt/PyQt.info b/source/l/PyQt/PyQt.info
index f041f25b..f127e6d9 100644
--- a/source/l/PyQt/PyQt.info
+++ b/source/l/PyQt/PyQt.info
@@ -1,2 +1,2 @@
 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/"
-DOWNLOAD="http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.4.2.tar.gz"
+DOWNLOAD="http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.5.4.tar.gz"
diff --git a/source/l/PyQt/PyQt.phonon.diff b/source/l/PyQt/PyQt.phonon.diff
new file mode 100644
index 00000000..feda6509
--- /dev/null
+++ b/source/l/PyQt/PyQt.phonon.diff
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.6.2/configure.py.orig	2010-01-08 23:39:46.000000000 +0100
++++ PyQt-x11-gpl-4.6.2/configure.py	2010-01-08 23:45:18.000000000 +0100
+@@ -451,7 +451,7 @@
+             generate_code("QtXmlPatterns")
+ 
+         if "phonon" in pyqt_modules:
+-            generate_code("phonon")
++            generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
+ 
+         if "QtAssistant" in pyqt_modules:
+             generate_code("QtAssistant")
diff --git a/source/l/PyQt/slack-desc b/source/l/PyQt/slack-desc
index 03606543..4e01c51a 100644
--- a/source/l/PyQt/slack-desc
+++ b/source/l/PyQt/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-     |-----handy-ruler------------------------------------------------------|
+    |-----handy-ruler------------------------------------------------------|
 PyQt: PyQt (Python bindings for Qt)
 PyQt:
 PyQt: PyQt is a set of Python bindings for Trolltech's Qt application
 PyQt: framework and runs on all platforms supported by Qt.
 PyQt: 
-PyQt: Homepage: http://www.riverbankcomputing.co.uk/software/PyQt/
 PyQt: 
 PyQt:
 PyQt:
 PyQt:
+PyQt: Homepage: http://www.riverbankcomputing.co.uk/software/PyQt/
 PyQt: