x11-toolkits/py-wxPython4: Update to 4.1

 - Rename wxPython40 to wxPython4
 - Update to 4.1 version
 - Fix wxgtk31 for string
 - Use wxGtk31 instead of wxgtk30
 - Fix kicad* ports with wxgtk31/wxPython 4.1

Changes:
 - https://www.wxpython.org/news/2020-11-21-wxpython-411-release/index.html

Reviewed by:	tcberner
Approved by:	yuri, bofh
Differential Revision:	D34080

10 files changed, 21 insertions, 59 deletions

diff --git a/x11-toolkits/py-wxPython40/Makefile b/x11-toolkits/py-wxPython4/Makefile
index 874be09f3c08..c69e0e30db46 100644
--- a/x11-toolkits/py-wxPython40/Makefile
+++ b/x11-toolkits/py-wxPython4/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	wxPython
-PORTVERSION=	4.0.7
-PORTREVISION=	2
+PORTVERSION=	4.1.1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	40
+PKGNAMESUFFIX=	41
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
@@ -20,7 +19,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}
 
 USES=		compiler:c++11-lib gl localbase pkgconfig python:3.6+
 USE_GL=		glu
-USE_WX=		3.0
+USE_WX=		3.1
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=		NLS
diff --git a/x11-toolkits/py-wxPython4/distinfo b/x11-toolkits/py-wxPython4/distinfo
new file mode 100644
index 000000000000..a796f2046b3d
--- /dev/null
+++ b/x11-toolkits/py-wxPython4/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1643317997
+SHA256 (python/wxPython-4.1.1.tar.gz) = 00e5e3180ac7f2852f342ad341d57c44e7e4326de0b550b9a5c4a8361b6c3528
+SIZE (python/wxPython-4.1.1.tar.gz) = 66043287
diff --git a/x11-toolkits/py-wxPython40/files/patch-build.py b/x11-toolkits/py-wxPython4/files/patch-build.py
index 24b88f7e93ef..24b88f7e93ef 100644
--- a/x11-toolkits/py-wxPython40/files/patch-build.py
+++ b/x11-toolkits/py-wxPython4/files/patch-build.py
diff --git a/x11-toolkits/py-wxPython4/files/patch-sip_cpp_sip__gridwxGridEvent.cpp b/x11-toolkits/py-wxPython4/files/patch-sip_cpp_sip__gridwxGridEvent.cpp
new file mode 100644
index 000000000000..14a153c42943
--- /dev/null
+++ b/x11-toolkits/py-wxPython4/files/patch-sip_cpp_sip__gridwxGridEvent.cpp
@@ -0,0 +1,13 @@
+--- sip/cpp/sip_gridwxGridEvent.cpp.orig	2022-01-27 22:07:16 UTC
++++ sip/cpp/sip_gridwxGridEvent.cpp
+@@ -32,8 +32,8 @@ class sipwxGridEvent : public  ::wxGridEvent (public)
+      * this class.
+      */
+ protected:
+-    int GetRow() SIP_OVERRIDE;
+-    int GetCol() SIP_OVERRIDE;
++    int GetRow();
++    int GetCol();
+      ::wxEvent* Clone() const SIP_OVERRIDE;
+      ::wxEventCategory GetEventCategory() const SIP_OVERRIDE;
+ 
diff --git a/x11-toolkits/py-wxPython40/pkg-descr b/x11-toolkits/py-wxPython4/pkg-descr
index 027967687f5c..027967687f5c 100644
--- a/x11-toolkits/py-wxPython40/pkg-descr
+++ b/x11-toolkits/py-wxPython4/pkg-descr
diff --git a/x11-toolkits/py-wxPython40/distinfo b/x11-toolkits/py-wxPython40/distinfo
deleted file mode 100644
index b510f058f78e..000000000000
--- a/x11-toolkits/py-wxPython40/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1575036483
-SHA256 (python/wxPython-4.0.7.tar.gz) = 3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
-SIZE (python/wxPython-4.0.7.tar.gz) = 68868838
diff --git a/x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py b/x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
deleted file mode 100644
index 948012a6588a..000000000000
--- a/x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
+++ /dev/null
@@ -1,17 +0,0 @@
-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 {
diff --git a/x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp b/x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
deleted file mode 100644
index 4b980b84bd8c..000000000000
--- a/x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-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 {
diff --git a/x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip b/x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
deleted file mode 100644
index cf0bc5415327..000000000000
--- a/x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
+++ /dev/null
@@ -1,17 +0,0 @@
-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 {
diff --git a/x11-toolkits/wxgtk31/Makefile b/x11-toolkits/wxgtk31/Makefile
index 9bddc4af6a05..cefcb6eb14ee 100644
--- a/x11-toolkits/wxgtk31/Makefile
+++ b/x11-toolkits/wxgtk31/Makefile
@@ -49,7 +49,8 @@ CONFIGURE_ARGS=	--with-libpng=sys \
 		--enable-backtrace \
 		--enable-ipv6 \
 		--enable-optimise \
-		--enable-utf8 \
+		--enable-unicode \
+		--enable-std_string \
 		--enable-graphics_ctx \
 		--enable-compat28 \
 		--enable-compat30