From 02e7d2d3414c66890be1454c202f877174eeba5a Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 20 Nov 2010 00:15:16 +0000
Subject: wxgtk: upgrade

---
 abs/extra/wxgtk/PKGBUILD | 51 +++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/abs/extra/wxgtk/PKGBUILD b/abs/extra/wxgtk/PKGBUILD
index c4a16be..7eb97bb 100644
--- a/abs/extra/wxgtk/PKGBUILD
+++ b/abs/extra/wxgtk/PKGBUILD
@@ -1,39 +1,36 @@
-# $Id: PKGBUILD 63766 2010-01-18 14:31:06Z pierre $
+# $Id: PKGBUILD 99629 2010-11-15 21:53:38Z eric $
 # Maintainer: Eric Belanger <eric@archlinux.org>
-# Original Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# New Version - Contributor: Bob Finch <w9ya@arrl.net>
-# with help from J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> aka Angelus
 
 pkgname=wxgtk
-pkgver=2.8.10.1
-pkgrel=6
+pkgver=2.8.11
+pkgrel=2
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
-depends=('gtk2' 'mesa' 'gstreamer0.10-base')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'ccache')
-options=('ccache') # required to build libwx_gtk2u_mmedia
-#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 \
-        overflow.patch gsocket.patch)
-md5sums=('65d5ef166f23fe8b4c67f58df164f93e' '325dba65152bc0cfbc1400a2bf54508e'\
-         'b56113a94125e4f9a3cc2680052bdfde')
-sha1sums=('6598fbafd979a91f20100171fa23a91779f6dc62' '7c4d1d507aad0b7c25a0de55234be42ea3e3f55f'\
-         '5b0e985afd77153e8e4b9e14987d4b1a9de53acc')
+depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa')
+#source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
+md5sums=('6040933d200037f90f6aa1c5169e7ec6')
+sha1sums=('e979d9d2b1ee5bd10e90fd00b02f3306327c661a')
 
 build() {
-  cd "${srcdir}/wxPython-src-${pkgver}"
-#  cd "${srcdir}/wxGTK-${pkgver}"
-  patch -p4 < ../overflow.patch || return 1
-  patch -p1 < ../gsocket.patch || return 1
+#  cd "${srcdir}/wxPython-src-${pkgver}"
+  cd "${srcdir}/wxGTK-${pkgver}"
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx  --disable-optimize --enable-mediactrl || return 1
-  make || return 1
-  make -C locale allmo || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+    --enable-graphics_ctx --disable-optimize --enable-mediactrl \
+    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
+  make
+  make -C locale allmo
   cd contrib/src
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/wxGTK-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  cd contrib/src
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 ../../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-- 
cgit v0.12