diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5017d43..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -wxPython-src-2.8.10.1.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 436fca0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wxPython -# $Id: Makefile,v 1.4 2005/12/21 13:19:54 mschwendt Exp $ -NAME := wxPython -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..fb13297 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Python 2 only - replaced by python-wxpython4 diff --git a/sources b/sources deleted file mode 100644 index 53956ee..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -65d5ef166f23fe8b4c67f58df164f93e wxPython-src-2.8.10.1.tar.bz2 diff --git a/wxPython-2.8.10-backport.patch b/wxPython-2.8.10-backport.patch deleted file mode 100644 index 0639913..0000000 --- a/wxPython-2.8.10-backport.patch +++ /dev/null @@ -1,390 +0,0 @@ -diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_core.py wxPython-src-2.8.10.1/wxPython/src/gtk/_core.py ---- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_core.py 2009-05-12 23:24:20.000000000 +0200 -+++ wxPython-src-2.8.10.1/wxPython/src/gtk/_core.py 2010-01-16 10:52:45.000000000 +0100 -@@ -6034,10 +6034,6 @@ class ShowEvent(Event): - """GetShow(self) -> bool""" - return _core_.ShowEvent_GetShow(*args, **kwargs) - -- def IsShown(*args, **kwargs): -- """IsShown(self) -> bool""" -- return _core_.ShowEvent_IsShown(*args, **kwargs) -- - Show = property(GetShow,SetShow,doc="See `GetShow` and `SetShow`") - _core_.ShowEvent_swigregister(ShowEvent) - -diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_core_wrap.cpp wxPython-src-2.8.10.1/wxPython/src/gtk/_core_wrap.cpp ---- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_core_wrap.cpp 2009-05-12 23:24:20.000000000 +0200 -+++ wxPython-src-2.8.10.1/wxPython/src/gtk/_core_wrap.cpp 2010-01-16 10:53:50.000000000 +0100 -@@ -28673,36 +28673,6 @@ fail: - } - - --SWIGINTERN PyObject *_wrap_ShowEvent_IsShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { -- PyObject *resultobj = 0; -- wxShowEvent *arg1 = (wxShowEvent *) 0 ; -- bool result; -- void *argp1 = 0 ; -- int res1 = 0 ; -- PyObject *swig_obj[1] ; -- -- if (!args) SWIG_fail; -- swig_obj[0] = args; -- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxShowEvent, 0 | 0 ); -- if (!SWIG_IsOK(res1)) { -- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShowEvent_IsShown" "', expected argument " "1"" of type '" "wxShowEvent const *""'"); -- } -- arg1 = reinterpret_cast< wxShowEvent * >(argp1); -- { -- PyThreadState* __tstate = wxPyBeginAllowThreads(); -- result = (bool)((wxShowEvent const *)arg1)->IsShown(); -- wxPyEndAllowThreads(__tstate); -- if (PyErr_Occurred()) SWIG_fail; -- } -- { -- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); -- } -- return resultobj; --fail: -- return NULL; --} -- -- - SWIGINTERN PyObject *ShowEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; -@@ -61296,7 +61266,6 @@ static PyMethodDef SwigMethods[] = { - { (char *)"new_ShowEvent", (PyCFunction) _wrap_new_ShowEvent, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ShowEvent_SetShow", (PyCFunction) _wrap_ShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"ShowEvent_GetShow", (PyCFunction)_wrap_ShowEvent_GetShow, METH_O, NULL}, -- { (char *)"ShowEvent_IsShown", (PyCFunction)_wrap_ShowEvent_IsShown, METH_O, NULL}, - { (char *)"ShowEvent_swigregister", ShowEvent_swigregister, METH_VARARGS, NULL}, - { (char *)"ShowEvent_swiginit", ShowEvent_swiginit, METH_VARARGS, NULL}, - { (char *)"new_IconizeEvent", (PyCFunction) _wrap_new_IconizeEvent, METH_VARARGS | METH_KEYWORDS, NULL}, -diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_gdi.py wxPython-src-2.8.10.1/wxPython/src/gtk/_gdi.py ---- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_gdi.py 2009-05-12 23:24:20.000000000 +0200 -+++ wxPython-src-2.8.10.1/wxPython/src/gtk/_gdi.py 2010-01-16 10:54:38.000000000 +0100 -@@ -3538,10 +3538,6 @@ class DC(_core.Object): - """ - return _gdi_.DC_SetClippingRect(*args, **kwargs) - -- def SetDeviceClippingRegion(*args, **kwargs): -- """SetDeviceClippingRegion(self, Region region)""" -- return _gdi_.DC_SetDeviceClippingRegion(*args, **kwargs) -- - def DrawLines(*args, **kwargs): - """ - DrawLines(self, List points, int xoffset=0, int yoffset=0) -@@ -5962,11 +5958,6 @@ class GraphicsRenderer(_core.Object): - return _gdi_.GraphicsRenderer_GetDefaultRenderer(*args, **kwargs) - - GetDefaultRenderer = staticmethod(GetDefaultRenderer) -- def GetCairoRenderer(*args, **kwargs): -- """GetCairoRenderer() -> GraphicsRenderer""" -- return _gdi_.GraphicsRenderer_GetCairoRenderer(*args, **kwargs) -- -- GetCairoRenderer = staticmethod(GetCairoRenderer) - def CreateContext(*args): - """ - CreateContext(self, WindowDC dc) -> GraphicsContext -diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_gdi_wrap.cpp wxPython-src-2.8.10.1/wxPython/src/gtk/_gdi_wrap.cpp ---- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_gdi_wrap.cpp 2009-05-12 23:24:20.000000000 +0200 -+++ wxPython-src-2.8.10.1/wxPython/src/gtk/_gdi_wrap.cpp 2010-01-16 11:00:47.000000000 +0100 -@@ -4171,12 +4171,6 @@ public : - "wx.GraphicsRenderer is not available on this platform."); - return NULL; - } -- static wxGraphicsRenderer* GetCairoRenderer() { -- PyErr_SetString(PyExc_NotImplementedError, -- "wx.GraphicsRenderer is not available on this platform."); -- return NULL; -- } -- - virtual wxGraphicsContext * CreateContext( const wxWindowDC& ) { return NULL; } - virtual wxGraphicsContext * CreateContextFromNativeContext( void * ) { return NULL; } - virtual wxGraphicsContext * CreateContextFromNativeWindow( void * ) { return NULL; } -@@ -20579,47 +20573,6 @@ fail: - } - - --SWIGINTERN PyObject *_wrap_DC_SetDeviceClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { -- PyObject *resultobj = 0; -- wxDC *arg1 = (wxDC *) 0 ; -- wxRegion *arg2 = 0 ; -- void *argp1 = 0 ; -- int res1 = 0 ; -- void *argp2 = 0 ; -- int res2 = 0 ; -- PyObject * obj0 = 0 ; -- PyObject * obj1 = 0 ; -- char * kwnames[] = { -- (char *) "self",(char *) "region", NULL -- }; -- -- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetDeviceClippingRegion",kwnames,&obj0,&obj1)) SWIG_fail; -- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); -- if (!SWIG_IsOK(res1)) { -- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetDeviceClippingRegion" "', expected argument " "1"" of type '" "wxDC *""'"); -- } -- arg1 = reinterpret_cast< wxDC * >(argp1); -- res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion, 0 | 0); -- if (!SWIG_IsOK(res2)) { -- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DC_SetDeviceClippingRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); -- } -- if (!argp2) { -- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DC_SetDeviceClippingRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); -- } -- arg2 = reinterpret_cast< wxRegion * >(argp2); -- { -- PyThreadState* __tstate = wxPyBeginAllowThreads(); -- (arg1)->SetDeviceClippingRegion((wxRegion const &)*arg2); -- wxPyEndAllowThreads(__tstate); -- if (PyErr_Occurred()) SWIG_fail; -- } -- resultobj = SWIG_Py_Void(); -- return resultobj; --fail: -- return NULL; --} -- -- - SWIGINTERN PyObject *_wrap_DC_DrawLines(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxDC *arg1 = (wxDC *) 0 ; -@@ -30753,22 +30706,6 @@ fail: - } - - --SWIGINTERN PyObject *_wrap_GraphicsRenderer_GetCairoRenderer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { -- PyObject *resultobj = 0; -- wxGraphicsRenderer *result = 0 ; -- -- if (!SWIG_Python_UnpackTuple(args,"GraphicsRenderer_GetCairoRenderer",0,0,0)) SWIG_fail; -- { -- result = (wxGraphicsRenderer *)wxGraphicsRenderer::GetCairoRenderer(); -- if (PyErr_Occurred()) SWIG_fail; -- } -- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsRenderer, 0 | 0 ); -- return resultobj; --fail: -- return NULL; --} -- -- - SWIGINTERN PyObject *_wrap_GraphicsRenderer_CreateContext__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { - PyObject *resultobj = 0; - wxGraphicsRenderer *arg1 = (wxGraphicsRenderer *) 0 ; -@@ -40069,7 +40006,6 @@ static PyMethodDef SwigMethods[] = { - { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS, NULL}, -- { (char *)"DC_SetDeviceClippingRegion", (PyCFunction) _wrap_DC_SetDeviceClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DC_DrawLines", (PyCFunction) _wrap_DC_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DC_DrawPolygon", (PyCFunction) _wrap_DC_DrawPolygon, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"DC_DrawLabel", (PyCFunction) _wrap_DC_DrawLabel, METH_VARARGS | METH_KEYWORDS, NULL}, -@@ -40341,7 +40277,6 @@ static PyMethodDef SwigMethods[] = { - { (char *)"GraphicsContext_swigregister", GraphicsContext_swigregister, METH_VARARGS, NULL}, - { (char *)"delete_GraphicsRenderer", (PyCFunction)_wrap_delete_GraphicsRenderer, METH_O, NULL}, - { (char *)"GraphicsRenderer_GetDefaultRenderer", (PyCFunction)_wrap_GraphicsRenderer_GetDefaultRenderer, METH_NOARGS, NULL}, -- { (char *)"GraphicsRenderer_GetCairoRenderer", (PyCFunction)_wrap_GraphicsRenderer_GetCairoRenderer, METH_NOARGS, NULL}, - { (char *)"GraphicsRenderer_CreateContext", _wrap_GraphicsRenderer_CreateContext, METH_VARARGS, NULL}, - { (char *)"GraphicsRenderer_CreateMeasuringContext", (PyCFunction)_wrap_GraphicsRenderer_CreateMeasuringContext, METH_O, NULL}, - { (char *)"GraphicsRenderer_CreateContextFromNativeContext", (PyCFunction) _wrap_GraphicsRenderer_CreateContextFromNativeContext, METH_VARARGS | METH_KEYWORDS, NULL}, -diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/xrc.py wxPython-src-2.8.10.1/wxPython/src/gtk/xrc.py ---- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/xrc.py 2009-05-12 23:24:20.000000000 +0200 -+++ wxPython-src-2.8.10.1/wxPython/src/gtk/xrc.py 2010-01-16 11:02:40.000000000 +0100 -@@ -441,18 +441,6 @@ class XmlNode(object): - """SetProperties(self, XmlProperty prop)""" - return _xrc.XmlNode_SetProperties(*args, **kwargs) - -- def GetAttribute(*args, **kwargs): -- """GetAttribute(self, String attrName, String defaultVal) -> String""" -- return _xrc.XmlNode_GetAttribute(*args, **kwargs) -- -- def AddAttribute(*args, **kwargs): -- """AddAttribute(self, String attrName, String value)""" -- return _xrc.XmlNode_AddAttribute(*args, **kwargs) -- -- def GetAttributes(*args, **kwargs): -- """GetAttributes(self) -> XmlProperty""" -- return _xrc.XmlNode_GetAttributes(*args, **kwargs) -- - Children = property(GetChildren,SetChildren,doc="See `GetChildren` and `SetChildren`") - Content = property(GetContent,SetContent,doc="See `GetContent` and `SetContent`") - Name = property(GetName,SetName,doc="See `GetName` and `SetName`") -diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/xrc_wrap.cpp wxPython-src-2.8.10.1/wxPython/src/gtk/xrc_wrap.cpp ---- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/xrc_wrap.cpp 2009-05-12 23:24:20.000000000 +0200 -+++ wxPython-src-2.8.10.1/wxPython/src/gtk/xrc_wrap.cpp 2010-01-16 11:03:14.000000000 +0100 -@@ -6361,163 +6361,6 @@ fail: - } - - --SWIGINTERN PyObject *_wrap_XmlNode_GetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { -- PyObject *resultobj = 0; -- wxXmlNode *arg1 = (wxXmlNode *) 0 ; -- wxString *arg2 = 0 ; -- wxString *arg3 = 0 ; -- wxString result; -- void *argp1 = 0 ; -- int res1 = 0 ; -- bool temp2 = false ; -- bool temp3 = false ; -- PyObject * obj0 = 0 ; -- PyObject * obj1 = 0 ; -- PyObject * obj2 = 0 ; -- char * kwnames[] = { -- (char *) "self",(char *) "attrName",(char *) "defaultVal", NULL -- }; -- -- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:XmlNode_GetAttribute",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; -- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); -- if (!SWIG_IsOK(res1)) { -- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetAttribute" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); -- } -- arg1 = reinterpret_cast< wxXmlNode * >(argp1); -- { -- arg2 = wxString_in_helper(obj1); -- if (arg2 == NULL) SWIG_fail; -- temp2 = true; -- } -- { -- arg3 = wxString_in_helper(obj2); -- if (arg3 == NULL) SWIG_fail; -- temp3 = true; -- } -- { -- PyThreadState* __tstate = wxPyBeginAllowThreads(); -- result = ((wxXmlNode const *)arg1)->GetAttribute((wxString const &)*arg2,(wxString const &)*arg3); -- wxPyEndAllowThreads(__tstate); -- if (PyErr_Occurred()) SWIG_fail; -- } -- { --#if wxUSE_UNICODE -- resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); --#else -- resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); --#endif -- } -- { -- if (temp2) -- delete arg2; -- } -- { -- if (temp3) -- delete arg3; -- } -- return resultobj; --fail: -- { -- if (temp2) -- delete arg2; -- } -- { -- if (temp3) -- delete arg3; -- } -- return NULL; --} -- -- --SWIGINTERN PyObject *_wrap_XmlNode_AddAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { -- PyObject *resultobj = 0; -- wxXmlNode *arg1 = (wxXmlNode *) 0 ; -- wxString *arg2 = 0 ; -- wxString *arg3 = 0 ; -- void *argp1 = 0 ; -- int res1 = 0 ; -- bool temp2 = false ; -- bool temp3 = false ; -- PyObject * obj0 = 0 ; -- PyObject * obj1 = 0 ; -- PyObject * obj2 = 0 ; -- char * kwnames[] = { -- (char *) "self",(char *) "attrName",(char *) "value", NULL -- }; -- -- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:XmlNode_AddAttribute",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; -- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); -- if (!SWIG_IsOK(res1)) { -- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_AddAttribute" "', expected argument " "1"" of type '" "wxXmlNode *""'"); -- } -- arg1 = reinterpret_cast< wxXmlNode * >(argp1); -- { -- arg2 = wxString_in_helper(obj1); -- if (arg2 == NULL) SWIG_fail; -- temp2 = true; -- } -- { -- arg3 = wxString_in_helper(obj2); -- if (arg3 == NULL) SWIG_fail; -- temp3 = true; -- } -- { -- PyThreadState* __tstate = wxPyBeginAllowThreads(); -- (arg1)->AddAttribute((wxString const &)*arg2,(wxString const &)*arg3); -- wxPyEndAllowThreads(__tstate); -- if (PyErr_Occurred()) SWIG_fail; -- } -- resultobj = SWIG_Py_Void(); -- { -- if (temp2) -- delete arg2; -- } -- { -- if (temp3) -- delete arg3; -- } -- return resultobj; --fail: -- { -- if (temp2) -- delete arg2; -- } -- { -- if (temp3) -- delete arg3; -- } -- return NULL; --} -- -- --SWIGINTERN PyObject *_wrap_XmlNode_GetAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { -- PyObject *resultobj = 0; -- wxXmlNode *arg1 = (wxXmlNode *) 0 ; -- wxXmlProperty *result = 0 ; -- void *argp1 = 0 ; -- int res1 = 0 ; -- PyObject *swig_obj[1] ; -- -- if (!args) SWIG_fail; -- swig_obj[0] = args; -- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); -- if (!SWIG_IsOK(res1)) { -- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetAttributes" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); -- } -- arg1 = reinterpret_cast< wxXmlNode * >(argp1); -- { -- PyThreadState* __tstate = wxPyBeginAllowThreads(); -- result = (wxXmlProperty *)((wxXmlNode const *)arg1)->GetAttributes(); -- wxPyEndAllowThreads(__tstate); -- if (PyErr_Occurred()) SWIG_fail; -- } -- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxXmlProperty, 0 | 0 ); -- return resultobj; --fail: -- return NULL; --} -- -- - SWIGINTERN PyObject *XmlNode_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; -@@ -9050,9 +8893,6 @@ static PyMethodDef SwigMethods[] = { - { (char *)"XmlNode_SetNext", (PyCFunction) _wrap_XmlNode_SetNext, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"XmlNode_SetChildren", (PyCFunction) _wrap_XmlNode_SetChildren, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"XmlNode_SetProperties", (PyCFunction) _wrap_XmlNode_SetProperties, METH_VARARGS | METH_KEYWORDS, NULL}, -- { (char *)"XmlNode_GetAttribute", (PyCFunction) _wrap_XmlNode_GetAttribute, METH_VARARGS | METH_KEYWORDS, NULL}, -- { (char *)"XmlNode_AddAttribute", (PyCFunction) _wrap_XmlNode_AddAttribute, METH_VARARGS | METH_KEYWORDS, NULL}, -- { (char *)"XmlNode_GetAttributes", (PyCFunction)_wrap_XmlNode_GetAttributes, METH_O, NULL}, - { (char *)"XmlNode_swigregister", XmlNode_swigregister, METH_VARARGS, NULL}, - { (char *)"XmlNode_swiginit", XmlNode_swiginit, METH_VARARGS, NULL}, - { (char *)"new_XmlDocument", (PyCFunction) _wrap_new_XmlDocument, METH_VARARGS | METH_KEYWORDS, NULL}, 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 deleted file mode 100644 index 0dc4acb..0000000 --- a/wxPython.spec +++ /dev/null @@ -1,260 +0,0 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%define buildflags WXPORT=gtk2 UNICODE=1 - -Name: wxPython -Version: 2.8.10.1 -Release: 1%{?dist} - -Summary: GUI toolkit for the Python programming language - -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 -# backport to wxGTK 2.8.10 API -Patch1: wxPython-2.8.10-backport.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# make sure to keep this updated as appropriate -BuildRequires: wxGTK-devel >= 2.8.10 -BuildRequires: python-devel - -# packages should depend on "wxPython", not "wxPythonGTK2", but in case -# one does, here's the provides for it. -Provides: wxPythonGTK2 = %{version}-%{release} - -%description -wxPython is a GUI toolkit for the Python programming language. It allows -Python programmers to create programs with a robust, highly functional -graphical user interface, simply and easily. It is implemented as a Python -extension module (native code) that wraps the popular wxWindows cross -platform GUI library, which is written in C++. - -%package devel -Group: Development/Libraries -Summary: Development files for wxPython add-on modules -Requires: %{name} = %{version}-%{release} -Requires: wxGTK-devel - -%description devel -This package includes C++ header files and SWIG files needed for developing -add-on modules for wxPython. It is NOT needed for development of most -programs which use the wxPython toolkit. - -%package docs -Group: Documentation -Summary: Documentation and samples for wxPython -Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} > 9 -BuildArch: noarch -%endif - -%description docs -Documentation, samples and demo application for wxPython. - - -%prep -%setup -q -n wxPython-src-%{version} -%patch0 -p1 -b .treelist -%patch1 -p1 - -# fix libdir otherwise additional wx libs cannot be found -sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py - - -%build -# Just build the wxPython part, not all of wxWindows which we already have -# in Fedora -cd wxPython -# included distutils is not multilib aware; use normal -rm -rf distutils -python setup.py %{buildflags} build - - -%install -rm -rf $RPM_BUILD_ROOT -cd wxPython -python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT - -# this is a kludge.... -%if "%{python_sitelib}" != "%{python_sitearch}" -mv $RPM_BUILD_ROOT%{python_sitelib}/wx.pth $RPM_BUILD_ROOT%{python_sitearch} -mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitearch} -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc wxPython/licence -%{_bindir}/* -%{python_sitearch}/wx.pth -%{python_sitearch}/wxversion.py* -%dir %{python_sitearch}/wx-2.8-gtk2-unicode/ -%{python_sitearch}/wx-2.8-gtk2-unicode/wx -%{python_sitearch}/wx-2.8-gtk2-unicode/wxPython -%if 0%{?fedora} >= 9 -%{python_sitelib}/*egg-info -%{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info -%endif - -%files devel -%defattr(-,root,root,-) -%dir %{_includedir}/wx-2.8/wx/wxPython -%{_includedir}/wx-2.8/wx/wxPython/*.h -%dir %{_includedir}/wx-2.8/wx/wxPython/i_files -%{_includedir}/wx-2.8/wx/wxPython/i_files/*.i -%{_includedir}/wx-2.8/wx/wxPython/i_files/*.py* -%{_includedir}/wx-2.8/wx/wxPython/i_files/*.swg - -%files docs -%defattr(-,root,root,-) -%doc wxPython/docs wxPython/demo wxPython/samples - - -%changelog -* Sat Jan 16 2010 Dan Horák - 2.8.10.1-1 -- update to 2.8.10.1 -- backport to wxGTK 2.8.10 API -- cleaned up BRs - -* Thu Jan 7 2010 Hans de Goede - 2.8.9.2-4 -- Change python_foo macros to use %%global as the new rpm will break - using %%define here, see: - https://www.redhat.com/archives/fedora-devel-list/2010-January/msg00093.html - -* Mon Jul 27 2009 Fedora Release Engineering - 2.8.9.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Apr 10 2009 Dan Horák - 2.8.9.2-2 -- add patch to fix compile failure for contrib/gizmos/_treelist.i - -* Fri Apr 10 2009 Dan Horák - 2.8.9.2-1 -- update to 2.8.9.2 -- create noarch docs subpackage - -* Thu Mar 5 2009 Lubomir Rintel - 2.8.9.1-4 -- Rebuilt for newer wxgtk package - -* Wed Feb 25 2009 Fedora Release Engineering - 2.8.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.8.9.1-2 -- Rebuild for Python 2.6 - -* Tue Sep 30 2008 Dan Horak - 2.8.9.1-1 -- update to 2.8.9.1 -- fix libdir for additional wx libraries (#306761) - -* Mon Sep 29 2008 Dan Horak - 2.8.9.0-1 -- update to 2.8.9.0 - -* Sat Sep 6 2008 Tom "spot" Callaway - 2.8.8.0-2 -- fix license tag - -* Thu Jul 31 2008 Matthew Miller - 2.8.8.0-1 -- update to 2.8.8.0 (bug #457408) -- a fix for bug #450073 is included in the upstream release, so - dropping that patch. - -* Thu Jun 12 2008 Hans de Goede - 2.8.7.1-5 -- Fix an attribute error when importing wxPython (compat) module - (redhat bugzilla 450073, 450074) - -* Sat Jun 6 2008 Matthew Miller - 2.8.7.1-4 -- gratuitously bump package release number to work around build system - glitch. again, but it will work this time. - -* Wed Jun 4 2008 Matthew Miller - 2.8.7.1-3 -- gratuitously bump package release number to work around build system - glitch - -* Thu Feb 21 2008 Matthew Miller - 2.8.7.1-2 -- include egg-info files for fedora 9 or greater - -* Wed Feb 20 2008 Matthew Miller - 2.8.7.1-1 -- update to 2.8.7.1 - -* Tue Feb 19 2008 Fedora Release Engineering - 2.8.4.0-3 -- Autorebuild for GCC 4.3 - -* Wed Aug 29 2007 Fedora Release Engineering - 2.8.4.0-2 -- Rebuild for selinux ppc32 issue. - -* Wed Jul 11 2007 Matthew Miller - 2.8.4.0-1 -- update to 2.8.4.0 -- obsolete compat-wxPythonGTK - -* Sun Apr 15 2007 Matthew Miller - 2.8.3.0-1 -- update to 2.8.3.0 - -* Fri Dec 15 2006 Matthew Miller - 2.8.0.1-1 -- update to 2.8.0.1 -- make buildrequire wxGTK of version-wxpythonsubrelease -- add wxaddons to filelist - -* Mon Dec 11 2006 Matthew Miller - 2.6.3.2-3 -- bump release for rebuild against python 2.5. - -* Mon Aug 28 2006 Matthew Miller - 2.6.3.2-2 -- bump release for FC6 rebuild - -* Thu Apr 13 2006 Matthew Miller - 2.6.3.2-1 -- version 2.6.3.2 -- move wxversion.py _into_ lib64. Apparently that's the right thing to do. :) -- upstream tarball no longer includes embedded.o (since I finally got around - to pointing that out to the developers instead of just kludging it away.) -- buildrequires to just libGLU-devel instead of mesa-libGL-devel - -* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-4 -- grr. bump relnumber. - -* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-3 -- oh yeah -- wxversion.py not lib64. - -* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-2 -- buildrequires mesa-libGLU-devel - -* Thu Mar 30 2006 Matthew Miller - 2.6.3.0-1 -- update to 2.6.3.0 -- wxGTK and wxPython versions are inexorably linked; make BuildRequires - be exact, rather than >=. -- make devel subpackage as per comment #7 in bug #163440. - -* Thu Nov 24 2005 Matthew Miller - 2.6.1.0-1 -- update to 2.6.0.0 -- merge in changes from current extras 2.4.x package -- Happy Thanksgiving -- build animate extention again -- works now. - -* Thu Apr 28 2005 Matthew Miller - 2.6.0.0-bu45.1 -- get rid of accidental binaries in source tarball -- they generates - spurious dependencies and serve no purpose -- update to 2.6.0.0 and build for Velouria -- switch to Fedora Extras base spec file -- enable gtk2 and unicode and all the code stuff (as FE does) -- disable BUILD_ANIMATE extension from contrib -- doesn't build -- files are in a different location now -- adjust to that -- zap include files (needed only for building wxPython 3rd-party modules), - because I don't think this is likely to be very useful. Other option - would be to create a -devel package, but I think that'd be confusing. - -* Tue Feb 08 2005 Thorsten Leemhuis 0:2.4.2.4-4 -- remove included disutils - it is not multilib aware; this - fixes build on x86_64 - -* Tue Jan 06 2004 Panu Matilainen 0:2.4.2.4-0.fdr.3 -- rename package to wxPythonGTK2, provide wxPython (see bug 927) -- dont ship binaries in /usr/share - -* Thu Nov 20 2003 Panu Matilainen 0:2.4.2.4-0.fdr.2 -- add missing buildrequires: python-devel, wxGTK2-gl - -* Sun Nov 02 2003 Panu Matilainen 0:2.4.2.4-0.fdr.1 -- Initial RPM release. -~