Attachment 211515 Details for Bug 241893 – wxPython40 for exp-run

[patch] wxPython40 for exp-run

exp-run_kicad_devel.diff (text/plain), 11.66 KB, created by Loïc Bartoletti on 2020-02-09 17:27:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2020-02-09 17:27:58 UTC

Size: 11.66 KB

patch

obsolete

>diff --git Mk/bsd.wx.mk Mk/bsd.wx.mk
>index 804f4827b108..42d8e9477030 100644
>--- Mk/bsd.wx.mk
>+++ Mk/bsd.wx.mk
>@@ -140,8 +140,8 @@ _WX_FILE_python_2.8=	${PYTHON_SITELIBDIR}/wx-2.8-gtk2${_WX_PYSUFX}/wx/__init__.p
> _WX_PORT_wx_3.0=	x11-toolkits/wxgtk30
> _WX_LIB_wx_3.0=		wx_baseu-3.0
> 
>-_WX_PORT_python_3.0=	x11-toolkits/py-wxPython30
>-_WX_FILE_python_3.0=	${PYTHON_SITELIBDIR}/wx-3.0-gtk3/wx/__init__.py
>+_WX_PORT_python_3.0=	x11-toolkits/py-wxPython40@${PY_FLAVOR}
>+_WX_FILE_python_3.0=	${PYTHON_SITELIBDIR}/wx/__init__.py
> 
> # wxgtk 3.1
> _WX_PORT_wx_3.1=	x11-toolkits/wxgtk31
>diff --git audio/py-karaoke/Makefile audio/py-karaoke/Makefile
>index 51b0c8b10083..98c02b8a88c1 100644
>--- audio/py-karaoke/Makefile
>+++ audio/py-karaoke/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	karaoke
> PORTVERSION=	0.7.5
>-PORTREVISION=	19
>+PORTREVISION=	20
> CATEGORIES=	audio python
> MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -27,7 +27,7 @@ SHEBANG_FILES=	install/pykaraoke_mini install/pykar install/pykaraoke \
> 		install/pycdg install/pympg
> USE_SDL=	sdl
> USE_XORG=	x11 xau xcb xdmcp
>-USE_WX=		3.0+
>+USE_WX=		2.8
> WX_COMPS=	python:lib
> 
> USE_PYTHON=	distutils autoplist
>diff --git cad/kicad-devel/Makefile cad/kicad-devel/Makefile
>index 1d2b8bc98b22..1e0e4c8040ca 100644
>--- cad/kicad-devel/Makefile
>+++ cad/kicad-devel/Makefile
>@@ -62,7 +62,7 @@ CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
> 		-DKICAD_SCRIPTING=ON \
> 		-DKICAD_SCRIPTING_MODULES=ON \
> 		-DKICAD_SCRIPTING_WXPYTHON=ON \
>-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF \
>+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
> 		-DKICAD_SKIP_BOOST=YES \
> 		-DKICAD_SPICE=ON \
> 		-DKICAD_USE_OCE=OFF \
>diff --git cad/kicad/Makefile cad/kicad/Makefile
>index 51ffcae8ad51..158c7d93b9ce 100644
>--- cad/kicad/Makefile
>+++ cad/kicad/Makefile
>@@ -44,7 +44,7 @@ CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}	\
> 		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD}		\
> 		-DKICAD_SCRIPTING=ON 				\
> 		-DKICAD_SCRIPTING_MODULES=ON			\
>-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF		\
>+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON		\
> 		-DKICAD_USE_OCE=OFF				\
> 		-DKICAD_USE_OCC=ON				\
> 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
>diff --git comms/congruity/Makefile comms/congruity/Makefile
>index 9eb7faa9d3ec..b36a875a3775 100644
>--- comms/congruity/Makefile
>+++ comms/congruity/Makefile
>@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libconcord>=0:comms/py-libconcord@${PY_FLAVO
> 
> USES=		desktop-file-utils gmake tar:bzip2 python:2.7 shebangfix
> MAKE_ARGS=	MANDIR=${PREFIX}/man
>-USE_WX=		2.8+
>+USE_WX=		3.0+
> WX_COMPS=	python
> SHEBANG_FILES=	congruity mhgui
> NO_ARCH=	yes
>diff --git emulators/playonbsd/Makefile emulators/playonbsd/Makefile
>index f0548b7d4576..75ed7f80cc44 100644
>--- emulators/playonbsd/Makefile
>+++ emulators/playonbsd/Makefile
>@@ -11,6 +11,8 @@ COMMENT=	Easily install and run Windows software for use with Wine
> 
> LICENSE=	GPLv3
> 
>+ONLY_FOR_ARCHS=	amd64 i386
>+
> RUN_DEPENDS=	7z:archivers/p7zip \
> 		bash:shells/bash \
> 		glxinfo:graphics/mesa-demos \
>@@ -23,22 +25,23 @@ RUN_DEPENDS=	7z:archivers/p7zip \
> 		wget:ftp/wget \
> 		icotool:graphics/icoutils
> 
>-OPTIONS_DEFINE=	GECKO MONO
>-OPTIONS_DEFAULT=	GECKO MONO
>-GECKO_DESC=	Wine-gecko HTML rendering support
>-MONO_RUN_DEPENDS=	wine-mono>=4.5.6:emulators/wine-mono
>-GECKO_RUN_DEPENDS=	wine-gecko>=2.21:emulators/wine-gecko
>-
>-ONLY_FOR_ARCHS=	amd64 i386
>-
>-USES=		python:2.7,run perl5
>+USES=		python:2.7,run perl5 shebangfix
> USE_WX=		3.0
> WX_COMPS=	python:run
>+SHEBANG_GLOB=	*.py
>+SHEBANG_FILES=	bash/expert/* lib/*
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	PlayOnLinux
> GH_PROJECT=	POL-POM-4
> 
>+OPTIONS_DEFINE=	GECKO MONO NLS
>+OPTIONS_DEFAULT=	GECKO MONO
>+GECKO_DESC=	Wine-gecko HTML rendering support
>+MONO_RUN_DEPENDS=	wine-mono>=4.5.6:emulators/wine-mono
>+GECKO_RUN_DEPENDS=	wine-gecko>=2.21:emulators/wine-gecko
>+NLS_USES=	gettext
>+
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == amd64
>diff --git graphics/py-mayavi/Makefile graphics/py-mayavi/Makefile
>index 6547551a43d0..e83bdbec36b4 100644
>--- graphics/py-mayavi/Makefile
>+++ graphics/py-mayavi/Makefile
>@@ -33,7 +33,7 @@ RUN_DEPENDS=	vtk6>=6.1.0_8:math/vtk6 \
> 
> USES=		python:2.7 shebangfix tar:bzip2
> USE_PYTHON=	autoplist distutils
>-USE_WX=		2.8+
>+USE_WX=		3.0+
> WX_COMPS=	python:run
> SHEBANG_FILES=	mayavi/tests/csv_files/csv_2_py
> 
>diff --git x11-toolkits/Makefile x11-toolkits/Makefile
>index df74ce8e68b9..24986354723e 100644
>--- x11-toolkits/Makefile
>+++ x11-toolkits/Makefile
>@@ -190,6 +190,7 @@
>     SUBDIR += py-wxPython28
>     SUBDIR += py-wxPython28-common
>     SUBDIR += py-wxPython30
>+    SUBDIR += py-wxPython40
>     SUBDIR += py-xlib
>     SUBDIR += pypy-tkinter
>     SUBDIR += qml-box2d
>diff --git x11-toolkits/py-wxPython40/Makefile x11-toolkits/py-wxPython40/Makefile
>new file mode 100644
>index 000000000000..4853eeae7a46
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/Makefile
>@@ -0,0 +1,37 @@
>+# $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>
>diff --git x11-toolkits/py-wxPython40/distinfo x11-toolkits/py-wxPython40/distinfo
>new file mode 100644
>index 000000000000..b510f058f78e
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1575036483
>+SHA256 (python/wxPython-4.0.7.tar.gz) = 3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
>+SIZE (python/wxPython-4.0.7.tar.gz) = 68868838
>diff --git x11-toolkits/py-wxPython40/files/patch-build.py x11-toolkits/py-wxPython40/files/patch-build.py
>new file mode 100644
>index 000000000000..24b88f7e93ef
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-build.py
>@@ -0,0 +1,11 @@
>+--- build.py.orig	2019-05-21 23:12:12 UTC
>++++ build.py
>+@@ -401,7 +401,7 @@ def makeOptionParser():
>+         ("mac_framework",  (False, "Build wxWidgets as a Mac framework.")),
>+         ("mac_arch",       ("",    "Comma separated list of architectures to build on Mac")),
>+ 
>+-        ("use_syswx",      (False, "Try to use an installed wx rather than building the "
>++        ("use_syswx",      (True, "Try to use an installed wx rather than building the "
>+                                    "one in this source tree.  The wx-config in {prefix}/bin "
>+                                    "or the first found on the PATH determines which wx is "
>+                                    "used.  Implies --no_magic.")),
>diff --git x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
>new file mode 100644
>index 000000000000..948012a6588a
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
>@@ -0,0 +1,17 @@
>+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 {
>diff --git x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
>new file mode 100644
>index 000000000000..4b980b84bd8c
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
>@@ -0,0 +1,17 @@
>+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 {
>diff --git x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
>new file mode 100644
>index 000000000000..cf0bc5415327
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
>@@ -0,0 +1,17 @@
>+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 {
>diff --git x11-toolkits/py-wxPython40/pkg-descr x11-toolkits/py-wxPython40/pkg-descr
>new file mode 100644
>index 000000000000..027967687f5c
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/pkg-descr
>@@ -0,0 +1,7 @@
>+wxPython is a GUI toolkit for the Python programming language. It allows Python
>+programmers to create programs with a robust, highly functional graphical user
>+interface, simply and easily. It is implemented as a Python extension module
>+(native code) that wraps the popular wxWidgets cross platform GUI library, which
>+is written in C++.
>+
>+WWW: http://www.wxpython.org
>diff --git x11-toolkits/wxgtk30/Makefile x11-toolkits/wxgtk30/Makefile
>index 67b47823a973..3d2b66f849dd 100644
>--- x11-toolkits/wxgtk30/Makefile
>+++ x11-toolkits/wxgtk30/Makefile
>@@ -3,11 +3,11 @@
> PORTNAME=	wx
> PORTVERSION=	3.0.4
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	x11-toolkits
> PKGNAMESUFFIX=	30-gtk3
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	lbartoletti@FreeBSD.org
> COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
> 
> LICENSE=	GPLv2+
>@@ -44,7 +44,8 @@ CONFIGURE_ARGS=	--with-libpng=sys \
> 		--enable-backtrace \
> 		--enable-ipv6 \
> 		--enable-optimise \
>-		--enable-utf8 \
>+		--enable-unicode \
>+		--enable-std_string \
> 		--enable-graphics_ctx \
> 		--enable-compat26 \
> 		--enable-compat28

Actions: View | Diff

Attachments on bug 241893: 209070 | 211012 | 211098 | 211336 | 211356 | 211515