From 16982772470d913e05e5f7665d25aad4e71f60a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Sat, 30 Apr 2011 16:08:20 +0200 Subject: [PATCH] update to 2.8.12.0 (#699207) --- .gitignore | 1 + sources | 2 +- wxPython-2.8.11.0-aui.patch | 24 ------------------------ wxPython-2.8.12.0-aui.patch | 24 ++++++++++++++++++++++++ wxPython-2.8.9.2-treelist.patch | 11 ----------- wxPython.spec | 14 +++++++------- 6 files changed, 33 insertions(+), 43 deletions(-) delete mode 100644 wxPython-2.8.11.0-aui.patch create mode 100644 wxPython-2.8.12.0-aui.patch delete mode 100644 wxPython-2.8.9.2-treelist.patch diff --git a/.gitignore b/.gitignore index 3a89b5e..ea61b77 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wxPython-src-2.8.11.0.tar.bz2 +/wxPython-src-2.8.12.0.tar.bz2 diff --git a/sources b/sources index 08f0993..f117e2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63f73aae49e530852db56a31b57529fa wxPython-src-2.8.11.0.tar.bz2 +402e0b81e06f596d849e221a7a76acc6 wxPython-src-2.8.12.0.tar.bz2 diff --git a/wxPython-2.8.11.0-aui.patch b/wxPython-2.8.11.0-aui.patch deleted file mode 100644 index 45fab7c..0000000 --- a/wxPython-2.8.11.0-aui.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py ---- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui 2010-05-27 15:38:42.000000000 +0200 -+++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py 2010-05-27 15:38:50.000000000 +0200 -@@ -36,7 +36,7 @@ import ed_txt - import ed_mdlg - import ebmlib - import eclib --from extern import aui -+from wx.lib.agw import aui - - #--------------------------------------------------------------------------# - # Globals -diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py ---- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui 2010-05-27 15:38:20.000000000 +0200 -+++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py 2010-05-27 15:38:28.000000000 +0200 -@@ -28,7 +28,7 @@ import ed_glob - from profiler import Profile_Get - import plugin - import iface --import extern.aui as aui -+from wx.lib.agw import aui - - #--------------------------------------------------------------------------# - # Globals diff --git a/wxPython-2.8.12.0-aui.patch b/wxPython-2.8.12.0-aui.patch new file mode 100644 index 0000000..bd631e0 --- /dev/null +++ b/wxPython-2.8.12.0-aui.patch @@ -0,0 +1,24 @@ +diff -up wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py +--- wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui 2011-04-13 22:28:07.000000000 +0200 ++++ wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py 2011-04-26 08:40:13.000000000 +0200 +@@ -37,7 +37,7 @@ import ed_txt + import ed_mdlg + import ebmlib + import eclib +-from extern import aui ++from wx.lib.agw import aui + import ed_book + + #--------------------------------------------------------------------------# +diff -up wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py +--- wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui 2011-04-13 22:28:07.000000000 +0200 ++++ wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py 2011-04-26 08:40:26.000000000 +0200 +@@ -29,7 +29,7 @@ from profiler import Profile_Get + import ed_msg + import plugin + import iface +-from extern import aui ++from wx.lib.agw import aui + import ed_book + + #--------------------------------------------------------------------------# diff --git a/wxPython-2.8.9.2-treelist.patch b/wxPython-2.8.9.2-treelist.patch deleted file mode 100644 index e7cf28b..0000000 --- a/wxPython-2.8.9.2-treelist.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp.orig 2009-04-10 23:03:18.000000000 +0200 -+++ wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp 2009-04-10 23:03:41.000000000 +0200 -@@ -10321,7 +10321,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_ - PyObject *resultobj = 0; - wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; -- wxTreeItemId const &arg3_defvalue = NULL ; -+ wxTreeItemId const &arg3_defvalue = (wxTreeItemId *) NULL ; - wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ; - bool arg4 = (bool) true ; - void *argp1 = 0 ; diff --git a/wxPython.spec b/wxPython.spec index cd99754..89a5b0d 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,8 +4,8 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.8.11.0 -Release: 2%{?dist} +Version: 2.8.12.0 +Release: 1%{?dist} Summary: GUI toolkit for the Python programming language @@ -13,11 +13,9 @@ Group: Development/Languages License: LGPLv2+ and wxWidgets URL: http://www.wxpython.org/ Source0: http://downloads.sourceforge.net/wxpython/%{name}-src-%{version}.tar.bz2 -# http://trac.wxwidgets.org/ticket/10703 -Patch0: wxPython-2.8.9.2-treelist.patch # fix aui imports # http://trac.wxwidgets.org/ticket/12107 -Patch1: wxPython-2.8.11.0-aui.patch +Patch0: wxPython-2.8.12.0-aui.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # make sure to keep this updated as appropriate BuildRequires: wxGTK-devel >= 2.8.11 @@ -59,8 +57,7 @@ Documentation, samples and demo application for wxPython. %prep %setup -q -n wxPython-src-%{version} -%patch0 -p1 -b .treelist -%patch1 -p1 -b .aui +%patch0 -p1 -b .aui # fix libdir otherwise additional wx libs cannot be found sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py @@ -119,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 26 2011 Dan Horák - 2.8.12.0-1 +- update to 2.8.12.0 (#699207) + * Sun Jul 11 2010 Lubomir Rintel - 2.8.11.0-2 - Include egg-info when build on recent RHEL