[arch-commits] Commit in wxpython/trunk (PKGBUILD wxpython-fpb_default_style.patch)

[Eric Bélanger]

    Date: Friday, October 5, 2012 @ 23:24:12
  Author: eric
Revision: 168111

upgpkg: wxpython 2.8.12.1-4

Fixed FPB_DEFAULT_STYLE bug (close FS#31028)

Added:
  wxpython/trunk/wxpython-fpb_default_style.patch
Modified:
  wxpython/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |    9 ++++++---
 wxpython-fpb_default_style.patch |   17 +++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-06 01:00:22 UTC (rev 168110)
+++ PKGBUILD	2012-10-06 03:24:12 UTC (rev 168111)
@@ -3,16 +3,18 @@
 
 pkgname=wxpython
 pkgver=2.8.12.1
-pkgrel=3
+pkgrel=4
 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)
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 
+        wxpython-cairo.patch wxpython-fpb_default_style.patch)
 sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
-          '420700b0a216b853352ffafd054f406a82a30bb3')
+          '420700b0a216b853352ffafd054f406a82a30bb3'
+          'b832d628b8ff38ea598f404d133899f40d687a22')
 
 build() {
   cd "${srcdir}/wxPython-src-${pkgver}"
@@ -24,6 +26,7 @@
     --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 build
 }
 

Added: wxpython-fpb_default_style.patch
===================================================================
--- wxpython-fpb_default_style.patch	                        (rev 0)
+++ wxpython-fpb_default_style.patch	2012-10-06 03:24:12 UTC (rev 168111)
@@ -0,0 +1,17 @@
+--- 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)