git: 2133960e55fe - main - devel/py-qt5-pyqt: Disable QtWebKit bindings
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 02 Dec 2023 02:10:57 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2133960e55fe5aa3bee22b25aeccdd54e868b5b0
commit 2133960e55fe5aa3bee22b25aeccdd54e868b5b0
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-11-02 00:33:10 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-12-02 02:09:35 +0000
devel/py-qt5-pyqt: Disable QtWebKit bindings
www/qt5-webkit is set to expire 2023-12-31 and we no longer have ports
that require the QtWebKit python bindings.
PR: 273866
Reported by: <rkoberman@gmail.com>
---
devel/py-qt5-pyqt/Makefile | 5 ++++-
devel/py-qt5-pyqt/pkg-plist | 19 -------------------
multimedia/openshot/files/patch-src_launch.py | 11 -----------
3 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/devel/py-qt5-pyqt/Makefile b/devel/py-qt5-pyqt/Makefile
index 0a240e7714e1..e27bcfa12400 100644
--- a/devel/py-qt5-pyqt/Makefile
+++ b/devel/py-qt5-pyqt/Makefile
@@ -1,5 +1,6 @@
PORTNAME= pyqt
PORTVERSION= ${PYQT_VERSION}
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT}
PKGNAMEPREFIX= ${PYQT_PY_RELNAME}-
@@ -24,10 +25,12 @@ USE_PYTHON= concurrent flavors py3kplist
USE_PYQT= qtbuilder sip pysip
USE_QT= connectivity core dbus declarative designer gui help imageformats location \
multimedia network opengl printsupport quick3d remoteobjects \
- sensors serialport speech sql svg testlib webchannel webkit websockets \
+ sensors serialport speech sql svg testlib webchannel websockets \
widgets x11extras xml xmlpatterns \
buildtools:build qmake:build
+SIP_ARGS= --disable QtWebKit --disable QtWebKitWidgets
+
PORTSCOUT?= limit:^${_QT_VERSION:R}
post-extract:
diff --git a/devel/py-qt5-pyqt/pkg-plist b/devel/py-qt5-pyqt/pkg-plist
index 66d65a06c4eb..64892097acc2 100644
--- a/devel/py-qt5-pyqt/pkg-plist
+++ b/devel/py-qt5-pyqt/pkg-plist
@@ -34,8 +34,6 @@ bin/pyuic5
%%PYTHON_SITELIBDIR%%/PyQt5/QtTest.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt5/QtTextToSpeech.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt5/QtWebChannel.abi%%PYTHON_MAJOR_VER%%.so
-%%PYTHON_SITELIBDIR%%/PyQt5/QtWebKit.abi%%PYTHON_MAJOR_VER%%.so
-%%PYTHON_SITELIBDIR%%/PyQt5/QtWebKitWidgets.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt5/QtWebSockets.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt5/QtWidgets.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt5/QtX11Extras.abi%%PYTHON_MAJOR_VER%%.so
@@ -713,23 +711,6 @@ bin/pyuic5
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebChannel/QtWebChannelmod.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebChannel/qwebchannel.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebChannel/qwebchannelabstracttransport.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/QtWebKit.toml
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/QtWebKitmod.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/qwebdatabase.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/qwebelement.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/qwebhistory.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/qwebhistoryinterface.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/qwebkitglobal.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/qwebpluginfactory.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/qwebsecurityorigin.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKit/qwebsettings.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKitWidgets/QtWebKitWidgets.toml
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKitWidgets/QtWebKitWidgetsmod.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKitWidgets/qgraphicswebview.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKitWidgets/qwebframe.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKitWidgets/qwebinspector.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKitWidgets/qwebpage.sip
-%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebKitWidgets/qwebview.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebSockets/QtWebSockets.toml
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebSockets/QtWebSocketsmod.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtWebSockets/qmaskgenerator.sip
diff --git a/multimedia/openshot/files/patch-src_launch.py b/multimedia/openshot/files/patch-src_launch.py
deleted file mode 100644
index 82ffc00ff526..000000000000
--- a/multimedia/openshot/files/patch-src_launch.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/launch.py.orig 2022-12-08 21:31:12 UTC
-+++ src/launch.py
-@@ -114,7 +114,7 @@ def main():
- '(requires Qt 5.11+)')
- parser.add_argument(
- '-b', '--web-backend', action='store',
-- choices=['auto', 'webkit', 'webengine'], default='auto',
-+ choices=['auto', 'webkit', 'webengine'], default='webkit',
- help="Web backend to use for Timeline")
- parser.add_argument(
- '-d', '--debug', action='store_true',