diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-09 10:49:34 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-09 10:49:34 -0300 |
| commit | d53c17bfc7766efa4bcb43eecc2906938d3d2ee9 (patch) | |
| tree | 8f29b8f00ba7758d04e66c3b3ab2bbe71363bceb /extra/wxpython | |
| parent | 23c40f4e35b9164f83c5bcf376056bca0546f69e (diff) | |
| parent | 26bcb2409416374f6728bd9b863e4fd147adccb3 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/freewrl/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/gource/PKGBUILD
community-testing/gpac/PKGBUILD
community-testing/rss-glx/PKGBUILD
community-testing/smc/PKGBUILD
community/blobby2/PKGBUILD
community/jack2/PKGBUILD
community/kleansweep/PKGBUILD
core/gcc/PKGBUILD
extra/at/PKGBUILD
extra/maxima/PKGBUILD
extra/nicotine/PKGBUILD
extra/python-geoip/PKGBUILD
extra/sqlite/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gst-plugins-base/PKGBUILD
gnome-unstable/gstreamer/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/libtool-multilib/PKGBUILD
multilib/jack2-multilib/PKGBUILD
staging/mesa/PKGBUILD
testing/bzflag/PKGBUILD
testing/cabal-install/PKGBUILD
testing/cairo/PKGBUILD
testing/gcc/PKGBUILD
testing/glew/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libtool/PKGBUILD
testing/mesa/PKGBUILD
testing/nx/PKGBUILD
testing/xf86-video-ati/PKGBUILD
testing/xf86-video-intel/PKGBUILD
testing/xf86-video-intel/xf86-video-intel.install
testing/xf86-video-nouveau/PKGBUILD
testing/xine-lib/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/wxpython')
| -rw-r--r-- | extra/wxpython/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/wxpython/wxpython-fpb_default_style.patch | 17 |
2 files changed, 24 insertions, 4 deletions
diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index 552a2bf27..5e38243e4 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' 'mips64el') 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) |