From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: remove x11/qt5/qtwebkit from x11/py-qt5
To: ports <ports@openbsd.org>
Date: Thu, 8 Feb 2024 15:12:17 +0100

Here is a simple diff to remove qtwebkit from. I modified configure.py
to make sure it will not picked up even it is present.

OK?

diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile
index e122384c90f..8848bfd29e5 100644
--- a/x11/py-qt5/Makefile
+++ b/x11/py-qt5/Makefile
@@ -5,7 +5,7 @@ DPB_PROPERTIES=	parallel
 MODPY_EGG_VERSION= 5.15.9
 DISTNAME=	PyQt5-${MODPY_EGG_VERSION}
 PKGNAME=	py-qt5-${MODPY_EGG_VERSION}
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	x11 devel
 
@@ -21,9 +21,8 @@ WANTLIB += Qt5MultimediaWidgets Qt5Network Qt5Nfc Qt5OpenGL Qt5Positioning
 WANTLIB += Qt5PositioningQuick Qt5PrintSupport Qt5Qml Qt5QmlModels
 WANTLIB += Qt5Quick Qt5QuickWidgets Qt5RemoteObjects Qt5Sensors
 WANTLIB += Qt5SerialPort Qt5Sql Qt5Svg Qt5Test Qt5TextToSpeech
-WANTLIB += Qt5WebChannel Qt5WebKit Qt5WebKitWidgets Qt5WebSockets
-WANTLIB += Qt5Widgets Qt5X11Extras Qt5Xml Qt5XmlPatterns dbus-1
-WANTLIB += m ${MODPY_WANTLIB}
+WANTLIB += Qt5WebChannel Qt5WebSockets Qt5Widgets Qt5X11Extras
+WANTLIB += Qt5Xml Qt5XmlPatterns dbus-1 m ${MODPY_WANTLIB}
 
 FLAVORS=	python3
 FLAVOR=		python3
@@ -50,7 +49,6 @@ LIB_DEPENDS=	${MODPY_LIB_DEPENDS} \
 		x11/qt5/qtsvg \
 		x11/qt5/qttools \
 		x11/qt5/qtwebchannel \
-		x11/qt5/qtwebkit \
 		x11/qt5/qtwebsockets \
 		x11/qt5/qtx11extras \
 		x11/qt5/qtxmlpatterns
diff --git a/x11/py-qt5/patches/patch-configure_py b/x11/py-qt5/patches/patch-configure_py
index ea53c858d05..d4c37a62814 100644
--- a/x11/py-qt5/patches/patch-configure_py
+++ b/x11/py-qt5/patches/patch-configure_py
@@ -1,7 +1,27 @@
 Index: configure.py
 --- configure.py.orig
 +++ configure.py
-@@ -2157,7 +2157,18 @@ def run_command(cmd, verbose):
+@@ -96,10 +96,6 @@ MODULE_METADATA = {
+     'QtWebChannel':         ModuleMetadata(
+                                     qmake_QT=['webchannel', 'network',
+                                             '-gui']),
+-    'QtWebKit':             ModuleMetadata(qmake_QT=['webkit', 'network']),
+-    'QtWebKitWidgets':      ModuleMetadata(
+-                                    qmake_QT=['webkitwidgets',
+-                                            'printsupport']),
+     'QtWebSockets':         ModuleMetadata(qmake_QT=['websockets', '-gui']),
+     'QtWidgets':            ModuleMetadata(qmake_QT=['widgets'], qpy_lib=True),
+     'QtWinExtras':          ModuleMetadata(qmake_QT=['winextras', 'widgets']),
+@@ -1306,8 +1302,6 @@ def check_modules(target_config, disabled_modules, ver
+             'qsvgwidget.h', 'new QSvgWidget()')
+     check_module(target_config, disabled_modules, verbose, 'QtTest', 'QtTest',
+             'QTest::qSleep(0)')
+-    check_module(target_config, disabled_modules, verbose, 'QtWebKit',
+-            'qwebkitglobal.h', 'qWebKitVersion()')
+     check_module(target_config, disabled_modules, verbose, 'QtWebKitWidgets',
+             'qwebpage.h', 'new QWebPage()')
+     check_module(target_config, disabled_modules, verbose, 'QtWidgets',
+@@ -2157,7 +2151,18 @@ def run_command(cmd, verbose):
      """ Run a command and display the output if requested.  cmd is the command
      to run.  verbose is set if the output is to be displayed.
      """
@@ -20,7 +40,7 @@ Index: configure.py
      if verbose:
          sys.stdout.write(cmd + "\n")
  
-@@ -2902,7 +2913,7 @@ Type 'no' to decline the terms of the license.
+@@ -2902,7 +2907,7 @@ Type 'no' to decline the terms of the license.
              sys.stdout.flush()
  
              try:
diff --git a/x11/py-qt5/pkg/PLIST b/x11/py-qt5/pkg/PLIST
index ae8c0694878..0675e87f2de 100644
--- a/x11/py-qt5/pkg/PLIST
+++ b/x11/py-qt5/pkg/PLIST
@@ -34,8 +34,6 @@ lib/python${MODPY_VERSION}/site-packages/PyQt5-${MODPY_EGG_VERSION}.dist-info/RE
 @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTest${MODPY_ABI3SO}.so
 @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTextToSpeech${MODPY_ABI3SO}.so
 @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebChannel${MODPY_ABI3SO}.so
-@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKit${MODPY_ABI3SO}.so
-@so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKitWidgets${MODPY_ABI3SO}.so
 @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebSockets${MODPY_ABI3SO}.so
 @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWidgets${MODPY_ABI3SO}.so
 @so lib/python${MODPY_VERSION}/site-packages/PyQt5/QtX11Extras${MODPY_ABI3SO}.so
@@ -728,25 +726,6 @@ lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebChannel/QtWebChanne
 lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebChannel/QtWebChannelmod.sip
 lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebChannel/qwebchannel.sip
 lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebChannel/qwebchannelabstracttransport.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/QtWebKit.toml
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/QtWebKitmod.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/qwebdatabase.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/qwebelement.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/qwebhistory.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/qwebhistoryinterface.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/qwebkitglobal.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/qwebpluginfactory.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/qwebsecurityorigin.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKit/qwebsettings.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKitWidgets/
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKitWidgets/QtWebKitWidgets.toml
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKitWidgets/QtWebKitWidgetsmod.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKitWidgets/qgraphicswebview.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKitWidgets/qwebframe.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKitWidgets/qwebinspector.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKitWidgets/qwebpage.sip
-lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebKitWidgets/qwebview.sip
 lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebSockets/
 lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebSockets/QtWebSockets.toml
 lib/python${MODPY_VERSION}/site-packages/PyQt5/bindings/QtWebSockets/QtWebSocketsmod.sip