Attachment #209070 for bug #241893




# $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>

Added Link Here

(-)x11-toolkits/py-wxPython40/distinfo (+6 lines)
1	TIMESTAMP = 1568055855
2	SHA256 (python/wxPython-4.0.6.tar.gz) = 35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
3	SIZE (python/wxPython-4.0.6.tar.gz) = 68815031
4	TIMESTAMP = 1568055855
5	SHA256 (python/wxPython-4.0.6.tar.gz) = 35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37
6	SIZE (python/wxPython-4.0.6.tar.gz) = 68815031

Added Link Here

(-)x11-toolkits/py-wxPython40/files/patch-build.py (+11 lines)
1	--- build.py.orig 2019-05-21 23:12:12 UTC
2	+++ build.py
3	@@ -401,7 +401,7 @@ def makeOptionParser():
4	("mac_framework", (False, "Build wxWidgets as a Mac framework.")),
5	("mac_arch", ("", "Comma separated list of architectures to build on Mac")),
6
7	- ("use_syswx", (False, "Try to use an installed wx rather than building the "
8	+ ("use_syswx", (True, "Try to use an installed wx rather than building the "
9	"one in this source tree. The wx-config in {prefix}/bin "
10	"or the first found on the PATH determines which wx is "
11	"used. Implies --no_magic.")),

Added Link Here

(-)x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py (+11 lines)
1	--- etg/propgridiface.py.orig 2019-05-21 23:12:12 UTC
2	+++ etg/propgridiface.py
3	@@ -89,7 +89,7 @@ def run():
4	return sipGetState(sipTransferObj);
5	}
6	else if (sipPy == Py_None) {
7	- sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty >(NULL));
8	+ sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty >(NULL));
9	return sipGetState(sipTransferObj);
10	}
11	else {




--- 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)) {




--- 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))

Added Link Here

(-)x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp (+11 lines)
1	--- sip/cpp/sip_propgridwxPGPropArgCls.cpp.orig 2019-05-22 02:14:14 UTC
2	+++ sip/cpp/sip_propgridwxPGPropArgCls.cpp
3	@@ -317,7 +317,7 @@ static int convertTo_wxPGPropArgCls(PyObject *sipPy,vo
4	return sipGetState(sipTransferObj);
5	}
6	else if (sipPy == Py_None) {
7	- sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty >(NULL));
8	+ sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty >(NULL));
9	return sipGetState(sipTransferObj);
10	}
11	else {

Added Link Here

(-)x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip (+11 lines)
1	--- sip/gen/propgridiface.sip.orig 2019-05-22 02:13:01 UTC
2	+++ sip/gen/propgridiface.sip
3	@@ -108,7 +108,7 @@ class wxPGPropArgCls (public)
4	return sipGetState(sipTransferObj);
5	}
6	else if (sipPy == Py_None) {
7	- sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty >(NULL));
8	+ sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty >(NULL));
9	return sipGetState(sipTransferObj);
10	}
11	else {




--- 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) {




--- 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)) {




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

Return to bug 241893

Added Link Here

(-)x11-toolkits/py-wxPython40/Makefile (+40 lines)
1	# $FreeBSD$
2
3	PORTNAME= wxPython
4	PORTVERSION= 4.0.6
5	CATEGORIES= x11-toolkits python
6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8	PKGNAMESUFFIX= 40
9	DIST_SUBDIR= python
10
11	MAINTAINER= python@FreeBSD.org
12	COMMENT= GUI toolkit for the Python programming language
13
14	LICENSE= WXWINDOWS LGPL21+ GPLv2+
15	LICENSE_COMB= multi
16	LICENSE_NAME_WXWINDOWS= wxWindows Library Licence, Version 3.1
17	LICENSE_FILE_WXWINDOWS= ${WRKSRC}/license/licence.txt
18	LICENSE_PERMS_WXWINDOWS= dist-mirror pkg-mirror auto-accept
19
20	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}
21
22	USES= compiler:c++11-lib gl localbase pkgconfig python
23	USE_GL= glu
24	USE_WX= 3.0
25	USE_PYTHON= distutils autoplist
26
27	OPTIONS_DEFINE= NLS
28	OPTIONS_DEFAULT= NLS
29
30	NLS_USES= gettext
31
32	post-patch:
33	@${REINPLACE_CMD} -e "s\|WX_CONFIG = 'wx-config'\|WX_CONFIG = 'wxgtk3u-3.0-config'\|" ${WRKSRC}/build.py
34
35	#post-install:
36	#.for l in _glcanvas _dataview _richtext _html2 _core siplib _media _aui _xml _propgrid _html _adv _stc _ribbon _xrc _grid
37	# @${STRIPCMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/wx/${l}.so
38	#.endfor
39
40	.include <bsd.port.mk>

Added Link Here

(-)x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__corecmodule.cpp (+12 lines)
1	--- sip/cpp/sip_corecmodule.cpp.orig 2019-09-09 20:02:54 UTC
2	+++ sip/cpp/sip_corecmodule.cpp
3	@@ -7189,9 +7189,6 @@ wxUIntPtr testUIntPtrTypemap(wxUIntPtr value)
4	// non-string/unicode objects to unicode, and won't raise exceptions
5	static wxString i_Py2wxString(PyObject* source)
6	{
7	-#if wxUSE_UNICODE_WCHAR == 0
8	-#error wxString conversion can only handle WCHAR wxStrings currently
9	-#endif
10	PyErr_Clear();
11	PyObject* uni = source;
12	if (PyBytes_Check(source)) {

Added Link Here

(-)x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__corewxString.cpp (+13 lines)
1	--- sip/cpp/sip_corewxString.cpp.orig 2019-09-09 20:02:15 UTC
2	+++ sip/cpp/sip_corewxString.cpp
3	@@ -49,10 +49,6 @@ static int convertTo_wxString(PyObject sipPy,void *s
4	{
5	::wxString sipCppPtr = reinterpret_cast< ::wxString >(sipCppPtrV);
6
7	- #if wxUSE_UNICODE_WCHAR == 0
8	- #error wxString converison can only handle WCHAR wxStrings currently
9	- #endif
10	-
11	// Code to test a PyObject for compatibility with wxString
12	if (!sipIsErr) {
13	if (PyBytes_Check(sipPy) \|\| PyUnicode_Check(sipPy))

Added Link Here

(-)x11-toolkits/py-wxPython40/files/patch-src_string.sip (+12 lines)
1	--- src/string.sip.orig 2019-05-21 23:12:12 UTC
2	+++ src/string.sip
3	@@ -23,9 +23,6 @@
4	// wxUSE_UNICODE_UTF8 for this conversion.
5
6	%ConvertToTypeCode
7	- #if wxUSE_UNICODE_WCHAR == 0
8	- #error wxString converison can only handle WCHAR wxStrings currently
9	- #endif
10
11	// Code to test a PyObject for compatibility with wxString
12	if (!sipIsErr) {

Added Link Here

(-)x11-toolkits/py-wxPython40/files/patch-src_wxpy__api.sip (+12 lines)
1	--- src/wxpy_api.sip.orig 2019-05-21 23:12:12 UTC
2	+++ src/wxpy_api.sip
3	@@ -29,9 +29,6 @@
4	// non-string/unicode objects to unicode, and won't raise exceptions
5	static wxString i_Py2wxString(PyObject* source)
6	{
7	-#if wxUSE_UNICODE_WCHAR == 0
8	-#error wxString conversion can only handle WCHAR wxStrings currently
9	-#endif
10	PyErr_Clear();
11	PyObject* uni = source;
12	if (PyBytes_Check(source)) {

Added Link Here

(-)x11-toolkits/py-wxPython40/pkg-descr (+14 lines)
1	wxPython is a GUI toolkit for the Python programming language. It allows Python
2	programmers to create programs with a robust, highly functional graphical user
3	interface, simply and easily. It is implemented as a Python extension module
4	(native code) that wraps the popular wxWidgets cross platform GUI library, which
5	is written in C++.
6
7	WWW: http://www.wxpython.org
8	wxPython is a GUI toolkit for the Python programming language. It allows Python
9	programmers to create programs with a robust, highly functional graphical user
10	interface, simply and easily. It is implemented as a Python extension module
11	(native code) that wraps the popular wxWidgets cross platform GUI library, which
12	is written in C++.
13
14	WWW: http://www.wxpython.org