From nobody Sat Dec 02 02:10:57 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Shth16jHbz533W6; Sat, 2 Dec 2023 02:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Shth15wmvz3SsD; Sat, 2 Dec 2023 02:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701483057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FA1ApMCr+r9XeUojnCX4YhMPc8lLGPM+c2tdHHNGNJc=; b=d9zxUz1gQrkkWD40PypS2eT1BOQMkt6IesSLBELuVU3qSMxlZE/2q3n9WxhdHbCMGK/zG0 h+cRSHTWoeFmGaFHdI/dRBX5Krse1tVKxrrjQPRWdFCMXzu43hmDYoTK/5wGI/spaqdKtW 4BWsqS2Th8tZhyNxEKjLKsbTbPYInL5aLEhI5Pzw6ihJxSIZLS1Vau3WUQYlNg9lzWuFk2 HIEA+w6u7G9VHShrQoCw2MyURpR4rjEm5CZ844LMru7QXe6ulpsGOvfoJD/at73RcdbnzT HBDcWbXfR2AY2POHtOivWmuEUxfA9QgvxGrTYk0TKCYuExXpG4fcgBYymFZZnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701483057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FA1ApMCr+r9XeUojnCX4YhMPc8lLGPM+c2tdHHNGNJc=; b=nlCbEC1EVPEJxg4yoeQU/2yVc/350R9uH8eeGUrh16N5/kMxLd2KwT+rVuySYUU5gMpL+t SLkQsRPsijZC0UjTI7VS0yBo2shP/JUsL5s2hKY8Xx6LL4MPj+ae2jHir8FNZlp8WBTppG H1A72ywupQW5x6l7J8oQxfGdx5EtBz1TnBw+VO06R7PiNlp+CxMzd2rQ+qvkTjBoX+r1H/ bugI2C2uh9j3oQ5VdQ9ugon201jk6g3VvXa94RBMi0vl3xEvpz6wnKa1VjfZySjAtH8wxx +xfD+AituIDWVHL/AEJs/SNR9vicrNAGX4/td7qBRoEdytxIxWPI0BurDy1QJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701483057; a=rsa-sha256; cv=none; b=mN4eKr6nEVXR5phgB6uDU432H85+8+FehRq7CEnoqMJzgGhOP1YAp58pyhdxROTxbwVj6k /GJMmOp93sgwOnr+OomCYT7mWGumSkG0dBkAKIDf/uO4eydcZRYBC9kDlKvEd78GnE6QRb GaG+McoeinVIX7iFjzKUTZYux7FhoQAl8AshZ5TsY4XtCE3j39PT0tr3s3z3N0bUQtbfYM ZDpnL+f/PbsEz9XkGuruR43+STERcseKDDD1CHa+KamB/ClbDvgOHE4OQhvIPKXQAsu0o9 xcoocSRQ+luDbp5BDDNmFZuUmGrDVgMvpk8AccMoqsEpGwqg9qULwxFUKZRJUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Shth14xWkzxvt; Sat, 2 Dec 2023 02:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B22AvLX056549; Sat, 2 Dec 2023 02:10:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B22Av97056546; Sat, 2 Dec 2023 02:10:57 GMT (envelope-from git) Date: Sat, 2 Dec 2023 02:10:57 GMT Message-Id: <202312020210.3B22Av97056546@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 2133960e55fe - main - devel/py-qt5-pyqt: Disable QtWebKit bindings List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2133960e55fe5aa3bee22b25aeccdd54e868b5b0 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=2133960e55fe5aa3bee22b25aeccdd54e868b5b0 commit 2133960e55fe5aa3bee22b25aeccdd54e868b5b0 Author: Jason E. Hale AuthorDate: 2023-11-02 00:33:10 +0000 Commit: Jason E. Hale 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: --- 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',