From effb26c3b1f00bf8bea4e2562f07f9a06eb67606 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 7 Nov 2011 23:14:55 +0000
Subject: Mon Nov  7 23:14:55 UTC 2011

---
 extra/wxpython/PKGBUILD             | 11 ++++----
 extra/wxpython/wxpython-cairo.patch | 51 +++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 extra/wxpython/wxpython-cairo.patch

(limited to 'extra/wxpython')

diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index 7f02de61a..2a983d1a3 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 134638 2011-08-07 02:39:42Z eric $
+# $Id: PKGBUILD 142236 2011-11-07 00:38:07Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxpython
 pkgver=2.8.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A wxWidgets GUI toolkit for Python"
 arch=('i686' 'x86_64')
 license=('custom:wxWindows')
 url="http://www.wxpython.org"
 depends=('wxgtk' 'python2')
 makedepends=('mesa')
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-md5sums=('8c06c5941477beee213b4f2fa78be620')
-sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxpython-cairo.patch)
+sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
+          '420700b0a216b853352ffafd054f406a82a30bb3')
 
 build() {
   cd "${srcdir}/wxPython-src-${pkgver}"
@@ -22,6 +22,7 @@ build() {
     --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
   cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
+  patch -p2 -i "${srcdir}/wxpython-cairo.patch"
   python2 setup.py WXPORT=gtk2 UNICODE=1 build
 }
 
diff --git a/extra/wxpython/wxpython-cairo.patch b/extra/wxpython/wxpython-cairo.patch
new file mode 100644
index 000000000..f3fc6fba0
--- /dev/null
+++ b/extra/wxpython/wxpython-cairo.patch
@@ -0,0 +1,51 @@
+--- wxPython/trunk/wx/lib/wxcairo.py	2011/08/25 18:50:02	68894
++++ wxPython/trunk/wx/lib/wxcairo.py	2011/09/22 00:30:25	69181
+@@ -401,6 +401,48 @@
+                                                       ctypes.py_object)),
+             ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))]
+ 
++    # This structure is known good with pycairo 1.10.0. The keep adding stuff
++    # to the middle of the structure instead of only adding to the end!
++    elif cairo.version_info < (1,11):  
++        _fields_ = [
++            ('Context_Type', ctypes.py_object),
++            ('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object,
++                                                      ctypes.c_void_p,
++                                                      ctypes.py_object,
++                                                      ctypes.py_object)),
++            ('FontFace_Type', ctypes.py_object),
++            ('ToyFontFace_Type', ctypes.py_object),  #** new in 1.8.4
++            ('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
++            ('FontOptions_Type', ctypes.py_object),
++            ('FontOptions_FromFontOptions', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
++            ('Matrix_Type', ctypes.py_object),
++            ('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
++            ('Path_Type', ctypes.py_object),
++            ('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
++            ('Pattern_Type', ctypes.py_object),
++            ('SolidPattern_Type', ctypes.py_object),
++            ('SurfacePattern_Type', ctypes.py_object),
++            ('Gradient_Type', ctypes.py_object),
++            ('LinearGradient_Type', ctypes.py_object),
++            ('RadialGradient_Type', ctypes.py_object),
++            ('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p,
++                                                      ctypes.py_object)), #** changed in 1.8.4
++            ('ScaledFont_Type', ctypes.py_object),
++            ('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
++            ('Surface_Type', ctypes.py_object),
++            ('ImageSurface_Type', ctypes.py_object),
++            ('PDFSurface_Type', ctypes.py_object),
++            ('PSSurface_Type', ctypes.py_object),
++            ('SVGSurface_Type', ctypes.py_object),
++            ('Win32Surface_Type', ctypes.py_object),
++            ('Win32PrintingSurface_Type', ctypes.py_object),
++            ('XCBSurface_Type', ctypes.py_object),
++            ('XlibSurface_Type', ctypes.py_object),
++            ('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object,
++                                                      ctypes.c_void_p,
++                                                      ctypes.py_object)),
++            ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))]
++
+ 
+ def _loadPycairoAPI():
+     global pycairoAPI
-- 
cgit v1.2.3-54-g00ecf