Attachment #211098 for bug #241893

Lines 140-147 Link Here

(-)Mk/bsd.wx.mk (-2 / +2 lines)
140	_WX_PORT_wx_3.0= x11-toolkits/wxgtk30	140	_WX_PORT_wx_3.0= x11-toolkits/wxgtk30
141	_WX_LIB_wx_3.0= wx_baseu-3.0	141	_WX_LIB_wx_3.0= wx_baseu-3.0
142		142
143	_WX_PORT_python_3.0= x11-toolkits/py-wxPython30	143	_WX_PORT_python_3.0= x11-toolkits/py-wxPython40@${PY_FLAVOR}
144	_WX_FILE_python_3.0= ${PYTHON_SITELIBDIR}/wx-3.0-gtk3/wx/__init__.py	144	_WX_FILE_python_3.0= ${PYTHON_SITELIBDIR}/wx/__init__.py
145		145
146	# wxgtk 3.1	146	# wxgtk 3.1
147	_WX_PORT_wx_3.1= x11-toolkits/wxgtk31	147	_WX_PORT_wx_3.1= x11-toolkits/wxgtk31

Lines 3-9 Link Here

(-)audio/py-karaoke/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= karaoke	4	PORTNAME= karaoke
5	PORTVERSION= 0.7.5	5	PORTVERSION= 0.7.5
6	PORTREVISION= 19	6	PORTREVISION= 20
7	CATEGORIES= audio python	7	CATEGORIES= audio python
8	MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 27-33 Link Here
27	install/pycdg install/pympg	27	install/pycdg install/pympg
28	USE_SDL= sdl	28	USE_SDL= sdl
29	USE_XORG= x11 xau xcb xdmcp	29	USE_XORG= x11 xau xcb xdmcp
30	USE_WX= 3.0+	30	USE_WX= 2.8
31	WX_COMPS= python:lib	31	WX_COMPS= python:lib
32		32
33	USE_PYTHON= distutils autoplist	33	USE_PYTHON= distutils autoplist

Lines 44-50 Link Here

(-)cad/kicad/Makefile (-1 / +1 lines)
44	-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \	44	-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \
45	-DKICAD_SCRIPTING=ON \	45	-DKICAD_SCRIPTING=ON \
46	-DKICAD_SCRIPTING_MODULES=ON \	46	-DKICAD_SCRIPTING_MODULES=ON \
47	-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF \	47	-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
48	-DKICAD_USE_OCE=OFF \	48	-DKICAD_USE_OCE=OFF \
49	-DKICAD_USE_OCC=ON \	49	-DKICAD_USE_OCC=ON \
50	-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE	50	-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE

Lines 11-16 Link Here

(-)emulators/playonbsd/Makefile (-9 / +12 lines)
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13		13
		14	ONLY_FOR_ARCHS= amd64 i386
		15
14	RUN_DEPENDS= 7z:archivers/p7zip \	16	RUN_DEPENDS= 7z:archivers/p7zip \
15	bash:shells/bash \	17	bash:shells/bash \
16	glxinfo:graphics/mesa-demos \	18	glxinfo:graphics/mesa-demos \
Lines 23-44 Link Here
23	wget:ftp/wget \	25	wget:ftp/wget \
24	icotool:graphics/icoutils	26	icotool:graphics/icoutils
25		27
26	OPTIONS_DEFINE= GECKO MONO	28	USES= python:2.7,run perl5 shebangfix
27	OPTIONS_DEFAULT= GECKO MONO
28	GECKO_DESC= Wine-gecko HTML rendering support
29	MONO_RUN_DEPENDS= wine-mono>=4.5.6:emulators/wine-mono
30	GECKO_RUN_DEPENDS= wine-gecko>=2.21:emulators/wine-gecko
31
32	ONLY_FOR_ARCHS= amd64 i386
33
34	USES= python:2.7,run perl5
35	USE_WX= 3.0	29	USE_WX= 3.0
36	WX_COMPS= python:run	30	WX_COMPS= python:run
		31	SHEBANG_GLOB= *.py
		32	SHEBANG_FILES= bash/expert/* lib/*
37		33
38	USE_GITHUB= yes	34	USE_GITHUB= yes
39	GH_ACCOUNT= PlayOnLinux	35	GH_ACCOUNT= PlayOnLinux
40	GH_PROJECT= POL-POM-4	36	GH_PROJECT= POL-POM-4
41		37
		38	OPTIONS_DEFINE= GECKO MONO NLS
		39	OPTIONS_DEFAULT= GECKO MONO
		40	GECKO_DESC= Wine-gecko HTML rendering support
		41	MONO_RUN_DEPENDS= wine-mono>=4.5.6:emulators/wine-mono
		42	GECKO_RUN_DEPENDS= wine-gecko>=2.21:emulators/wine-gecko
		43	NLS_USES= gettext
		44
42	.include <bsd.port.pre.mk>	45	.include <bsd.port.pre.mk>
43		46
44	.if ${ARCH} == amd64	47	.if ${ARCH} == amd64

Lines 194-199 Link Here

(-)x11-toolkits/Makefile (+1 lines)
194	SUBDIR += py-wxPython28	194	SUBDIR += py-wxPython28
195	SUBDIR += py-wxPython28-common	195	SUBDIR += py-wxPython28-common
196	SUBDIR += py-wxPython30	196	SUBDIR += py-wxPython30
		197	SUBDIR += py-wxPython40
197	SUBDIR += py-xlib	198	SUBDIR += py-xlib
198	SUBDIR += pypy-tkinter	199	SUBDIR += pypy-tkinter
199	SUBDIR += qml-box2d	200	SUBDIR += qml-box2d




# $FreeBSD$

PORTNAME=	wxPython
PORTVERSION=	4.0.7
CATEGORIES=	x11-toolkits python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX=	40
DIST_SUBDIR=	python

MAINTAINER=	python@FreeBSD.org
COMMENT=	GUI toolkit for the Python programming language

LICENSE=	WXWINDOWS LGPL21+ GPLv2+
LICENSE_COMB=	multi
LICENSE_NAME_WXWINDOWS=	wxWindows Library Licence, Version 3.1
LICENSE_FILE_WXWINDOWS=	${WRKSRC}/license/licence.txt
LICENSE_PERMS_WXWINDOWS=	dist-mirror pkg-mirror auto-accept

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}

USES=		compiler:c++11-lib gl localbase pkgconfig python
USE_GL=		glu
USE_WX=		3.0
USE_PYTHON=	distutils autoplist

OPTIONS_DEFINE=		NLS

NLS_USES=	gettext

post-patch:
	@${REINPLACE_CMD} -e "s|WX_CONFIG = 'wx-config'|WX_CONFIG = '${WX_CONFIG}'|" ${WRKSRC}/build.py

post-install:
	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/wx -name *.so -exec ${STRIP_CMD} {} +

.include <bsd.port.mk>

Line 0 Link Here

(-)x11-toolkits/py-wxPython40/distinfo (+3 lines)
	1	TIMESTAMP = 1575036483
	2	SHA256 (python/wxPython-4.0.7.tar.gz) = 3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
	3	SIZE (python/wxPython-4.0.7.tar.gz) = 68868838

Line 0 Link Here

(-)x11-toolkits/py-wxPython40/files/patch-build.py (+11 lines)
	1	--- build.py.orig 2019-05-21 23:12:12 UTC
	2	+++ build.py
	3	@@ -401,7 +401,7 @@ def makeOptionParser():
	4	("mac_framework", (False, "Build wxWidgets as a Mac framework.")),
	5	("mac_arch", ("", "Comma separated list of architectures to build on Mac")),
	6
	7	- ("use_syswx", (False, "Try to use an installed wx rather than building the "
	8	+ ("use_syswx", (True, "Try to use an installed wx rather than building the "
	9	"one in this source tree. The wx-config in {prefix}/bin "
	10	"or the first found on the PATH determines which wx is "
	11	"used. Implies --no_magic.")),

Line 0 Link Here

(-)x11-toolkits/py-wxPython40/files/patch-config.py (+10 lines)
	1	--- config.py.orig 2015-04-11 19:08:36 UTC
	2	+++ config.py
	3	@@ -1030,6 +1030,7 @@ elif os.name == 'posix' or COMPILER == '
	4
	5	cflags = getWxConfigValue('--cxxflags')
	6	cflags = cflags.split()
	7	+ cflags.append('-std=c++11')
	8	if debug:
	9	cflags.append('-ggdb')
	10	cflags.append('-O0')




LLVM/CLANG cannot compile with reinterpret_cast.

https://svnweb.freebsd.org/ports/head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp?revision=383979&view=markup
https://github.com/wxWidgets/Phoenix/issues/1416#issuecomment-557263381
https://github.com/wxWidgets/Phoenix/pull/1445

--- etg/propgridiface.py.orig	2019-05-21 23:12:12 UTC
+++ etg/propgridiface.py
@@ -89,7 +89,7 @@ def run():
             return sipGetState(sipTransferObj);
         }
         else if (sipPy == Py_None) {
-            *sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL));
+            *sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty * >(NULL));
             return sipGetState(sipTransferObj);
         }
         else {




--- setup.py.orig	2014-06-23 12:08:27.268192923 -0300
+++ setup.py	2014-06-23 12:07:08.925198614 -0300
 BUILD_OPTIONS = { 'build_base' : BUILD_BASE }
@@ -1011,7 +1006,7 @@
     if not PREP_ONLY:
 
         if not EGGing:
-            if INSTALL_MULTIVERSION:
+            if False:
                 setup(name             = 'wxPython-common',
                       version          = VERSION,
                       description      = DESCRIPTION,




LLVM/CLANG cannot compile with reinterpret_cast.

https://svnweb.freebsd.org/ports/head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp?revision=383979&view=markup
https://github.com/wxWidgets/Phoenix/issues/1416#issuecomment-557263381
https://github.com/wxWidgets/Phoenix/pull/1445

--- sip/cpp/sip_propgridwxPGPropArgCls.cpp.orig	2019-05-22 02:14:14 UTC
+++ sip/cpp/sip_propgridwxPGPropArgCls.cpp
@@ -317,7 +317,7 @@ static int convertTo_wxPGPropArgCls(PyObject *sipPy,vo
             return sipGetState(sipTransferObj);
         }
         else if (sipPy == Py_None) {
-            *sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL));
+            *sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty * >(NULL));
             return sipGetState(sipTransferObj);
         }
         else {




LLVM/CLANG cannot compile with reinterpret_cast.

https://svnweb.freebsd.org/ports/head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp?revision=383979&view=markup
https://github.com/wxWidgets/Phoenix/issues/1416#issuecomment-557263381
https://github.com/wxWidgets/Phoenix/pull/1445

--- sip/gen/propgridiface.sip.orig	2019-05-22 02:13:01 UTC
+++ sip/gen/propgridiface.sip
@@ -108,7 +108,7 @@ class wxPGPropArgCls (public)
             return sipGetState(sipTransferObj);
         }
         else if (sipPy == Py_None) {
-            *sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL));
+            *sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty * >(NULL));
             return sipGetState(sipTransferObj);
         }
         else {




--- 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-wxPython40/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	{

Line 0 Link Here

(-)x11-toolkits/py-wxPython40/pkg-descr (+7 lines)
	1	wxPython is a GUI toolkit for the Python programming language. It allows Python
	2	programmers to create programs with a robust, highly functional graphical user
	3	interface, simply and easily. It is implemented as a Python extension module
	4	(native code) that wraps the popular wxWidgets cross platform GUI library, which
	5	is written in C++.
	6
	7	WWW: http://www.wxpython.org




PORTNAME=	wx
PORTVERSION=	3.0.4
DISTVERSIONPREFIX=	v
PORTREVISION=	9
CATEGORIES=	x11-toolkits
PKGNAMESUFFIX=	30-gtk3

MAINTAINER=	lbartoletti@tuxfamily.org
COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings

LICENSE=	GPLv2+

		--enable-backtrace \
		--enable-ipv6 \
		--enable-optimise \
		--enable-unicode \
		--enable-std_string \
		--enable-graphics_ctx \
		--enable-compat26 \
		--enable-compat28

Return to bug 241893

Line 0 Link Here

(-)x11-toolkits/py-wxPython40/Makefile (+37 lines)
	1	# $FreeBSD$
	2
	3	PORTNAME= wxPython
	4	PORTVERSION= 4.0.7
	5	CATEGORIES= x11-toolkits python
	6	MASTER_SITES= CHEESESHOP
	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	8	PKGNAMESUFFIX= 40
	9	DIST_SUBDIR= python
	10
	11	MAINTAINER= python@FreeBSD.org
	12	COMMENT= GUI toolkit for the Python programming language
	13
	14	LICENSE= WXWINDOWS LGPL21+ GPLv2+
	15	LICENSE_COMB= multi
	16	LICENSE_NAME_WXWINDOWS= wxWindows Library Licence, Version 3.1
	17	LICENSE_FILE_WXWINDOWS= ${WRKSRC}/license/licence.txt
	18	LICENSE_PERMS_WXWINDOWS= dist-mirror pkg-mirror auto-accept
	19
	20	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}
	21
	22	USES= compiler:c++11-lib gl localbase pkgconfig python
	23	USE_GL= glu
	24	USE_WX= 3.0
	25	USE_PYTHON= distutils autoplist
	26
	27	OPTIONS_DEFINE= NLS
	28
	29	NLS_USES= gettext
	30
	31	post-patch:
	32	@${REINPLACE_CMD} -e "s\|WX_CONFIG = 'wx-config'\|WX_CONFIG = '${WX_CONFIG}'\|" ${WRKSRC}/build.py
	33
	34	post-install:
	35	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/wx -name *.so -exec ${STRIP_CMD} {} +
	36
	37	.include <bsd.port.mk>

Line 0 Link Here

(-)x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py (+17 lines)
	1	LLVM/CLANG cannot compile with reinterpret_cast.
	2
	3	https://svnweb.freebsd.org/ports/head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp?revision=383979&view=markup
	4	https://github.com/wxWidgets/Phoenix/issues/1416#issuecomment-557263381
	5	https://github.com/wxWidgets/Phoenix/pull/1445
	6
	7	--- etg/propgridiface.py.orig 2019-05-21 23:12:12 UTC
	8	+++ etg/propgridiface.py
	9	@@ -89,7 +89,7 @@ def run():
	10	return sipGetState(sipTransferObj);
	11	}
	12	else if (sipPy == Py_None) {
	13	- sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty >(NULL));
	14	+ sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty >(NULL));
	15	return sipGetState(sipTransferObj);
	16	}
	17	else {

Line 0 Link Here

(-)x11-toolkits/py-wxPython40/files/patch-setup.py (+12 lines)
	1	--- setup.py.orig 2014-06-23 12:08:27.268192923 -0300
	2	+++ setup.py 2014-06-23 12:07:08.925198614 -0300
	3	BUILD_OPTIONS = { 'build_base' : BUILD_BASE }
	4	@@ -1011,7 +1006,7 @@
	5	if not PREP_ONLY:
	6
	7	if not EGGing:
	8	- if INSTALL_MULTIVERSION:
	9	+ if False:
	10	setup(name = 'wxPython-common',
	11	version = VERSION,
	12	description = DESCRIPTION,

Line 0 Link Here

(-)x11-toolkits/py-wxPython40/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);

Lines 3-13 Link Here

(-)x11-toolkits/wxgtk30/Makefile (-3 / +4 lines)
3	PORTNAME= wx	3	PORTNAME= wx
4	PORTVERSION= 3.0.4	4	PORTVERSION= 3.0.4
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	PORTREVISION= 8	6	PORTREVISION= 9
7	CATEGORIES= x11-toolkits	7	CATEGORIES= x11-toolkits
8	PKGNAMESUFFIX= 30-gtk3	8	PKGNAMESUFFIX= 30-gtk3
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= lbartoletti@tuxfamily.org
11	COMMENT= The wxWidgets GUI toolkit with GTK+ bindings	11	COMMENT= The wxWidgets GUI toolkit with GTK+ bindings
12		12
13	LICENSE= GPLv2+	13	LICENSE= GPLv2+
Lines 44-50 Link Here
44	--enable-backtrace \	44	--enable-backtrace \
45	--enable-ipv6 \	45	--enable-ipv6 \
46	--enable-optimise \	46	--enable-optimise \
47	--enable-utf8 \	47	--enable-unicode \
		48	--enable-std_string \
48	--enable-graphics_ctx \	49	--enable-graphics_ctx \
49	--enable-compat26 \	50	--enable-compat26 \
50	--enable-compat28	51	--enable-compat28