Date: Tuesday, December 13, 2011 @ 17:53:53 Author: eric Revision: 144998
archrelease: copy trunk to extra-i686, extra-x86_64 Added: wxpython/repos/extra-i686/PKGBUILD (from rev 144997, wxpython/trunk/PKGBUILD) wxpython/repos/extra-i686/wxpython-cairo.patch (from rev 144997, wxpython/trunk/wxpython-cairo.patch) wxpython/repos/extra-x86_64/PKGBUILD (from rev 144997, wxpython/trunk/PKGBUILD) wxpython/repos/extra-x86_64/wxpython-cairo.patch (from rev 144997, wxpython/trunk/wxpython-cairo.patch) Deleted: wxpython/repos/extra-i686/PKGBUILD wxpython/repos/extra-i686/wxpython-cairo.patch wxpython/repos/extra-x86_64/PKGBUILD wxpython/repos/extra-x86_64/wxpython-cairo.patch -----------------------------------+ extra-i686/PKGBUILD | 67 ++++++++++++----------- extra-i686/wxpython-cairo.patch | 102 ++++++++++++++++++------------------ extra-x86_64/PKGBUILD | 67 ++++++++++++----------- extra-x86_64/wxpython-cairo.patch | 102 ++++++++++++++++++------------------ 4 files changed, 170 insertions(+), 168 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-12-13 22:53:33 UTC (rev 144997) +++ extra-i686/PKGBUILD 2011-12-13 22:53:53 UTC (rev 144998) @@ -1,33 +0,0 @@ -# $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/PKGBUILD (from rev 144997, wxpython/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-12-13 22:53:53 UTC (rev 144998) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=wxpython +pkgver=2.8.12.1 +pkgrel=3 +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 --disable-optimize --enable-mediactrl \ + --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + 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" +} Deleted: extra-i686/wxpython-cairo.patch =================================================================== --- extra-i686/wxpython-cairo.patch 2011-12-13 22:53:33 UTC (rev 144997) +++ extra-i686/wxpython-cairo.patch 2011-12-13 22:53:53 UTC (rev 144998) @@ -1,51 +0,0 @@ ---- 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 Copied: wxpython/repos/extra-i686/wxpython-cairo.patch (from rev 144997, wxpython/trunk/wxpython-cairo.patch) =================================================================== --- extra-i686/wxpython-cairo.patch (rev 0) +++ extra-i686/wxpython-cairo.patch 2011-12-13 22:53:53 UTC (rev 144998) @@ -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 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-12-13 22:53:33 UTC (rev 144997) +++ extra-x86_64/PKGBUILD 2011-12-13 22:53:53 UTC (rev 144998) @@ -1,33 +0,0 @@ -# $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-x86_64/PKGBUILD (from rev 144997, wxpython/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-12-13 22:53:53 UTC (rev 144998) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=wxpython +pkgver=2.8.12.1 +pkgrel=3 +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 --disable-optimize --enable-mediactrl \ + --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + 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" +} Deleted: extra-x86_64/wxpython-cairo.patch =================================================================== --- extra-x86_64/wxpython-cairo.patch 2011-12-13 22:53:33 UTC (rev 144997) +++ extra-x86_64/wxpython-cairo.patch 2011-12-13 22:53:53 UTC (rev 144998) @@ -1,51 +0,0 @@ ---- 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 Copied: wxpython/repos/extra-x86_64/wxpython-cairo.patch (from rev 144997, wxpython/trunk/wxpython-cairo.patch) =================================================================== --- extra-x86_64/wxpython-cairo.patch (rev 0) +++ extra-x86_64/wxpython-cairo.patch 2011-12-13 22:53:53 UTC (rev 144998) @@ -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