Attachment 209070 Details for Bug 241893 – py-wxPython40 4.0.6

[patch] py-wxPython40 4.0.6

py36-wxPython40-4.0.6.diff (text/plain), 9.04 KB, created by Loïc Bartoletti on 2019-11-11 20:16:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2019-11-11 20:16:15 UTC

Size: 9.04 KB

patch

obsolete

>diff --git x11-toolkits/py-wxPython40/Makefile x11-toolkits/py-wxPython40/Makefile
>new file mode 100644
>index 000000000000..0a6d730422e1
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/Makefile
>@@ -0,0 +1,40 @@
>+# $FreeBSD$
>+
>+PORTNAME=	wxPython
>+PORTVERSION=	4.0.6
>+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
>+OPTIONS_DEFAULT=	NLS
>+
>+NLS_USES=	gettext
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e "s|WX_CONFIG = 'wx-config'|WX_CONFIG = 'wxgtk3u-3.0-config'|" ${WRKSRC}/build.py
>+
>+#post-install:
>+#.for l in _glcanvas _dataview _richtext _html2 _core siplib _media _aui _xml _propgrid _html _adv _stc _ribbon _xrc _grid
>+#	@${STRIPCMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/wx/${l}.so
>+#.endfor
>+
>+.include <bsd.port.mk>
>diff --git x11-toolkits/py-wxPython40/distinfo x11-toolkits/py-wxPython40/distinfo
>new file mode 100644
>index 000000000000..e5c322aaa829
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/distinfo
>@@ -0,0 +1,6 @@
>+TIMESTAMP = 1568055855
>+SHA256 (python/wxPython-4.0.6.tar.gz) = 35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
>+SIZE (python/wxPython-4.0.6.tar.gz) = 68815031
>+TIMESTAMP = 1568055855
>+SHA256 (python/wxPython-4.0.6.tar.gz) = 35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
>+SIZE (python/wxPython-4.0.6.tar.gz) = 68815031
>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..651d3c872b01
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
>@@ -0,0 +1,11 @@
>+--- 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__corecmodule.cpp x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__corecmodule.cpp
>new file mode 100644
>index 000000000000..9a9a9e23b492
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__corecmodule.cpp
>@@ -0,0 +1,12 @@
>+--- sip/cpp/sip_corecmodule.cpp.orig	2019-09-09 20:02:54 UTC
>++++ sip/cpp/sip_corecmodule.cpp
>+@@ -7189,9 +7189,6 @@ wxUIntPtr testUIntPtrTypemap(wxUIntPtr value)
>+ // non-string/unicode objects to unicode, and won't raise exceptions
>+ static wxString i_Py2wxString(PyObject* source)
>+ {
>+-#if wxUSE_UNICODE_WCHAR == 0
>+-#error wxString conversion can only handle WCHAR wxStrings currently
>+-#endif
>+     PyErr_Clear();
>+     PyObject* uni = source;
>+     if (PyBytes_Check(source)) {
>diff --git x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__corewxString.cpp x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__corewxString.cpp
>new file mode 100644
>index 000000000000..dcd33541c91f
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__corewxString.cpp
>@@ -0,0 +1,13 @@
>+--- sip/cpp/sip_corewxString.cpp.orig	2019-09-09 20:02:15 UTC
>++++ sip/cpp/sip_corewxString.cpp
>+@@ -49,10 +49,6 @@ static int convertTo_wxString(PyObject *sipPy,void **s
>+ {
>+      ::wxString **sipCppPtr = reinterpret_cast< ::wxString **>(sipCppPtrV);
>+ 
>+-        #if wxUSE_UNICODE_WCHAR == 0
>+-        #error wxString converison can only handle WCHAR wxStrings currently
>+-        #endif
>+-
>+         // Code to test a PyObject for compatibility with wxString
>+         if (!sipIsErr) {
>+             if (PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))
>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..31d841a2919a
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
>@@ -0,0 +1,11 @@
>+--- 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..23d02f494fc2
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
>@@ -0,0 +1,11 @@
>+--- 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/files/patch-src_string.sip x11-toolkits/py-wxPython40/files/patch-src_string.sip
>new file mode 100644
>index 000000000000..4276831011fe
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-src_string.sip
>@@ -0,0 +1,12 @@
>+--- src/string.sip.orig	2019-05-21 23:12:12 UTC
>++++ src/string.sip
>+@@ -23,9 +23,6 @@
>+     // wxUSE_UNICODE_UTF8 for this conversion.
>+ 
>+     %ConvertToTypeCode
>+-        #if wxUSE_UNICODE_WCHAR == 0
>+-        #error wxString converison can only handle WCHAR wxStrings currently
>+-        #endif
>+ 
>+         // Code to test a PyObject for compatibility with wxString
>+         if (!sipIsErr) {
>diff --git x11-toolkits/py-wxPython40/files/patch-src_wxpy__api.sip x11-toolkits/py-wxPython40/files/patch-src_wxpy__api.sip
>new file mode 100644
>index 000000000000..3ee80f5a39fb
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/files/patch-src_wxpy__api.sip
>@@ -0,0 +1,12 @@
>+--- src/wxpy_api.sip.orig	2019-05-21 23:12:12 UTC
>++++ src/wxpy_api.sip
>+@@ -29,9 +29,6 @@
>+ // non-string/unicode objects to unicode, and won't raise exceptions
>+ static wxString i_Py2wxString(PyObject* source)
>+ {
>+-#if wxUSE_UNICODE_WCHAR == 0
>+-#error wxString conversion can only handle WCHAR wxStrings currently
>+-#endif
>+     PyErr_Clear();
>+     PyObject* uni = source;
>+     if (PyBytes_Check(source)) {
>diff --git x11-toolkits/py-wxPython40/pkg-descr x11-toolkits/py-wxPython40/pkg-descr
>new file mode 100644
>index 000000000000..e6dba8d4d6fd
>--- /dev/null
>+++ x11-toolkits/py-wxPython40/pkg-descr
>@@ -0,0 +1,14 @@
>+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
>+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

Actions: View | Diff

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