Index: Mk/bsd.wx.mk =================================================================== --- Mk/bsd.wx.mk (révision 523420) +++ Mk/bsd.wx.mk (copie de travail) @@ -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 (révision 523420) +++ audio/py-karaoke/Makefile (copie de travail) @@ -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/Makefile =================================================================== --- cad/kicad/Makefile (révision 523420) +++ cad/kicad/Makefile (copie de travail) @@ -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 (révision 523420) +++ emulators/playonbsd/Makefile (copie de travail) @@ -11,6 +11,8 @@ LICENSE= GPLv3 +ONLY_FOR_ARCHS= amd64 i386 + RUN_DEPENDS= 7z:archivers/p7zip \ bash:shells/bash \ glxinfo:graphics/mesa-demos \ @@ -23,22 +25,23 @@ 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 .if ${ARCH} == amd64 Index: x11-toolkits/Makefile =================================================================== --- x11-toolkits/Makefile (révision 523420) +++ x11-toolkits/Makefile (copie de travail) @@ -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 (nonexistent) +++ x11-toolkits/py-wxPython40/Makefile (copie de travail) @@ -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 Property changes on: x11-toolkits/py-wxPython40/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-toolkits/py-wxPython40/distinfo =================================================================== --- x11-toolkits/py-wxPython40/distinfo (nonexistent) +++ x11-toolkits/py-wxPython40/distinfo (copie de travail) @@ -0,0 +1,3 @@ +TIMESTAMP = 1575036483 +SHA256 (python/wxPython-4.0.7.tar.gz) = 3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233 +SIZE (python/wxPython-4.0.7.tar.gz) = 68868838 Property changes on: x11-toolkits/py-wxPython40/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-toolkits/py-wxPython40/files/patch-build.py =================================================================== --- x11-toolkits/py-wxPython40/files/patch-build.py (nonexistent) +++ x11-toolkits/py-wxPython40/files/patch-build.py (copie de travail) @@ -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-config.py =================================================================== --- x11-toolkits/py-wxPython40/files/patch-config.py (nonexistent) +++ x11-toolkits/py-wxPython40/files/patch-config.py (copie de travail) @@ -0,0 +1,10 @@ +--- config.py.orig 2015-04-11 19:08:36 UTC ++++ config.py +@@ -1030,6 +1030,7 @@ elif os.name == 'posix' or COMPILER == ' + + cflags = getWxConfigValue('--cxxflags') + cflags = cflags.split() ++ cflags.append('-std=c++11') + if debug: + cflags.append('-ggdb') + cflags.append('-O0') Property changes on: x11-toolkits/py-wxPython40/files/patch-config.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py =================================================================== --- x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py (nonexistent) +++ x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py (copie de travail) @@ -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-setup.py =================================================================== --- x11-toolkits/py-wxPython40/files/patch-setup.py (nonexistent) +++ x11-toolkits/py-wxPython40/files/patch-setup.py (copie de travail) @@ -0,0 +1,12 @@ +--- 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, Property changes on: x11-toolkits/py-wxPython40/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp =================================================================== --- x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp (nonexistent) +++ x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp (copie de travail) @@ -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 =================================================================== --- x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip (nonexistent) +++ x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip (copie de travail) @@ -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/py-wxPython40/files/patch-src_gtk___gdi__wrap.cpp =================================================================== --- x11-toolkits/py-wxPython40/files/patch-src_gtk___gdi__wrap.cpp (nonexistent) +++ x11-toolkits/py-wxPython40/files/patch-src_gtk___gdi__wrap.cpp (copie de travail) @@ -0,0 +1,20 @@ +--- 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); Property changes on: x11-toolkits/py-wxPython40/files/patch-src_gtk___gdi__wrap.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: x11-toolkits/py-wxPython40/files/patch-src_gtk_propgrid__wrap.cpp =================================================================== --- x11-toolkits/py-wxPython40/files/patch-src_gtk_propgrid__wrap.cpp (nonexistent) +++ x11-toolkits/py-wxPython40/files/patch-src_gtk_propgrid__wrap.cpp (copie de travail) @@ -0,0 +1,11 @@ +--- src/gtk/propgrid_wrap.cpp.orig 2014-11-27 20:51:32 UTC ++++ src/gtk/propgrid_wrap.cpp +@@ -3639,7 +3639,7 @@ bool PyObject_to_wxPGPropArgCls( PyObjec + } + else if ( input == Py_None ) + { +- *v = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL)); ++ *v = new wxPGPropArgCls(static_cast(NULL)); + } + else + { Property changes on: x11-toolkits/py-wxPython40/files/patch-src_gtk_propgrid__wrap.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: x11-toolkits/py-wxPython40/pkg-descr =================================================================== --- x11-toolkits/py-wxPython40/pkg-descr (nonexistent) +++ x11-toolkits/py-wxPython40/pkg-descr (copie de travail) @@ -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 Property changes on: x11-toolkits/py-wxPython40/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-toolkits/wxgtk30/Makefile =================================================================== --- x11-toolkits/wxgtk30/Makefile (révision 523420) +++ x11-toolkits/wxgtk30/Makefile (copie de travail) @@ -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