libraries/wxPython: Updated for version 2.8.9.1

3 files changed, 34 insertions, 17 deletions

diff --git a/libraries/wxPython/README b/libraries/wxPython/README
index 681c2e2321..9897ea848d 100644
--- a/libraries/wxPython/README
+++ b/libraries/wxPython/README
@@ -1,8 +1,12 @@
-wxPython is a GUI toolkit for the Python programming language.  It allows 
-Python programmers to create programs with a robust, highly functional 
-graphical user interface simply and easily.  It is implemented as a Python 
-extension module (native code) that wraps the popular wxWidgets cross 
+wxPython is a GUI toolkit for the Python programming language.  It allows
+Python programmers to create programs with a robust, highly functional
+graphical user interface simply and easily.  It is implemented as a Python
+extension module (native code) that wraps the popular wxWidgets cross
 platform GUI library which is written in C++.
 
+If you want support for gnomeprint pass GNOMEPRINT=yes to the script. This
+will require libgnomeprint and libgnomeprintui, both available from
+SlackBuilds.org.
+
 This package conflicts with wxGTK because it's already included in wxPython.
 Both cannot be installed at the same time!
diff --git a/libraries/wxPython/wxPython.SlackBuild b/libraries/wxPython/wxPython.SlackBuild
index 96e4c07f23..15595d06d5 100644
--- a/libraries/wxPython/wxPython.SlackBuild
+++ b/libraries/wxPython/wxPython.SlackBuild
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for wxPython
-# Written by ppr:kut <hmwiesinger@gmx.at>
 
-# Copyright 2007  Heinz Wiesinger
+# Copyright 2007-2008 Heinz Wiesinger <pprkut@liwjatan.at>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,19 +23,31 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wxPython
-VERSION=2.8.7.1
+VERSION=2.8.9.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Gnomeprint support
+GNOMEPRINT=${GNOMEPRINT:-no}
+
+if [ "$GNOMEPRINT" = "no" ]; then
+    do_gp="without"
+else
+    do_gp="with"
+fi
+
 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
@@ -59,7 +70,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --with-sdl \
   --with-opengl \
-  --enable-unicode
+  --$do_gp-gnomeprint \
+  --enable-unicode \
+  --enable-graphics_ctx \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
 
 make
 
@@ -94,10 +109,8 @@ cd wxPython
     install --root=$PKG
 cd -
 
-( 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 || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/wxPython
 cp -a README.1st.txt docs* $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/wxPython/wxPython.info b/libraries/wxPython/wxPython.info
index db5a5baf16..441bbda903 100644
--- a/libraries/wxPython/wxPython.info
+++ b/libraries/wxPython/wxPython.info
@@ -1,8 +1,8 @@
 PRGNAM="wxPython"
-VERSION="2.8.7.1"
+VERSION="2.8.9.1"
 HOMEPAGE="http://wxPython.org/"
-DOWNLOAD="http://downloads.sourceforge.net/wxpython/wxPython-src-2.8.7.1.tar.bz2"
-MD5SUM="04fc1079430b18e6fd097b3287e9ae10"
+DOWNLOAD="http://downloads.sourceforge.net/wxpython/wxPython-src-2.8.9.1.tar.bz2"
+MD5SUM="4ad9a64e05529097618c7e48fbb10a84"
 MAINTAINER="ppr:kut"
-EMAIL="HMWiesinger@gmx.at"
-APPROVED="rworkman"
+EMAIL="pprkut@liwjatan.at"
+APPROVED="David Somero"