Date: Monday, December 7, 2015 @ 13:50:13
Author: bpiotrowski
Revision: 253340
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
wxpython2.8/repos/staging-i686/
wxpython2.8/repos/staging-i686/PKGBUILD
(from rev 253339, wxpython2.8/trunk/PKGBUILD)
wxpython2.8/repos/staging-i686/wxGTK-collision.patch
(from rev 253339, wxpython2.8/trunk/wxGTK-collision.patch)
wxpython2.8/repos/staging-i686/wxpython-cairo.patch
(from rev 253339, wxpython2.8/trunk/wxpython-cairo.patch)
wxpython2.8/repos/staging-i686/wxpython-fpb_default_style.patch
(from rev 253339, wxpython2.8/trunk/wxpython-fpb_default_style.patch)
wxpython2.8/repos/staging-x86_64/
wxpython2.8/repos/staging-x86_64/PKGBUILD
(from rev 253339, wxpython2.8/trunk/PKGBUILD)
wxpython2.8/repos/staging-x86_64/wxGTK-collision.patch
(from rev 253339, wxpython2.8/trunk/wxGTK-collision.patch)
wxpython2.8/repos/staging-x86_64/wxpython-cairo.patch
(from rev 253339, wxpython2.8/trunk/wxpython-cairo.patch)
wxpython2.8/repos/staging-x86_64/wxpython-fpb_default_style.patch
(from rev 253339, wxpython2.8/trunk/wxpython-fpb_default_style.patch)
-------------------------------------------------+
staging-i686/PKGBUILD | 52 +++++++++++++
staging-i686/wxGTK-collision.patch | 82 ++++++++++++++++++++++
staging-i686/wxpython-cairo.patch | 52 +++++++++++++
staging-i686/wxpython-fpb_default_style.patch | 18 ++++
staging-x86_64/PKGBUILD | 52 +++++++++++++
staging-x86_64/wxGTK-collision.patch | 82 ++++++++++++++++++++++
staging-x86_64/wxpython-cairo.patch | 52 +++++++++++++
staging-x86_64/wxpython-fpb_default_style.patch | 18 ++++
8 files changed, 408 insertions(+)
Copied: wxpython2.8/repos/staging-i686/PKGBUILD (from rev 253339,
wxpython2.8/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-12-07 12:50:13 UTC (rev 253340)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Laurent Carlier <[email protected]>
+
+pkgname=wxpython2.8
+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=('wxgtk2.8' 'wxpython' 'python2')
+makedepends=('mesa' 'glu')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
+ wxpython-cairo.patch wxpython-fpb_default_style.patch
wxGTK-collision.patch)
+sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
+ '922288b5e6c20075730655b79292959819c5fa77'
+ '0385386b5a622e6c623b63c9bf203d9748bd309b'
+ SKIP)
+
+# http://wiki.wxpython.org/MultiVersionInstalls
+# python program must have this snipet code added to force 2.8 usage:
+# import wxversion
+# wxversion.select("2.8")
+
+build() {
+ cd "${srcdir}/wxPython-src-${pkgver}"
+
+ patch -p1 -i ../wxGTK-collision.patch
+
+ 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"
+ python2 setup.py WXPORT=gtk2 UNICODE=1 WX_CONFIG=/usr/bin/wx-config-2.8 build
+}
+
+package() {
+ cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
+
+ python2 setup.py WXPORT=gtk2 UNICODE=1 WX_CONFIG=/usr/bin/wx-config-2.8
install --root="${pkgdir}"
+ rm -rf "${pkgdir}/usr/bin"
+ rm "${pkgdir}"/usr/lib/python2.7/site-packages/{wx.pth,wxversion.py*}
+
+ install -D -m644 ../docs/licence.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
Copied: wxpython2.8/repos/staging-i686/wxGTK-collision.patch (from rev 253339,
wxpython2.8/trunk/wxGTK-collision.patch)
===================================================================
--- staging-i686/wxGTK-collision.patch (rev 0)
+++ staging-i686/wxGTK-collision.patch 2015-12-07 12:50:13 UTC (rev 253340)
@@ -0,0 +1,82 @@
+diff -Naur wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl
wxPython-src-2.8.12.1/build/bakefiles/wx.bkl
+--- wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl 2014-01-04
22:28:16.491774907 -0500
++++ wxPython-src-2.8.12.1/build/bakefiles/wx.bkl 2014-01-04
22:37:39.610020870 -0500
+@@ -128,7 +128,7 @@
+ <using module="gettext"/>
+ <gettext-catalogs id="locale">
+ <srcdir>$(SRCDIR)/locale</srcdir>
+- <catalog-name>wxstd</catalog-name>
++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+ <linguas>
+ ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+ zh zh_CN zh_TW
+diff -Naur wxPython-src-2.8.12.1.orig/Makefile.in
wxPython-src-2.8.12.1/Makefile.in
+--- wxPython-src-2.8.12.1.orig/Makefile.in 2014-01-04 22:28:16.545107766
-0500
++++ wxPython-src-2.8.12.1/Makefile.in 2014-01-04 22:40:27.191813403 -0500
+@@ -11695,10 +11695,11 @@
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname)
$(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname)
$(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname)
$(__basedll___depname) $(__baselib___depname) $(__netdll___depname)
$(__netlib___depname) $(__coredll___depname) $(__corelib___depname)
$(__advdll___depname) $(__advlib___depname) $(__mediadll___depname)
$(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname)
$(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname)
$(__htmllib___depname) $(__qadll___depname) $(__qalib___depname)
$(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname)
$(__xrclib___depname) $(__auidll___depname) $(__auilib___depname)
$(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname)
$(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname)
$(__cocoa_res___depname)
+
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname)
$(__install_wxpng___depname) $(__install_wxjpeg___depname)
$(__install_wxtiff___depname) $(__install_wxodbc___depname)
$(__install_wxexpat___depname) $(__install_monodll___depname)
$(__install_monolib___depname) $(__install_basedll___depname)
$(__install_baselib___depname) $(__install_netdll___depname)
$(__install_netlib___depname) $(__install_coredll___depname)
$(__install_corelib___depname) $(__install_advdll___depname)
$(__install_advlib___depname) $(__install_mediadll___depname)
$(__install_medialib___depname) $(__install_odbcdll___depname)
$(__install_odbclib___depname) $(__install_dbgriddll___depname)
$(__install_dbgridlib___depname) $(__install_htmldll___depname)
$(__install_htmllib___depname) $(__install_qadll___depname)
$(__install_qalib___depname) $(__install_xmldll___depname)
$(__install_xmllib___depname) $(__install_xrcdll___depname)
$(__install_xrclib___depname) $(__install_auidll___depname) $(__inst
all_auilib___depname) $(__install_richtextdll___depname)
$(__install_richtextlib___depname) $(__install_gldll___depname)
$(__install_gllib___depname) $(__install_sound_sdl___depname)
$(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install
$(__cocoa_res_install___depname)
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)
wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++ for i in wx.bkl wx_unix.bkl wx_win32.bkl ; do \
++ $(INSTALL_DATA) $$i
$(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+ if test ! -d
$(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+@@ -12455,7 +12456,8 @@
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME)
$(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S)
$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME)
wx-config-$(WX_RELEASE))
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -12463,7 +12465,8 @@
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo
$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
++ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo
; \
+ fi ; \
+ done
+
+@@ -12480,7 +12483,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/msw/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo
$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo
$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+diff -Naur wxPython-src-2.8.12.1.orig/src/common/intl.cpp
wxPython-src-2.8.12.1/src/common/intl.cpp
+--- wxPython-src-2.8.12.1.orig/src/common/intl.cpp 2014-01-04
22:28:16.675106608 -0500
++++ wxPython-src-2.8.12.1/src/common/intl.cpp 2014-01-04 22:47:49.523526232
-0500
+@@ -1597,7 +1597,7 @@
+ bool bOk = true;
+ if ( bLoadDefault )
+ {
+- bOk = AddCatalog(wxT("wxstd"));
++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION)
wxSTRINGIZE(wxMINOR_VERSION)));
+
+ // there may be a catalog with toolkit specific overrides, it is not
+ // an error if this does not exist
+diff -Naur wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in
wxPython-src-2.8.12.1/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in 2014-01-04
22:28:16.335109635 -0500
++++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in 2014-01-04
22:37:34.410068493 -0500
+@@ -120,7 +120,6 @@
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
$(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
$(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE)
wxrc$(EXEEXT))
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
Copied: wxpython2.8/repos/staging-i686/wxpython-cairo.patch (from rev 253339,
wxpython2.8/trunk/wxpython-cairo.patch)
===================================================================
--- staging-i686/wxpython-cairo.patch (rev 0)
+++ staging-i686/wxpython-cairo.patch 2015-12-07 12:50:13 UTC (rev 253340)
@@ -0,0 +1,52 @@
+--- 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: wxpython2.8/repos/staging-i686/wxpython-fpb_default_style.patch (from
rev 253339, wxpython2.8/trunk/wxpython-fpb_default_style.patch)
===================================================================
--- staging-i686/wxpython-fpb_default_style.patch
(rev 0)
+++ staging-i686/wxpython-fpb_default_style.patch 2015-12-07 12:50:13 UTC
(rev 253340)
@@ -0,0 +1,18 @@
+--- 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)
+
Copied: wxpython2.8/repos/staging-x86_64/PKGBUILD (from rev 253339,
wxpython2.8/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-12-07 12:50:13 UTC (rev 253340)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Laurent Carlier <[email protected]>
+
+pkgname=wxpython2.8
+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=('wxgtk2.8' 'wxpython' 'python2')
+makedepends=('mesa' 'glu')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
+ wxpython-cairo.patch wxpython-fpb_default_style.patch
wxGTK-collision.patch)
+sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
+ '922288b5e6c20075730655b79292959819c5fa77'
+ '0385386b5a622e6c623b63c9bf203d9748bd309b'
+ SKIP)
+
+# http://wiki.wxpython.org/MultiVersionInstalls
+# python program must have this snipet code added to force 2.8 usage:
+# import wxversion
+# wxversion.select("2.8")
+
+build() {
+ cd "${srcdir}/wxPython-src-${pkgver}"
+
+ patch -p1 -i ../wxGTK-collision.patch
+
+ 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"
+ python2 setup.py WXPORT=gtk2 UNICODE=1 WX_CONFIG=/usr/bin/wx-config-2.8 build
+}
+
+package() {
+ cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
+
+ python2 setup.py WXPORT=gtk2 UNICODE=1 WX_CONFIG=/usr/bin/wx-config-2.8
install --root="${pkgdir}"
+ rm -rf "${pkgdir}/usr/bin"
+ rm "${pkgdir}"/usr/lib/python2.7/site-packages/{wx.pth,wxversion.py*}
+
+ install -D -m644 ../docs/licence.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
Copied: wxpython2.8/repos/staging-x86_64/wxGTK-collision.patch (from rev
253339, wxpython2.8/trunk/wxGTK-collision.patch)
===================================================================
--- staging-x86_64/wxGTK-collision.patch (rev 0)
+++ staging-x86_64/wxGTK-collision.patch 2015-12-07 12:50:13 UTC (rev
253340)
@@ -0,0 +1,82 @@
+diff -Naur wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl
wxPython-src-2.8.12.1/build/bakefiles/wx.bkl
+--- wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl 2014-01-04
22:28:16.491774907 -0500
++++ wxPython-src-2.8.12.1/build/bakefiles/wx.bkl 2014-01-04
22:37:39.610020870 -0500
+@@ -128,7 +128,7 @@
+ <using module="gettext"/>
+ <gettext-catalogs id="locale">
+ <srcdir>$(SRCDIR)/locale</srcdir>
+- <catalog-name>wxstd</catalog-name>
++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+ <linguas>
+ ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+ zh zh_CN zh_TW
+diff -Naur wxPython-src-2.8.12.1.orig/Makefile.in
wxPython-src-2.8.12.1/Makefile.in
+--- wxPython-src-2.8.12.1.orig/Makefile.in 2014-01-04 22:28:16.545107766
-0500
++++ wxPython-src-2.8.12.1/Makefile.in 2014-01-04 22:40:27.191813403 -0500
+@@ -11695,10 +11695,11 @@
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname)
$(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname)
$(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname)
$(__basedll___depname) $(__baselib___depname) $(__netdll___depname)
$(__netlib___depname) $(__coredll___depname) $(__corelib___depname)
$(__advdll___depname) $(__advlib___depname) $(__mediadll___depname)
$(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname)
$(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname)
$(__htmllib___depname) $(__qadll___depname) $(__qalib___depname)
$(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname)
$(__xrclib___depname) $(__auidll___depname) $(__auilib___depname)
$(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname)
$(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname)
$(__cocoa_res___depname)
+
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname)
$(__install_wxpng___depname) $(__install_wxjpeg___depname)
$(__install_wxtiff___depname) $(__install_wxodbc___depname)
$(__install_wxexpat___depname) $(__install_monodll___depname)
$(__install_monolib___depname) $(__install_basedll___depname)
$(__install_baselib___depname) $(__install_netdll___depname)
$(__install_netlib___depname) $(__install_coredll___depname)
$(__install_corelib___depname) $(__install_advdll___depname)
$(__install_advlib___depname) $(__install_mediadll___depname)
$(__install_medialib___depname) $(__install_odbcdll___depname)
$(__install_odbclib___depname) $(__install_dbgriddll___depname)
$(__install_dbgridlib___depname) $(__install_htmldll___depname)
$(__install_htmllib___depname) $(__install_qadll___depname)
$(__install_qalib___depname) $(__install_xmldll___depname)
$(__install_xmllib___depname) $(__install_xrcdll___depname)
$(__install_xrclib___depname) $(__install_auidll___depname) $(__inst
all_auilib___depname) $(__install_richtextdll___depname)
$(__install_richtextlib___depname) $(__install_gldll___depname)
$(__install_gllib___depname) $(__install_sound_sdl___depname)
$(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install
$(__cocoa_res_install___depname)
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)
wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++ for i in wx.bkl wx_unix.bkl wx_win32.bkl ; do \
++ $(INSTALL_DATA) $$i
$(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+ if test ! -d
$(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+@@ -12455,7 +12456,8 @@
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME)
$(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S)
$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME)
wx-config-$(WX_RELEASE))
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -12463,7 +12465,8 @@
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo
$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
++ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo
; \
+ fi ; \
+ done
+
+@@ -12480,7 +12483,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/msw/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo
$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo
$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+diff -Naur wxPython-src-2.8.12.1.orig/src/common/intl.cpp
wxPython-src-2.8.12.1/src/common/intl.cpp
+--- wxPython-src-2.8.12.1.orig/src/common/intl.cpp 2014-01-04
22:28:16.675106608 -0500
++++ wxPython-src-2.8.12.1/src/common/intl.cpp 2014-01-04 22:47:49.523526232
-0500
+@@ -1597,7 +1597,7 @@
+ bool bOk = true;
+ if ( bLoadDefault )
+ {
+- bOk = AddCatalog(wxT("wxstd"));
++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION)
wxSTRINGIZE(wxMINOR_VERSION)));
+
+ // there may be a catalog with toolkit specific overrides, it is not
+ // an error if this does not exist
+diff -Naur wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in
wxPython-src-2.8.12.1/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in 2014-01-04
22:28:16.335109635 -0500
++++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in 2014-01-04
22:37:34.410068493 -0500
+@@ -120,7 +120,6 @@
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
$(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
$(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE)
wxrc$(EXEEXT))
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
Copied: wxpython2.8/repos/staging-x86_64/wxpython-cairo.patch (from rev 253339,
wxpython2.8/trunk/wxpython-cairo.patch)
===================================================================
--- staging-x86_64/wxpython-cairo.patch (rev 0)
+++ staging-x86_64/wxpython-cairo.patch 2015-12-07 12:50:13 UTC (rev 253340)
@@ -0,0 +1,52 @@
+--- 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: wxpython2.8/repos/staging-x86_64/wxpython-fpb_default_style.patch (from
rev 253339, wxpython2.8/trunk/wxpython-fpb_default_style.patch)
===================================================================
--- staging-x86_64/wxpython-fpb_default_style.patch
(rev 0)
+++ staging-x86_64/wxpython-fpb_default_style.patch 2015-12-07 12:50:13 UTC
(rev 253340)
@@ -0,0 +1,18 @@
+--- 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)
+
