D21915.diff
No OneTemporary
Actions

Size

16 KB

Referenced Files

None

Subscribers

None

D21915.diff
View Options

	Index: head/Mk/bsd.wx.mk
	===================================================================
	--- head/Mk/bsd.wx.mk
	+++ head/Mk/bsd.wx.mk
	@@ -140,8 +140,8 @@
	_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
	Index: head/audio/py-karaoke/Makefile
	===================================================================
	--- head/audio/py-karaoke/Makefile
	+++ head/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 @@
	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
	Index: head/cad/kicad-devel/Makefile
	===================================================================
	--- head/cad/kicad-devel/Makefile
	+++ head/cad/kicad-devel/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= kicad
	DISTVERSION= r${GIT_SRC_DATE}
	-#PORTREVISION= 1
	+PORTREVISION= 1
	CATEGORIES= cad
	PKGNAMESUFFIX= -devel
	DIST_SUBDIR= ${PORTNAME}
	@@ -62,7 +62,7 @@
	-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 \
	Index: head/cad/kicad/Makefile
	===================================================================
	--- head/cad/kicad/Makefile
	+++ head/cad/kicad/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= kicad
	PORTVERSION= 5.1.5
	-PORTREVISION= 1
	+PORTREVISION= 2
	PORTEPOCH= 2
	CATEGORIES= cad

	@@ -44,7 +44,7 @@
	-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
	Index: head/comms/congruity/Makefile
	===================================================================
	--- head/comms/congruity/Makefile
	+++ head/comms/congruity/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= congruity
	PORTVERSION= 18
	-PORTREVISION= 5
	+PORTREVISION= 6
	CATEGORIES= comms
	MASTER_SITES= SF

	@@ -17,7 +17,7 @@

	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
	Index: head/comms/gnuradio/Makefile
	===================================================================
	--- head/comms/gnuradio/Makefile
	+++ head/comms/gnuradio/Makefile
	@@ -2,7 +2,7 @@

	PORTNAME= gnuradio
	PORTVERSION= 3.8.0.0
	-PORTREVISION= 5
	+PORTREVISION= 6
	CATEGORIES= comms astro hamradio
	MASTER_SITES= http://gnuradio.org/releases/gnuradio/

	Index: head/comms/quisk/Makefile
	===================================================================
	--- head/comms/quisk/Makefile
	+++ head/comms/quisk/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= quisk
	DISTVERSION= 4.1.40
	-PORTREVISION= 4
	+PORTREVISION= 5
	CATEGORIES= comms hamradio
	MASTER_SITES= CHEESESHOP

	Index: head/databases/grass7/Makefile
	===================================================================
	--- head/databases/grass7/Makefile
	+++ head/databases/grass7/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= grass
	PORTVERSION= 7.6.1
	-PORTREVISION= 11
	+PORTREVISION= 12
	CATEGORIES= databases geography
	MASTER_SITES= https://grass.osgeo.org/%SUBDIR%/ \
	http://grass.cict.fr/%SUBDIR%/ \
	Index: head/devel/py-robotframework-ride/Makefile
	===================================================================
	--- head/devel/py-robotframework-ride/Makefile
	+++ head/devel/py-robotframework-ride/Makefile
	@@ -3,6 +3,7 @@

	PORTNAME= robotframework-ride
	PORTVERSION= 1.7.3.1
	+PORTREVISION= 1
	CATEGORIES= devel www python
	MASTER_SITES= CHEESESHOP
	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	Index: head/emulators/playonbsd/Makefile
	===================================================================
	--- head/emulators/playonbsd/Makefile
	+++ head/emulators/playonbsd/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= playonbsd
	PORTVERSION= 4.2.10
	-PORTREVISION= 5
	+PORTREVISION= 6
	CATEGORIES= emulators games

	MAINTAINER= se@FreeBSD.org
	@@ -11,6 +11,8 @@

	LICENSE= GPLv3

	+ONLY_FOR_ARCHS= amd64 i386
	+
	RUN_DEPENDS= 7z:archivers/p7zip \
	bash:shells/bash \
	glxinfo:graphics/mesa-demos \
	@@ -23,21 +25,22 @@
	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>

	Index: head/games/pyfa/Makefile
	===================================================================
	--- head/games/pyfa/Makefile
	+++ head/games/pyfa/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= pyfa
	PORTVERSION= 1.19.1
	-PORTREVISION= 3
	+PORTREVISION= 4
	DISTVERSIONPREFIX= v
	CATEGORIES= games python

	Index: head/graphics/djvusmooth/Makefile
	===================================================================
	--- head/graphics/djvusmooth/Makefile
	+++ head/graphics/djvusmooth/Makefile
	@@ -2,6 +2,7 @@

	PORTNAME= djvusmooth
	DISTVERSION= 0.3
	+PORTREVISION= 1
	CATEGORIES= graphics python

	MAINTAINER= yuri@FreeBSD.org
	@@ -17,10 +18,11 @@
	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
	docbook-xml>0:textproc/docbook-xml
	RUN_DEPENDS= djvulibre>0:graphics/djvulibre \
	- ${PYTHON_PKGNAMEPREFIX}python-djvulibre>0:graphics/py-djvulibre@${PY_FLAVOR} \
	- ${PYTHON_PKGNAMEPREFIX}wxPython30>0:x11-toolkits/py-wxPython30@${PY_FLAVOR}
	+ ${PYTHON_PKGNAMEPREFIX}python-djvulibre>0:graphics/py-djvulibre@${PY_FLAVOR}

	USES= desktop-file-utils gettext-tools python:2.7
	+USE_WX= 3.0
	+WX_COMPS= python:run
	USE_GITHUB= yes
	GH_ACCOUNT= jwilk
	USE_PYTHON= distutils autoplist noflavors
	Index: head/graphics/py-mayavi/Makefile
	===================================================================
	--- head/graphics/py-mayavi/Makefile
	+++ head/graphics/py-mayavi/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= mayavi
	PORTVERSION= 4.5.0
	-PORTREVISION= 6
	+PORTREVISION= 7
	CATEGORIES= graphics science python
	MASTER_SITES= CHEESESHOP
	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	@@ -33,7 +33,7 @@

	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

	Index: head/graphics/sk1/Makefile
	===================================================================
	--- head/graphics/sk1/Makefile
	+++ head/graphics/sk1/Makefile
	@@ -3,7 +3,7 @@
	PORTNAME= sk1
	DISTVERSION= 2.0
	DISTVERSIONSUFFIX= rc3
	-PORTREVISION= 1
	+PORTREVISION= 2
	CATEGORIES= graphics python
	MASTER_SITES= https://downloads.sk1project.net/sk1/${DISTVERSIONFULL}/

	Index: head/misc/pyobd/Makefile
	===================================================================
	--- head/misc/pyobd/Makefile
	+++ head/misc/pyobd/Makefile
	@@ -2,7 +2,7 @@

	PORTNAME= pyobd
	DISTVERSION= 0.9.3
	-PORTREVISION= 1
	+PORTREVISION= 2
	CATEGORIES= misc
	MASTER_SITES= http://www.obdtester.com/download/
	DISTNAME= pyobd_${PORTVERSION}
	Index: head/multimedia/photofilmstrip/Makefile
	===================================================================
	--- head/multimedia/photofilmstrip/Makefile
	+++ head/multimedia/photofilmstrip/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= photofilmstrip
	PORTVERSION= 3.0.2
	-PORTREVISION= 3
	+PORTREVISION= 4
	CATEGORIES= multimedia python
	MASTER_SITES= SF/photostoryx/${PORTNAME}/${PORTVERSION}
	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	Index: head/x11-toolkits/Makefile
	===================================================================
	--- head/x11-toolkits/Makefile
	+++ head/x11-toolkits/Makefile
	@@ -189,6 +189,7 @@
	SUBDIR += py-wxPython28
	SUBDIR += py-wxPython28-common
	SUBDIR += py-wxPython30
	+ SUBDIR += py-wxPython40
	SUBDIR += py-xlib
	SUBDIR += pypy-tkinter
	SUBDIR += qml-box2d
	Index: head/x11-toolkits/py-SquareMap/Makefile
	===================================================================
	--- head/x11-toolkits/py-SquareMap/Makefile
	+++ head/x11-toolkits/py-SquareMap/Makefile
	@@ -3,7 +3,7 @@

	PORTNAME= SquareMap
	PORTVERSION= 1.0.4
	-PORTREVISION= 3
	+PORTREVISION= 4
	CATEGORIES= x11-toolkits python
	MASTER_SITES= CHEESESHOP
	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	Index: head/x11-toolkits/py-wxPython40/Makefile
	===================================================================
	--- head/x11-toolkits/py-wxPython40/Makefile
	+++ head/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>
	Index: head/x11-toolkits/py-wxPython40/distinfo
	===================================================================
	--- head/x11-toolkits/py-wxPython40/distinfo
	+++ head/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
	Index: head/x11-toolkits/py-wxPython40/files/patch-build.py
	===================================================================
	--- head/x11-toolkits/py-wxPython40/files/patch-build.py
	+++ head/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.")),
	Index: head/x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
	===================================================================
	--- head/x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
	+++ head/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 {
	Index: head/x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
	===================================================================
	--- head/x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
	+++ head/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 {
	Index: head/x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
	===================================================================
	--- head/x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
	+++ head/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 {
	Index: head/x11-toolkits/py-wxPython40/pkg-descr
	===================================================================
	--- head/x11-toolkits/py-wxPython40/pkg-descr
	+++ head/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
	Index: head/x11-toolkits/wxgtk30/Makefile
	===================================================================
	--- head/x11-toolkits/wxgtk30/Makefile
	+++ head/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 @@
	--enable-backtrace \
	--enable-ipv6 \
	--enable-optimise \
	- --enable-utf8 \
	+ --enable-unicode \
	+ --enable-std_string \
	--enable-graphics_ctx \
	--enable-compat26 \
	--enable-compat28

File Metadata

Mime Type: text/plain
Expires: Fri, Nov 22, 3:42 PM (19 h, 17 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 14778815
Default Alt Text: D21915.diff (16 KB)

D21915.diffNo OneTemporaryActions

D21915.diffView Options

File Metadata

Event Timeline

D21915.diff
No OneTemporary
Actions

D21915.diff
View Options