From e7552010f531ef1b114352f0ce71a307360bf1d4 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 6 Oct 2012 00:25:32 -0700
Subject: Sat Oct  6 00:25:32 PDT 2012

---
 extra/wxpython/PKGBUILD                         | 11 +++++++----
 extra/wxpython/wxpython-fpb_default_style.patch | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 extra/wxpython/wxpython-fpb_default_style.patch

(limited to 'extra/wxpython')

diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index 6ce4fcba5..af7659559 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 144998 2011-12-13 22:53:53Z eric $
+# $Id: PKGBUILD 168112 2012-10-06 03:24:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 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 @@ build() {
     --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
 }
 
diff --git a/extra/wxpython/wxpython-fpb_default_style.patch b/extra/wxpython/wxpython-fpb_default_style.patch
new file mode 100644
index 000000000..906d3444d
--- /dev/null
+++ b/extra/wxpython/wxpython-fpb_default_style.patch
@@ -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)
-- 
cgit v1.2.3-54-g00ecf