diff options
| -rw-r--r-- | libraries/wxPython/wxPython.SlackBuild | 18 | ||||
| -rw-r--r-- | libraries/wxPython/wxPython.info | 8 |
2 files changed, 17 insertions, 9 deletions
diff --git a/libraries/wxPython/wxPython.SlackBuild b/libraries/wxPython/wxPython.SlackBuild index 15595d06d5..85a138d2c9 100644 --- a/libraries/wxPython/wxPython.SlackBuild +++ b/libraries/wxPython/wxPython.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wxPython -# Copyright 2007-2008 Heinz Wiesinger <pprkut@liwjatan.at> +# Copyright 2007-2009 Heinz Wiesinger <pprkut@liwjatan.at> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wxPython -VERSION=2.8.9.1 +VERSION=2.8.9.2 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -44,10 +44,13 @@ fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -73,6 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \ --$do_gp-gnomeprint \ --enable-unicode \ --enable-graphics_ctx \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux @@ -94,7 +98,9 @@ cd wxPython EP_FULL_VER=0 \ NO_SCRIPTS=1 \ WX_CONFIG="$TMP/$PRGNAM-src-$VERSION/wx-config --no_rpath" \ - build_ext --rpath=/usr/lib \ + build_ext --include-dirs=$TMP/$PRGNAM-src-$VERSION/lib/wx/include/gtk2-unicode-release-2.8 \ + --library-dirs=$TMP/$PRGNAM-src-$VERSION/lib \ + --rpath=/usr/lib$LIBDIRSUFFIX \ build python setup.py \ @@ -105,7 +111,9 @@ cd wxPython NO_SCRIPTS=1 \ WX_CONFIG="$TMP/$PRGNAM-src-$VERSION/wx-config --prefix=$PKG/usr/bin/ --no_rpath" \ SYS_WX_CONFIG="wx-config --enable-unicode" \ - build_ext --rpath=/usr/lib \ + build_ext --include-dirs=$TMP/$PRGNAM-src-$VERSION/lib/wx/include/gtk2-unicode-release-2.8 \ + --library-dirs=$TMP/$PRGNAM-src-$VERSION/lib \ + --rpath=/usr/lib$LIBDIRSUFFIX \ install --root=$PKG cd - diff --git a/libraries/wxPython/wxPython.info b/libraries/wxPython/wxPython.info index 441bbda903..27a9603f9c 100644 --- a/libraries/wxPython/wxPython.info +++ b/libraries/wxPython/wxPython.info @@ -1,8 +1,8 @@ PRGNAM="wxPython" -VERSION="2.8.9.1" +VERSION="2.8.9.2" HOMEPAGE="http://wxPython.org/" -DOWNLOAD="http://downloads.sourceforge.net/wxpython/wxPython-src-2.8.9.1.tar.bz2" -MD5SUM="4ad9a64e05529097618c7e48fbb10a84" +DOWNLOAD="http://downloads.sourceforge.net/wxpython/wxPython-src-2.8.9.2.tar.bz2" +MD5SUM="e3d89746af98b9279e4ff39a57f6dc63" MAINTAINER="ppr:kut" EMAIL="pprkut@liwjatan.at" -APPROVED="David Somero" +APPROVED="dsomero,rworkman" |