Date: Sunday, November 6, 2011 @ 19:38:07
Author: eric
Revision: 142236
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
wxpython/repos/extra-i686/PKGBUILD
(from rev 142235, wxpython/trunk/PKGBUILD)
wxpython/repos/extra-i686/wxpython-cairo.patch
(from rev 142235, wxpython/trunk/wxpython-cairo.patch)
wxpython/repos/extra-x86_64/PKGBUILD
(from rev 142235, wxpython/trunk/PKGBUILD)
wxpython/repos/extra-x86_64/wxpython-cairo.patch
(from rev 142235, wxpython/trunk/wxpython-cairo.patch)
Deleted:
wxpython/repos/extra-i686/PKGBUILD
wxpython/repos/extra-x86_64/PKGBUILD
---+
extra-i686/PKGBUILD | 65 ++--
extra-i686/wxpython-cairo.patch | 51
extra-x86_64/PKGBUILD | 65 ++--
extra-x86_64/wxpython-cairo.patch | 51
4 files changed, 168 insertions(+), 64 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-11-07 00:37:39 UTC (rev 142235)
+++ extra-i686/PKGBUILD 2011-11-07 00:38:07 UTC (rev 142236)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger e...@archlinux.org
-
-pkgname=wxpython
-pkgver=2.8.12.1
-pkgrel=1
-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')
-
-build() {
- cd ${srcdir}/wxPython-src-${pkgver}
- find . -type f -exec sed -i 's/env python/env python2/' {} \;
- mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra
- ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl
--enable-unicode \
---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
- python2 setup.py WXPORT=gtk2 UNICODE=1 build
-}
-
-package() {
- cd ${srcdir}/wxPython-src-${pkgver}/wxPython
- python2 setup.py WXPORT=gtk2 UNICODE=1 install --root=${pkgdir}
- install -D -m644 ../docs/licence.txt
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: wxpython/repos/extra-i686/PKGBUILD (from rev 142235,
wxpython/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-11-07 00:38:07 UTC (rev 142236)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Eric Bélanger e...@archlinux.org
+
+pkgname=wxpython
+pkgver=2.8.12.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
wxpython-cairo.patch)
+sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
+ '420700b0a216b853352ffafd054f406a82a30bb3')
+
+build() {
+ cd ${srcdir}/wxPython-src-${pkgver}
+ find . -type f -exec sed -i 's/env python/env python2/' {} \;
+ mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra
+ ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl
--enable-unicode \
+--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
+}
+
+package() {
+ cd ${srcdir}/wxPython-src-${pkgver}/wxPython
+ python2 setup.py WXPORT=gtk2 UNICODE=1 install --root=${pkgdir}
+ install -D -m644 ../docs/licence.txt
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
Copied: wxpython/repos/extra-i686/wxpython-cairo.patch (from rev 142235,
wxpython/trunk/wxpython-cairo.patch)
===
--- extra-i686/wxpython-cairo.patch (rev 0)
+++ extra-i686/wxpython-cairo.patch 2011-11-07 00:38:07 UTC (rev 142236)
@@ -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',
