Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0b4daf594f30900c93b9d79a909a856002fa9da9
commit 0b4daf594f30900c93b9d79a909a856002fa9da9 Author: Devil505 <devil505li...@gmail.com> Date: Tue Feb 22 18:04:46 2011 +0100 wxpython-2.8.11.0-1-i686 * version bump diff --git a/source/xlib-extra/wxpython/FrugalBuild b/source/xlib-extra/wxpython/FrugalBuild index 8a41478..85d8539 100644 --- a/source/xlib-extra/wxpython/FrugalBuild +++ b/source/xlib-extra/wxpython/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy <cr...@frugalware.org> pkgname=wxpython -pkgver=2.8.10.1 -pkgrel=4 +pkgver=2.8.11.0 +pkgrel=1 pkgdesc="wxPython GUI toolkit" _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="wxPython-src" @@ -12,18 +12,18 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge python url="http://www.wxpython.org/"; options=('scriptlet') -depends=('wxgtk>=2.8.10.1-2' 'python>=2.7' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \ +depends=('wxgtk>=2.8.11' 'python>=2.7' 'atk' 'expat' 'libstdc++' 'zlib' 'libxxf86vm' \ 'libxfixes' 'libxcb' 'freetype2' 'cairo' 'pango' 'glib2' 'libgcc') -makedepends=('wxgtk-u8>=2.8.10.1-2') +makedepends=('wxgtk-u8>=2.8.11') options=('scriptlet') groups=('xlib-extra') archs=('x86_64' 'i686') -source=($source wxpython-2.8.10.1-gsocket.patch \ +source=($source \ wxPython-2.8.9.2-treelist.patch) subpkgs=("$pkgname-u8") subdescs=("wxPython GUI toolkit (unicode version)") -subdepends=("wxgtk-u8>=2.8.8") +subdepends=("wxgtk-u8>=2.8.11") subrodepends=("$pkgname=$pkgver") subgroups=('xlib-extra') subarchs=('i686 x86_64') @@ -48,7 +48,6 @@ build() Fmakeinstall ${wxp_config} UNICODE=0 WX_CONFIG='wx-config' } -sha1sums=('6598fbafd979a91f20100171fa23a91779f6dc62' \ - '885442567f2f80f78f9ed4f0ac2483c6fc932efe' \ +sha1sums=('18982edc236a1d87e4eef018928358c925aa5b17' \ 'e7173ef22252d4c2d02c07d3f018772f88f5eb06') # optimization OK diff --git a/source/xlib-extra/wxpython/wxpython-2.8.10.1-gsocket.patch b/source/xlib-extra/wxpython/wxpython-2.8.10.1-gsocket.patch deleted file mode 100644 index b875cb8..0000000 --- a/source/xlib-extra/wxpython/wxpython-2.8.10.1-gsocket.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- wxPython-src-2.8.10.1-orig/src/gtk/gsockgtk.cpp -+++ wxPython-src-2.8.10.1/src/gtk/gsockgtk.cpp -@@ -15,8 +15,13 @@ - #include <stdlib.h> - #include <stdio.h> - -+// newer versions of glib define its own GSocket but we unfortunately use this -+// name in our own (semi-)public header and so can't change it -- rename glib -+// one instead -+#define GSocket GlibGSocket - #include <gdk/gdk.h> - #include <glib.h> -+#undef GSocket - - #include "wx/gsocket.h" - #include "wx/unix/gsockunx.h" _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
