Attachment 155522 Details for Bug 199403 – update and bugfix wxPython30

[patch] update and bugfix wxPython30

wxpython.patch (text/plain), 3.31 KB, created by Matthew Rezny on 2015-04-12 18:27:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2015-04-12 18:27:05 UTC

Size: 3.31 KB

patch

obsolete

>Index: x11-toolkits/py-wxPython30/Makefile
>===================================================================
>--- x11-toolkits/py-wxPython30/Makefile	(revision 383868)
>+++ x11-toolkits/py-wxPython30/Makefile	(working copy)
>@@ -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 @@
> 
> 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 @@
> 
> USES+=		gettext pkgconfig
> USE_WX=		3.0
>-USE_GCC=	yes
> WANT_UNICODE=	yes
> USE_PYTHON=	distutils autoplist
> PYDISTUTILS_BUILDARGS=	WX_CONFIG="${WX_CONFIG}" \
>Index: x11-toolkits/py-wxPython30/distinfo
>===================================================================
>--- x11-toolkits/py-wxPython30/distinfo	(revision 383868)
>+++ x11-toolkits/py-wxPython30/distinfo	(working copy)
>@@ -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
>Index: x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp
>===================================================================
>--- x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp	(revision 0)
>+++ x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp	(working copy)
>@@ -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);
>Index: x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp
>===================================================================
>--- x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp	(revision 0)
>+++ x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp	(working copy)
>@@ -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
>+     {

Actions: View | Diff

Attachments on bug 199403: 155522