rpm/python-wxPython
SHA256
1
0
Fork 0
forked from pool/python-wxPython
Code Pull Requests Activity

Accepting request 616403 from home:TheBlackCat:branches:X11:wxWidgets

Browse Source 
- Add fix_no_return_in_nonvoid.patch
  Fix lack of return in non-void function issue in generated sip
  bindings.

OBS-URL: https://build.opensuse.org/request/show/616403
OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/python-wxPython?expand=0&rev=5
This commit is contained in:
Todd R 2018-06-13 03:44:24 +00:00 committed by Git OBS Bridge
parent 95b4a26c15
commit 091834ce21
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fix_no_return_in_nonvoid.patch Normal file
View File

@ -0,0 +1,20 @@
diff -U 3 -H -w -E -d -r -x .osc -- a/sip/cpp/sip_corewxTextCtrl.cpp b/sip/cpp/sip_corewxTextCtrl.cpp
--- a/sip/cpp/sip_corewxTextCtrl.cpp
+++ b/sip/cpp/sip_corewxTextCtrl.cpp
@@ -55,12 +55,16 @@
{
#ifdef __WXMSW__
return self->ShowNativeCaret(show);
+ #else
+ return false;
#endif
}
bool _wxTextCtrl_HideNativeCaret(wxTextCtrl* self)
{
#ifdef __WXMSW__
return self->HideNativeCaret();
+ #else
+ return false;
#endif
}
void _wxTextCtrl_write(wxTextCtrl* self, const wxString* text)

7
python-wxPython.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 13 03:42:38 UTC 2018 - toddrme2178@gmail.com
- Add fix_no_return_in_nonvoid.patch
Fix lack of return in non-void function issue in generated sip
bindings.
-------------------------------------------------------------------
Mon Jun 4 09:11:22 UTC 2018 - petr@cervinka.net

4
python-wxPython.spec
View File

@ -35,6 +35,8 @@ Group: Development/Languages/Python
URL: https://github.com/wxWidgets/Phoenix
Source: https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-%{version}.tar.gz
Source1: python-wxPython-rpmlintrc
# PATCH-FIX-OPENSUSE fix_no_return_in_nonvoid.patch -- Fix lack of return in nonvoid functions
Patch0: fix_no_return_in_nonvoid.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module requests}
BuildRequires: %{python_module setuptools}
@ -74,6 +76,7 @@ BuildRequires: %{python_module six}
Conflicts: %{oldpython}-wxWidgets
Provides: %{oldpython}-wxWidgets = %{version}
%endif
%python_subpackages
%description
@ -98,6 +101,7 @@ Provides translations to the package %{name}.
%prep
%setup -q -n wxPython-%{version}
%patch0 -p1
sed -i -e '/^#!\//, 1d' wx/py/*.py
sed -i -e '/^#!\//, 1d' wx/tools/*.py
sed -i -e '/^#!\//, 1d' wx/py/tests/*.py