libraries/wxGTK: Updated for version 2.8.10.

4 files changed, 44 insertions, 14 deletions

diff --git a/libraries/wxGTK/README b/libraries/wxGTK/README
index b5ec676d2894..537392233981 100644
--- a/libraries/wxGTK/README
+++ b/libraries/wxGTK/README
@@ -1,5 +1,7 @@
-wxGTK is part of wxWidgets, a cross-platform API for writing GUI
-applications on multiple platforms that still utilize the native
-platform's controls and utilities.
+wxGTK is part of wxWidgets, a cross-platform API for writing GUI applications
+on multiple platforms that still utilize the native platform's controls and
+utilities.
 
 This is a unicode shared build.
+If you do not want the unicode build, use:
+UNICODE=NO ./wxGTK.SlackBuild
diff --git a/libraries/wxGTK/newgtk.patch b/libraries/wxGTK/newgtk.patch
new file mode 100644
index 000000000000..eb8e653c9e31
--- /dev/null
+++ b/libraries/wxGTK/newgtk.patch
@@ -0,0 +1,16 @@
+--- wxGTK-2.8.10/src/gtk/gsockgtk.cpp	2009-03-06 09:18:08.000000000 -0300
++++ wxGTK-2.8.10_patched/src/gtk/gsockgtk.cpp	2010-03-27 08:32:57.000000000 -0300
+@@ -15,8 +15,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+ 
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/libraries/wxGTK/wxGTK.SlackBuild b/libraries/wxGTK/wxGTK.SlackBuild
index 297cda91daf1..6e3ead0ea498 100644
--- a/libraries/wxGTK/wxGTK.SlackBuild
+++ b/libraries/wxGTK/wxGTK.SlackBuild
@@ -24,12 +24,13 @@
 
 # Lots of key help from Eric Hameleers and the SBo admins.
 
-# Modified by the SlackBuilds.org project
+# Versions >= 2.8.10 by Niels Horn <niels.horn@gmail.com>
+# revision date: 2010/03/27
 
 PRGNAM=wxGTK
-VERSION=2.8.9
+VERSION=2.8.10
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -44,12 +45,19 @@ UNICODE=${UNICODE:-YES}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+  ARCHQUADLET=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  ARCHQUADLET=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  ARCHQUADLET=""
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv4t"
+  LIBDIRSUFFIX=""
+  ARCHQUADLET="-gnueabi"
 fi
 
 rm -rf $PKG
@@ -65,6 +73,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Apply patch for newer gtk2 versions
+patch -p1 < $CWD/newgtk.patch
+
 # Set unicode flag as desired by UNICODE variable
 if [ "$UNICODE" = "YES" ]; then
   _do_unicode="en"
@@ -81,6 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-shared \
   --with-opengl \
   --${_do_unicode}able-unicode \
+  --build=$ARCH-slackware-linux$ARCHQUADLET \
   || exit 1
 
 make || exit 1
@@ -90,18 +102,18 @@ make install DESTDIR=$PKG || exit 1
   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
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 # Now let's fix the broken symlink created by the package
-cd $PKG/usr/bin
+( cd $PKG/usr/bin
   rm wx-config
   if [ "$UNICODE" = "YES" ]; then
     ln -s /usr/lib${LIBDIRSUFFIX}/wx/config/gtk2-unicode-release-2.8 wx-config
   elif [ "$UNICODE" = "NO" ]; then
     ln -s /usr/lib${LIBDIRSUFFIX}/wx/config/gtk2-ansi-release-2.8 wx-config
   fi
-cd -
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/wxGTK/wxGTK.info b/libraries/wxGTK/wxGTK.info
index b9adf519da5a..5ee9db5e7cc7 100644
--- a/libraries/wxGTK/wxGTK.info
+++ b/libraries/wxGTK/wxGTK.info
@@ -1,10 +1,10 @@
 PRGNAM="wxGTK"
-VERSION="2.8.9"
+VERSION="2.8.10"
 HOMEPAGE="http://www.wxwidgets.org"
-DOWNLOAD="http://downloads.sourceforge.net/wxwindows/wxGTK-2.8.9.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/wxwindows/wxGTK-2.8.10.tar.gz"
+MD5SUM="d9638db3f3a9ce36c900a52f8c0087c6"
 DOWNLOAD_x86_64=""
-MD5SUM="8c845c11b02dc852471a7013eeded5ff"
 MD5SUM_x86_64=""
-MAINTAINER="Chess Griffin"
-EMAIL="chess@chessgriffin.com"
+MAINTAINER="Niels Horn"
+EMAIL="niels.horn@gmail.com"
 APPROVED="dsomero"