Attachment #155522 for bug #199403

View | Details | Raw Unified | Return to bug 199403
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	wxPython
PORTVERSION=	3.0.2.0
PORTREVISION=	3
CATEGORIES=	x11-toolkits python
MASTER_SITES=	SF/wxpython/wxPython/${PORTVERSION}
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


WRKSRC=		${WRKDIR}/${DISTNAME}/wxPython

USES=		compiler:c++11-lib python tar:bzip2

.if defined(WITH_WXVERSION_ONLY)



USES+=		gettext pkgconfig
USE_WX=		3.0
USE_GCC=	yes
WANT_UNICODE=	yes
USE_PYTHON=	distutils autoplist
PYDISTUTILS_BUILDARGS=	WX_CONFIG="${WX_CONFIG}" \

Lines 1-2 Link Here

(-)x11-toolkits/py-wxPython30/distinfo (-2 / +2 lines)
1	SHA256 (python/wxPython-src-3.0.0.0.tar.bz2) = af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11	1	SHA256 (python/wxPython-src-3.0.2.0.tar.bz2) = d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61
2	SIZE (python/wxPython-src-3.0.0.0.tar.bz2) = 57831792	2	SIZE (python/wxPython-src-3.0.2.0.tar.bz2) = 58304944




--- 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);

Line 0 Link Here

(-)x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp (+11 lines)
	1	--- src/gtk/propgrid_wrap.cpp.orig 2014-11-27 20:51:32 UTC
	2	+++ src/gtk/propgrid_wrap.cpp
	3	@@ -3639,7 +3639,7 @@ bool PyObject_to_wxPGPropArgCls( PyObjec
	4	}
	5	else if ( input == Py_None )
	6	{
	7	- v = new wxPGPropArgCls(reinterpret_cast< wxPGProperty >(NULL));
	8	+ v = new wxPGPropArgCls(static_cast<wxPGProperty>(NULL));
	9	}
	10	else
	11	{

Return to bug 199403

Lines 1-8 Link Here

(-)x11-toolkits/py-wxPython30/Makefile (-4 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= wxPython	3	PORTNAME= wxPython
4	PORTVERSION= 3.0.0.0	4	PORTVERSION= 3.0.2.0
5	PORTREVISION= 3
6	CATEGORIES= x11-toolkits python	5	CATEGORIES= x11-toolkits python
7	MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION}	6	MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION}
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 16-22 Link Here
16		15
17	WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython	16	WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython
18		17
19	USES= python tar:bzip2	18	USES= compiler:c++11-lib python tar:bzip2
20		19
21	.if defined(WITH_WXVERSION_ONLY)	20	.if defined(WITH_WXVERSION_ONLY)
22		21
Lines 42-48 Link Here
42		41
43	USES+= gettext pkgconfig	42	USES+= gettext pkgconfig
44	USE_WX= 3.0	43	USE_WX= 3.0
45	USE_GCC= yes
46	WANT_UNICODE= yes	44	WANT_UNICODE= yes
47	USE_PYTHON= distutils autoplist	45	USE_PYTHON= distutils autoplist
48	PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" \	46	PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" \

Line 0 Link Here

(-)x11-toolkits/py-wxPython30/files/patch-src_gtk___gdi__wrap.cpp (+20 lines)
	1	--- src/gtk/_gdi_wrap.cpp.orig 2015-04-12 18:02:36 UTC
	2	+++ src/gtk/_gdi_wrap.cpp
	3	@@ -3856,7 +3856,7 @@ const wxString& wxPyLocale::GetSingularS
	4	const wxString& domain) const
	5	{
	6	bool found;
	7	- wxString str( _T("error in translation"));
	8	+ static wxString str( _T("error in translation"));
	9	wxPyBlock_t blocked = wxPyBeginBlockThreads();
	10	if ((found=wxPyCBH_findCallback(m_myInst, "GetSingularString"))) {
	11	PyObject* param1 = wx2PyString(origString);
	12	@@ -3878,7 +3878,7 @@ const wxString& wxPyLocale::GetPluralStr
	13	const wxString& domain) const
	14	{
	15	bool found;
	16	- wxString str( _T("error in translation"));
	17	+ static wxString str( _T("error in translation"));
	18	wxPyBlock_t blocked = wxPyBeginBlockThreads();
	19	if ((found=wxPyCBH_findCallback(m_myInst, "GetPluralString"))) {
	20	PyObject* param1 = wx2PyString(origString);