diff options
author | John Marino <marino@FreeBSD.org> | 2015-04-14 06:43:09 +0000 |
---|---|---|
committer | John Marino <marino@FreeBSD.org> | 2015-04-14 06:43:09 +0000 |
commit | 4040163bd62437e9b7cabd967ef203e53d3601c0 (patch) | |
tree | d4c3d385ff7c2a88a7612707b7c1677c28ec5845 /x11-toolkits/py-wxPython30/files | |
parent | multimedia/handbrake: fix X11_DESC (diff) |
x11-toolkits/py-wxPython30: Fix c++ code, drop gcc requirement
While here, upgrade from version 3.0.0 to 3.0.2
wxPython30 was obligated to build under c++11 standards, but the code
was not compliant. It now builds on system clang again.
PR: 199403
Submitted by: matthew (reztec.cz)
Approved by: blanket (fixes previous "fix")
Notes
Notes:
svn path=/head/; revision=383979
Diffstat (limited to '')
-rw-r--r-- | x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp | 20 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp | 11 |
2 files changed, 31 insertions, 0 deletions
diff --git a/x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp b/x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp new file mode 100644 index 000000000000..db664746c2a8 --- /dev/null +++ b/x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp @@ -0,0 +1,20 @@ +--- src/gtk/_gdi_wrap.cpp.orig 2015-04-12 18:02:36 UTC ++++ src/gtk/_gdi_wrap.cpp +@@ -3856,7 +3856,7 @@ const wxString& wxPyLocale::GetSingularS + const wxString& domain) const + { + bool found; +- wxString str( _T("error in translation")); ++ static wxString str( _T("error in translation")); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if ((found=wxPyCBH_findCallback(m_myInst, "GetSingularString"))) { + PyObject* param1 = wx2PyString(origString); +@@ -3878,7 +3878,7 @@ const wxString& wxPyLocale::GetPluralStr + const wxString& domain) const + { + bool found; +- wxString str( _T("error in translation")); ++ static wxString str( _T("error in translation")); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + if ((found=wxPyCBH_findCallback(m_myInst, "GetPluralString"))) { + PyObject* param1 = wx2PyString(origString); diff --git a/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp b/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp new file mode 100644 index 000000000000..420b68033a70 --- /dev/null +++ b/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp @@ -0,0 +1,11 @@ +--- src/gtk/propgrid_wrap.cpp.orig 2014-11-27 20:51:32 UTC ++++ src/gtk/propgrid_wrap.cpp +@@ -3639,7 +3639,7 @@ bool PyObject_to_wxPGPropArgCls( PyObjec + } + else if ( input == Py_None ) + { +- *v = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL)); ++ *v = new wxPGPropArgCls(static_cast<wxPGProperty*>(NULL)); + } + else + { |