Date: Tuesday, January 7, 2014 @ 04:17:28 Author: eric Revision: 203263
upgpkg: wxpython 3.0.0.0-1 Upstream update, Use upstream editra, Remove old patches Modified: wxpython/trunk/PKGBUILD Deleted: wxpython/trunk/wxpython-cairo.patch wxpython/trunk/wxpython-fpb_default_style.patch ----------------------------------+ PKGBUILD | 37 +++++++++++++++----------- wxpython-cairo.patch | 51 ------------------------------------- wxpython-fpb_default_style.patch | 17 ------------ 3 files changed, 21 insertions(+), 84 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-01-06 22:31:19 UTC (rev 203262) +++ PKGBUILD 2014-01-07 03:17:28 UTC (rev 203263) @@ -2,31 +2,32 @@ # Maintainer: Eric Bélanger <[email protected]> pkgname=wxpython -pkgver=2.8.12.1 -pkgrel=4 +pkgver=3.0.0.0 +_editraver=0.7.20 +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 - wxpython-cairo.patch wxpython-fpb_default_style.patch) -sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' - '420700b0a216b853352ffafd054f406a82a30bb3' - 'b832d628b8ff38ea598f404d133899f40d687a22') +makedepends=('mesa' 'glu') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 + http://editra.org/uploads/src/Editra-${_editraver}.tar.gz) +sha1sums=('48451763275cfe4e5bbec49ccd75bc9652cba719' + 'f439f4aa2cb90b8348cebb1670df9cf47ba341ab') +prepare() { + cd "${srcdir}" + find . -type f -exec sed -i 's/env python/env python2/' {} \; + sed -i 's/sys.exit(1)//' Editra-${_editraver}/setup.py +} + 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" - patch -p1 -i "${srcdir}/wxpython-fpb_default_style.patch" + --enable-graphics_ctx --enable-mediactrl --disable-precomp-headers \ + --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys + cd wxPython python2 setup.py WXPORT=gtk2 UNICODE=1 build } @@ -34,4 +35,8 @@ 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" + + cd "${srcdir}/Editra-${_editraver}" + python2 setup.py install --root="${pkgdir}" + rm -r "${pkgdir}/usr/lib/python2.7/site-packages/wx-3.0-gtk2/wx/tools/Editra" } Deleted: wxpython-cairo.patch =================================================================== --- wxpython-cairo.patch 2014-01-06 22:31:19 UTC (rev 203262) +++ wxpython-cairo.patch 2014-01-07 03:17:28 UTC (rev 203263) @@ -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 Deleted: wxpython-fpb_default_style.patch =================================================================== --- wxpython-fpb_default_style.patch 2014-01-06 22:31:19 UTC (rev 203262) +++ wxpython-fpb_default_style.patch 2014-01-07 03:17:28 UTC (rev 203263) @@ -1,17 +0,0 @@ ---- wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 50185) -+++ wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 69431) -@@ -18,5 +18,4 @@ - self.AddWindowStyles() - # Custom styles -- self.AddStyle('FPB_DEFAULT_STYLE', fpb.FPB_DEFAULT_STYLE) - self.AddStyle('FPB_SINGLE_FOLD', fpb.FPB_SINGLE_FOLD) - self.AddStyle('FPB_COLLAPSE_TO_BOTTOM', fpb.FPB_COLLAPSE_TO_BOTTOM) ---- wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 57250) -+++ wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 69431) -@@ -20,5 +20,5 @@ - implicit_attributes=['label', 'collapsed'], - implicit_params={'collapsed': params.ParamBool}) --c.addStyles('FPB_DEFAULT_STYLE', 'FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM', -+c.addStyles('FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM', - 'FPB_EXCLUSIVE_FOLD', 'FPB_HORIZONTAL', 'FPB_VERTICAL') - component.Manager.register(c)
