Attachment #236476 for bug #265093




PORTNAME=	wxPython
PORTVERSION=	4.2.0
CATEGORIES=	x11-toolkits python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
PKGNAMESUFFIX=	42
DIST_SUBDIR=	python

MAINTAINER=	desktop@FreeBSD.org

LICENSE_FILE_WXWINDOWS=	${WRKSRC}/license/licence.txt
LICENSE_PERMS_WXWINDOWS=	dist-mirror pkg-mirror auto-accept

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrdict>0:devel/py-attrdict@${PY_FLAVOR} \
		${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.2
USE_PYTHON=	distutils autoplist

OPTIONS_DEFINE=		NLS

Lines 1-3 Link Here

(-)b/x11-toolkits/py-wxPython4/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1643317997	1	TIMESTAMP = 1662817003
2	SHA256 (python/wxPython-4.1.1.tar.gz) = 00e5e3180ac7f2852f342ad341d57c44e7e4326de0b550b9a5c4a8361b6c3528	2	SHA256 (python/wxPython-4.2.0.tar.gz) = 663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7
3	SIZE (python/wxPython-4.1.1.tar.gz) = 66043287	3	SIZE (python/wxPython-4.2.0.tar.gz) = 70958238




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

Return to bug 265093

Lines 1-9 Link Here

(-)b/x11-toolkits/py-wxPython4/Makefile (-4 / +5 lines)
1	PORTNAME= wxPython	1	PORTNAME= wxPython
2	PORTVERSION= 4.1.1	2	PORTVERSION= 4.2.0
3	CATEGORIES= x11-toolkits python	3	CATEGORIES= x11-toolkits python
4	MASTER_SITES= CHEESESHOP	4	MASTER_SITES= CHEESESHOP
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6	PKGNAMESUFFIX= 41	6	PKGNAMESUFFIX= 42
7	DIST_SUBDIR= python	7	DIST_SUBDIR= python
8		8
9	MAINTAINER= desktop@FreeBSD.org	9	MAINTAINER= desktop@FreeBSD.org
Lines 16-26 LICENSE_NAME_WXWINDOWS= wxWindows Library Licence, Version 3.1 Link Here
16	LICENSE_FILE_WXWINDOWS= ${WRKSRC}/license/licence.txt	16	LICENSE_FILE_WXWINDOWS= ${WRKSRC}/license/licence.txt
17	LICENSE_PERMS_WXWINDOWS= dist-mirror pkg-mirror auto-accept	17	LICENSE_PERMS_WXWINDOWS= dist-mirror pkg-mirror auto-accept
18		18
19	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}	19	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrdict>0:devel/py-attrdict@${PY_FLAVOR} \
		20	${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}
20		21
21	USES= compiler:c++11-lib gl localbase pkgconfig python:3.6+	22	USES= compiler:c++11-lib gl localbase pkgconfig python:3.6+
22	USE_GL= glu	23	USE_GL= glu
23	USE_WX= 3.1	24	USE_WX= 3.2
24	USE_PYTHON= distutils autoplist	25	USE_PYTHON= distutils autoplist
25		26
26	OPTIONS_DEFINE= NLS	27	OPTIONS_DEFINE= NLS

Lines 1-13 Link Here

(-)b/x11-toolkits/py-wxPython4/files/patch-sip_cpp_sip__gridwxGridEvent.cpp (-13 lines)
1	--- sip/cpp/sip_gridwxGridEvent.cpp.orig 2022-01-27 22:07:16 UTC
2	+++ sip/cpp/sip_gridwxGridEvent.cpp
3	@@ -32,8 +32,8 @@ class sipwxGridEvent : public ::wxGridEvent (public)
4	* this class.
5	*/
6	protected:
7	- int GetRow() SIP_OVERRIDE;
8	- int GetCol() SIP_OVERRIDE;
9	+ int GetRow();
10	+ int GetCol();
11	::wxEvent* Clone() const SIP_OVERRIDE;
12	::wxEventCategory GetEventCategory() const SIP_OVERRIDE;
13