Date: Tue, 14 Apr 2015 06:43:10 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383979 - in head/x11-toolkits/py-wxPython30: . files Message-ID: <201504140643.t3E6hADx091370@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Apr 14 06:43:09 2015 New Revision: 383979 URL: https://svnweb.freebsd.org/changeset/ports/383979 Log: 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") Added: head/x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp (contents, props changed) head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp (contents, props changed) Modified: head/x11-toolkits/py-wxPython30/Makefile head/x11-toolkits/py-wxPython30/distinfo Modified: head/x11-toolkits/py-wxPython30/Makefile ============================================================================== --- head/x11-toolkits/py-wxPython30/Makefile Tue Apr 14 06:13:03 2015 (r383978) +++ head/x11-toolkits/py-wxPython30/Makefile Tue Apr 14 06:43:09 2015 (r383979) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wxPython -PORTVERSION= 3.0.0.0 -PORTREVISION= 3 +PORTVERSION= 3.0.2.0 CATEGORIES= x11-toolkits python MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +15,7 @@ DIST_SUBDIR= python WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython -USES= python tar:bzip2 +USES= compiler:c++11-lib python tar:bzip2 .if defined(WITH_WXVERSION_ONLY) @@ -42,7 +41,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wxPy USES+= gettext pkgconfig USE_WX= 3.0 -USE_GCC= yes WANT_UNICODE= yes USE_PYTHON= distutils autoplist PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" \ Modified: head/x11-toolkits/py-wxPython30/distinfo ============================================================================== --- head/x11-toolkits/py-wxPython30/distinfo Tue Apr 14 06:13:03 2015 (r383978) +++ head/x11-toolkits/py-wxPython30/distinfo Tue Apr 14 06:43:09 2015 (r383979) @@ -1,2 +1,2 @@ -SHA256 (python/wxPython-src-3.0.0.0.tar.bz2) = af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 -SIZE (python/wxPython-src-3.0.0.0.tar.bz2) = 57831792 +SHA256 (python/wxPython-src-3.0.2.0.tar.bz2) = d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 +SIZE (python/wxPython-src-3.0.2.0.tar.bz2) = 58304944 Added: head/x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp Tue Apr 14 06:43:09 2015 (r383979) @@ -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); Added: head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp Tue Apr 14 06:43:09 2015 (r383979) @@ -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 + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504140643.t3E6hADx091370>