rpms/wxPython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New upstream release 3.0.2.0, built against wxGTK3

Browse source
This commit is contained in:
Scott Talbert 2015-01-03 12:53:27 -05:00
commit b91dc38d2c
3 changed files with 446 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

160
fix-editra-removal.patch Normal file
View file

@ -0,0 +1,160 @@
diff --git a/wxPython/distrib/DIRLIST b/wxPython/distrib/DIRLIST
index 688d0d1..82dd00d 100644
--- a/wxPython/distrib/DIRLIST
+++ b/wxPython/distrib/DIRLIST
@@ -149,104 +149,5 @@ wx/tools/XRCed/misc/src-images
wx/tools/XRCed/plugins
wx/tools/XRCed/plugins/bitmaps
wx/tools/XRCed/plugins/src-images
-wx/tools/Editra
-wx/tools/Editra/docs
-wx/tools/Editra/include
-wx/tools/Editra/include/python2.5
-wx/tools/Editra/include/python2.5/darwin
-wx/tools/Editra/include/python2.5/win32
-wx/tools/Editra/locale
-wx/tools/Editra/locale/ca_ES@valencia
-wx/tools/Editra/locale/ca_ES@valencia/LC_MESSAGES
-wx/tools/Editra/locale/cs_CZ
-wx/tools/Editra/locale/cs_CZ/LC_MESSAGES
-wx/tools/Editra/locale/da_DK
-wx/tools/Editra/locale/da_DK/LC_MESSAGES
-wx/tools/Editra/locale/de_DE
-wx/tools/Editra/locale/de_DE/LC_MESSAGES
-wx/tools/Editra/locale/en_US
-wx/tools/Editra/locale/en_US/LC_MESSAGES
-wx/tools/Editra/locale/es_ES
-wx/tools/Editra/locale/es_ES/LC_MESSAGES
-wx/tools/Editra/locale/fr_FR
-wx/tools/Editra/locale/fr_FR/LC_MESSAGES
-wx/tools/Editra/locale/gl_ES
-wx/tools/Editra/locale/gl_ES/LC_MESSAGES
-wx/tools/Editra/locale/it_IT
-wx/tools/Editra/locale/it_IT/LC_MESSAGES
-wx/tools/Editra/locale/hr_HR
-wx/tools/Editra/locale/hr_HR/LC_MESSAGES
-wx/tools/Editra/locale/hu_HU
-wx/tools/Editra/locale/hu_HU/LC_MESSAGES
-wx/tools/Editra/locale/ja_JP
-wx/tools/Editra/locale/ja_JP/LC_MESSAGES
-wx/tools/Editra/locale/lv_LV
-wx/tools/Editra/locale/lv_LV/LC_MESSAGES
-wx/tools/Editra/locale/nl_NL
-wx/tools/Editra/locale/nl_NL/LC_MESSAGES
-wx/tools/Editra/locale/nn_NO
-wx/tools/Editra/locale/nn_NO/LC_MESSAGES
-wx/tools/Editra/locale/pl_PL
-wx/tools/Editra/locale/pl_PL/LC_MESSAGES
-wx/tools/Editra/locale/pt_BR
-wx/tools/Editra/locale/pt_BR/LC_MESSAGES
-wx/tools/Editra/locale/ro_RO
-wx/tools/Editra/locale/ro_RO/LC_MESSAGES
-wx/tools/Editra/locale/ru_RU
-wx/tools/Editra/locale/ru_RU/LC_MESSAGES
-wx/tools/Editra/locale/sk_SK
-wx/tools/Editra/locale/sk_SK/LC_MESSAGES
-wx/tools/Editra/locale/sl_SI
-wx/tools/Editra/locale/sl_SI/LC_MESSAGES
-wx/tools/Editra/locale/sr_RS
-wx/tools/Editra/locale/sr_RS/LC_MESSAGES
-wx/tools/Editra/locale/sv_SE
-wx/tools/Editra/locale/sv_SE/LC_MESSAGES
-wx/tools/Editra/locale/tr_TR
-wx/tools/Editra/locale/tr_TR/LC_MESSAGES
-wx/tools/Editra/locale/uk_UA
-wx/tools/Editra/locale/uk_UA/LC_MESSAGES
-wx/tools/Editra/locale/zh_CN
-wx/tools/Editra/locale/zh_CN/LC_MESSAGES
-wx/tools/Editra/locale/zh_TW
-wx/tools/Editra/locale/zh_TW/LC_MESSAGES
-wx/tools/Editra/pixmaps
-wx/tools/Editra/pixmaps/theme
-wx/tools/Editra/pixmaps/theme/Default
-wx/tools/Editra/pixmaps/theme/Tango
-wx/tools/Editra/pixmaps/theme/Tango/menu
-wx/tools/Editra/pixmaps/theme/Tango/mime
-wx/tools/Editra/pixmaps/theme/Tango/other
-wx/tools/Editra/pixmaps/theme/Tango/toolbar
-wx/tools/Editra/pixmaps/theme/Tango/other
-wx/tools/Editra/plugins
-wx/tools/Editra/plugins/codebrowser
-wx/tools/Editra/plugins/codebrowser/codebrowser
-wx/tools/Editra/plugins/codebrowser/codebrowser/gentag
-wx/tools/Editra/plugins/filebrowser
-wx/tools/Editra/plugins/filebrowser/filebrowser
-wx/tools/Editra/plugins/hello
-wx/tools/Editra/plugins/hello/hello
-wx/tools/Editra/plugins/Launch
-wx/tools/Editra/plugins/Launch/launch
-wx/tools/Editra/plugins/pyshell
-wx/tools/Editra/plugins/pyshell/pyshell
-wx/tools/Editra/scripts
-wx/tools/Editra/scripts/i18n
-wx/tools/Editra/src
-wx/tools/Editra/src/autocomp
-wx/tools/Editra/src/ebmlib
-wx/tools/Editra/src/eclib
-wx/tools/Editra/src/extern
-wx/tools/Editra/src/extern/aui
-wx/tools/Editra/src/extern/pygments
-wx/tools/Editra/src/extern/pygments/filters
-wx/tools/Editra/src/extern/pygments/formatters
-wx/tools/Editra/src/extern/pygments/lexers
-wx/tools/Editra/src/extern/pygments/styles
-wx/tools/Editra/src/syntax
-wx/tools/Editra/styles
-wx/tools/Editra/templates
-wx/tools/Editra/tests/syntax
wxversion
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 35ce514..76fe6d1 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -897,13 +897,6 @@ WX_PKGLIST = [ 'wx',
'wx.tools',
'wx.tools.XRCed',
'wx.tools.XRCed.plugins',
- 'wx.tools.Editra',
- 'wx.tools.Editra.src',
- 'wx.tools.Editra.src.autocomp',
- 'wx.tools.Editra.src.eclib',
- 'wx.tools.Editra.src.ebmlib',
- 'wx.tools.Editra.src.extern',
- 'wx.tools.Editra.src.syntax',
]
@@ -921,7 +914,6 @@ else:
opj('scripts/pywrap'),
opj('scripts/pywxrc'),
opj('scripts/xrced'),
- opj('scripts/editra'),
]
if os.name == 'nt':
SCRIPTS.append( opj('scripts/genaxmodule') )
@@ -936,16 +928,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
-
## import pprint
## pprint.pprint(DATA_FILES)
@@ -995,7 +977,6 @@ if EGGing:
'pyshell = wx.py.PyShell:main',
'pywrap = wx.py.PyWrap:main',
'helpviewer = wx.tools.helpviewer:main',
- 'editra = wx.tools.Editra.launcher:main',
'xrced = wx.tools.XRCed.xrced:main',
],
},

264
wxPython-3.0.0.0-format.patch Normal file
View file

@ -0,0 +1,264 @@
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp wxPython-src-3.0.0.0/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp 2013-12-16 08:52:12.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp 2014-09-04 22:58:04.035387024 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/animate_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/animate_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/animate_wrap.cpp 2013-12-16 08:51:56.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/animate_wrap.cpp 2014-09-04 22:58:04.075387422 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/aui_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/aui_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/aui_wrap.cpp 2013-12-28 04:28:56.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/aui_wrap.cpp 2014-09-04 22:58:04.080387472 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/calendar_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/calendar_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/calendar_wrap.cpp 2013-12-16 08:51:28.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/calendar_wrap.cpp 2014-09-04 22:58:04.082387492 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/combo_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/combo_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/combo_wrap.cpp 2013-12-16 08:51:32.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/combo_wrap.cpp 2014-09-04 22:58:04.084387512 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_controls_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/_controls_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_controls_wrap.cpp 2013-12-16 08:51:23.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/_controls_wrap.cpp 2014-09-04 22:58:04.094387611 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_core_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/_core_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_core_wrap.cpp 2013-12-28 04:18:40.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/_core_wrap.cpp 2014-09-04 22:58:04.062387293 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/dataview_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/dataview_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/dataview_wrap.cpp 2013-12-16 08:51:45.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/dataview_wrap.cpp 2014-09-04 23:00:27.042820179 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_gdi_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/_gdi_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_gdi_wrap.cpp 2013-12-16 08:51:16.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/_gdi_wrap.cpp 2014-09-04 22:58:04.073387402 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/glcanvas_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/glcanvas_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/glcanvas_wrap.cpp 2013-12-16 08:52:07.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/glcanvas_wrap.cpp 2014-09-04 22:58:04.037387044 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/grid_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/grid_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/grid_wrap.cpp 2013-12-16 08:51:35.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/grid_wrap.cpp 2014-09-04 22:58:04.100387671 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/html2_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/html2_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/html2_wrap.cpp 2013-12-28 04:28:56.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/html2_wrap.cpp 2014-09-04 23:01:00.379154803 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/html_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/html_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/html_wrap.cpp 2013-12-16 08:51:38.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/html_wrap.cpp 2014-09-04 22:58:04.104387710 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/media_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/media_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/media_wrap.cpp 2013-12-16 08:51:39.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/media_wrap.cpp 2014-09-04 22:58:04.106387730 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_misc_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/_misc_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_misc_wrap.cpp 2013-12-28 04:18:47.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/_misc_wrap.cpp 2014-09-04 22:58:04.113387800 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/propgrid_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/propgrid_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/propgrid_wrap.cpp 2013-12-16 08:52:01.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/propgrid_wrap.cpp 2014-09-04 23:01:26.082412807 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/richtext_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/richtext_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/richtext_wrap.cpp 2013-12-16 08:51:52.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/richtext_wrap.cpp 2014-09-04 22:58:04.122387890 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/stc_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/stc_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/stc_wrap.cpp 2013-12-16 08:52:06.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/stc_wrap.cpp 2014-09-04 22:58:04.045387124 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/webkit_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/webkit_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/webkit_wrap.cpp 2013-12-16 08:51:41.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/webkit_wrap.cpp 2014-09-04 22:58:04.124387909 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_windows_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/_windows_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/_windows_wrap.cpp 2013-12-16 08:51:19.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/_windows_wrap.cpp 2014-09-04 22:58:04.131387979 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/wizard_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/wizard_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/wizard_wrap.cpp 2013-12-16 08:51:43.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/wizard_wrap.cpp 2014-09-04 22:58:04.134388009 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}
diff -Nrup wxPython-src-3.0.0.0.orig/wxPython/src/gtk/xrc_wrap.cpp wxPython-src-3.0.0.0/wxPython/src/gtk/xrc_wrap.cpp
--- wxPython-src-3.0.0.0.orig/wxPython/src/gtk/xrc_wrap.cpp 2013-12-16 08:51:46.000000000 -0500
+++ wxPython-src-3.0.0.0/wxPython/src/gtk/xrc_wrap.cpp 2014-09-04 22:58:04.136388029 -0400
@@ -861,7 +861,7 @@ SWIG_Python_AddErrorMsg(const char* mesg
Py_DECREF(old_str);
Py_DECREF(value);
} else {
- PyErr_Format(PyExc_RuntimeError, mesg);
+ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
}
}

46
wxPython.spec
View file

@ -1,11 +1,11 @@
%{!?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
%define buildflags WX_CONFIG=/usr/bin/wx-config-3.0 WXPORT=gtk3
Name: wxPython
Version: 2.8.12.0
Release: 8%{?dist}
Version: 3.0.2.0
Release: 1%{?dist}
Summary: GUI toolkit for the Python programming language
@ -13,18 +13,14 @@ Group: Development/Languages
License: LGPLv2+ and wxWidgets
URL: http://www.wxpython.org/
Source0: http://downloads.sourceforge.net/wxpython/%{name}-src-%{version}.tar.bz2
# fix aui imports
# http://trac.wxwidgets.org/ticket/12107
Patch0: wxPython-2.8.12.0-aui.patch
Patch1: wxPython-2.8.12.0-format.patch
# Remove Editra - it doesn't work and is technically a bundle. Thanks to
# Debian for the patch.
Patch0: fix-editra-removal.patch
Patch1: wxPython-3.0.0.0-format.patch
# make sure to keep this updated as appropriate
BuildRequires: wxGTK-devel >= 2.8.11
BuildRequires: wxGTK3-devel >= 3.0.0
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
@ -36,7 +32,7 @@ platform GUI library, which is written in C++.
Group: Development/Libraries
Summary: Development files for wxPython add-on modules
Requires: %{name} = %{version}-%{release}
Requires: wxGTK-devel
Requires: wxGTK3-devel
%description devel
This package includes C++ header files and SWIG files needed for developing
@ -57,7 +53,7 @@ Documentation, samples and demo application for wxPython.
%prep
%setup -q -n wxPython-src-%{version}
%patch0 -p1 -b .aui
%patch0 -p1 -b .editra-removal
%patch1 -p1 -b .format
# fix libdir otherwise additional wx libs cannot be found, fix default optimization flags
@ -89,27 +85,29 @@ mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitear
%{_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
%dir %{python_sitearch}/wx-3.0-gtk3/
%{python_sitearch}/wx-3.0-gtk3/wx
%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
%{python_sitelib}/*egg-info
%{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info
%{python_sitearch}/wx-3.0-gtk3/*egg-info
%endif
%files devel
%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
%dir %{_includedir}/wx-3.0/wx/wxPython
%{_includedir}/wx-3.0/wx/wxPython/*.h
%dir %{_includedir}/wx-3.0/wx/wxPython/i_files
%{_includedir}/wx-3.0/wx/wxPython/i_files/*.i
%{_includedir}/wx-3.0/wx/wxPython/i_files/*.py*
%{_includedir}/wx-3.0/wx/wxPython/i_files/*.swg
%files docs
%doc wxPython/docs wxPython/demo wxPython/samples
%changelog
* Tue Dec 23 2014 Scott Talbert <swt@techie.net> - 3.0.2.0-1
- New upstream release 3.0.2.0, built against wxGTK3
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild