Page MenuHomeFreeBSD
Files F110721771

D21915.id68194.diff
No OneTemporary
Actions

D21915.id68194.diff
View Options

Index: Mk/bsd.wx.mk
===================================================================
--- Mk/bsd.wx.mk
+++ 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: audio/py-karaoke/Makefile
===================================================================
--- 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 @@
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: cad/kicad-devel/Makefile
===================================================================
--- cad/kicad-devel/Makefile
+++ cad/kicad-devel/Makefile
@@ -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: cad/kicad/Makefile
===================================================================
--- cad/kicad/Makefile
+++ cad/kicad/Makefile
@@ -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: emulators/playonbsd/Makefile
===================================================================
--- emulators/playonbsd/Makefile
+++ emulators/playonbsd/Makefile
@@ -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: x11-toolkits/Makefile
===================================================================
--- x11-toolkits/Makefile
+++ x11-toolkits/Makefile
@@ -194,6 +194,7 @@
SUBDIR += py-wxPython28
SUBDIR += py-wxPython28-common
SUBDIR += py-wxPython30
+ SUBDIR += py-wxPython40
SUBDIR += py-xlib
SUBDIR += pypy-tkinter
SUBDIR += qml-box2d
Index: x11-toolkits/py-wxPython40/Makefile
===================================================================
--- x11-toolkits/py-wxPython40/Makefile
+++ x11-toolkits/py-wxPython40/Makefile
@@ -1,67 +1,37 @@
# $FreeBSD$
PORTNAME= wxPython
-PORTVERSION= 3.0.2.0
-PORTREVISION= 8
-DISTVERSIONPREFIX= src-
+PORTVERSION= 4.0.7
CATEGORIES= x11-toolkits python
-MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION}
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX= 30
+PKGNAMESUFFIX= 40
+DIST_SUBDIR= python
MAINTAINER= python@FreeBSD.org
COMMENT= GUI toolkit for the Python programming language
-DIST_SUBDIR= python
+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
-WRKSRC_SUBDIR= wxPython
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}
-USES= compiler:c++11-lib python:2.7 shebangfix tar:bzip2
-SHEBANG_FILES= wx/tools/Editra/Editra.pyw
-
-.if defined(WITH_WXVERSION_ONLY)
-
-PKGNAMESUFFIX= -common
-
-USE_PYTHON= py3kplist flavors
-
-do-build:
- ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PYTHON_SITELIBDIR} -f ${WRKSRC}/wxversion
- ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${PYTHON_SITELIBDIR} -f ${WRKSRC}/wxversion
-
-do-install:
- @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
- ${INSTALL_DATA} ${WRKSRC}/wxversion/wxversion.py* ${STAGEDIR}${PYTHON_SITELIBDIR}/
- ${TOUCH} ${STAGEDIR}${PYTHON_SITELIBDIR}/wx.pth
-
-.else
-
-WXPORT= gtk3
-WX_PYTHON_DIR= wx-${WX_VERSION}-${WXPORT}
-
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wxPython-common>0:x11-toolkits/py-wxPython-common@${PY_FLAVOR}
-
-USES+= gettext pkgconfig
+USES= compiler:c++11-lib gl localbase pkgconfig python
+USE_GL= glu
USE_WX= 3.0
USE_PYTHON= distutils autoplist
-PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" \
- WXPORT="${WXPORT}" \
- NO_SCRIPTS=1 \
- INSTALL_MULTIVERSION=1
-PYDISTUTILS_CONFIGUREARGS+= ${PYDISTUTILS_BUILDARGS}
-PYDISTUTILS_INSTALLARGS+= ${PYDISTUTILS_BUILDARGS}
+OPTIONS_DEFINE= NLS
+
+NLS_USES= gettext
+
post-patch:
- @${REINPLACE_CMD} -E \
- -e 's,distutils\.command\.install\.install\),setuptools.command.install.install),g' \
- -e 's,distutils\.command\.install$$,setuptools.command.install,g' \
- -e 's,distutils\.command\.install\.install\.,setuptools.command.install.install.,g' \
- ${WRKSRC}/config.py
+ @${REINPLACE_CMD} -e "s|WX_CONFIG = 'wx-config'|WX_CONFIG = '${WX_CONFIG}'|" ${WRKSRC}/build.py
post-install:
- @${ECHO_CMD} "@unexec ${REINPLACE_CMD} -i '' -e '\,${WX_PYTHON_DIR}$$,d' ${PYTHON_SITELIBDIR}/wx.pth 2>/dev/null || true" >> ${TMPPLIST}
- @${ECHO_CMD} "@exec echo ${WX_PYTHON_DIR} >> ${PYTHON_SITELIBDIR}/wx.pth 2>/dev/null || true" >> ${TMPPLIST}
-
-.endif
+ ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/wx -name *.so -exec ${STRIP_CMD} {} +
.include <bsd.port.mk>
Index: x11-toolkits/py-wxPython40/distinfo
===================================================================
--- x11-toolkits/py-wxPython40/distinfo
+++ x11-toolkits/py-wxPython40/distinfo
@@ -1,2 +1,3 @@
-SHA256 (python/wxPython-src-3.0.2.0.tar.bz2) = d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61
-SIZE (python/wxPython-src-3.0.2.0.tar.bz2) = 58304944
+TIMESTAMP = 1575036483
+SHA256 (python/wxPython-4.0.7.tar.gz) = 3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
+SIZE (python/wxPython-4.0.7.tar.gz) = 68868838
Index: x11-toolkits/py-wxPython40/files/patch-build.py
===================================================================
--- /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.")),
Index: x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
===================================================================
--- /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 {
Index: x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
===================================================================
--- /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 {
Index: x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
===================================================================
--- /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 {
Index: x11-toolkits/wxgtk30/Makefile
===================================================================
--- 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@tuxfamily.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
Sun, Feb 23, 8:18 AM (5 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16791059
Default Alt Text
D21915.id68194.diff (11 KB)

Event Timeline