From nobody Thu Feb 13 03:09:47 2025 X-Original-To: dev-commits-ports-main@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 4YtgCJ5qcNz5mmxP; Thu, 13 Feb 2025 03:09:48 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtgCH6Dqhz3JH4; Thu, 13 Feb 2025 03:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739416187; 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=yYRY5lRg/rnjUJExmpYJumlPNKb2Yp467yEYRLlRBgY=; b=IN8fxTWOmGro6QWHrbvwn4v6k3IwlS4vjFsXfpgpTKDzuQE0bZkymhzPSpqXEHiHCVR6dQ nsBKxADv3v7mdC3DWnlZHChqnMX4OQcd3e5A0h/r9elmJWZSadLmPjHdzfT8yXNzhY9T9d 4IL+1ZdVzU0W+8RodBno0fVEDv5BdJRRmGbbwbESHDRVLToMnQkD1o8bsBPgqoYDyLlpzT hIezwG1rmoEoBZl9KSAdHGB70KpvVb2n5G8/5vR2qCuRL1KLR7tCLCUpuGn1FKQ05qZ+m0 fiDdc1sXDYZkMHc73DjWPanJQQTzguA2uFDsVxk506be1rLEKL7OJzw6RoV6Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739416187; 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=yYRY5lRg/rnjUJExmpYJumlPNKb2Yp467yEYRLlRBgY=; b=VztHVplw9MWiTG/J44x43hHsj6EzUcMssWVTQdsMI0oR1/eL8uJS+0lon0nx14la4QP4cd WGILaQtbCcOhv2jRIz9UblDUSUtzkJqGhtcR57yuN+p6lxNlbrtd35fGxRmz8ABe9ckiKH enNcVI8/3gznaxSynqPtDyy1A6S+lm/uQFIBuLBEtPcjpEUnwA8nFNptjVAqdPBp1aahMl 9Th30S8EwLC5MYq/vI7EbHrNViBFqvgo9HY03wccxhQX7otyyBIQ0DvCJg2dhJmGiFjBON qRpLt+winwWJ04L1G4v6NR2G17bKxXvGVqqGI+7ShI6Del2G1O9RkX9Wu/lXbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739416187; a=rsa-sha256; cv=none; b=HFxHnfsJWKWbCGKqOM9xdjYa6d/5nLh6Ymf5+4lr99QHl9Zm+bogA57HxEhFaAoF+LUFfw 7KIpDrlnVfWT8DGK84Pqe2NpiTK96PlHadz20+cOjkjCU09LUoqPdDIRUWkf8zhONkgX7f jRyhrKI7JgDXqxUx6UehPIVOFSBH+zTxm+YDp5iWxSXV7eIDSj58WQtrVpnGehnCKY7XuJ 6d6M2yPm3qkSnhvLv/Q2SY71HoOBP/W1HXqK4LeamDc2EeNM3VCagVZqkGSVQgkrfEtEAb CZ9FdO/L4LQ7xJumbmaGY9K4dXVJUACpCFcC4vJU06TBI5YrLtFFaw4IeuzGTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YtgCH5XJ5zB11; Thu, 13 Feb 2025 03:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51D39l9G007387; Thu, 13 Feb 2025 03:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51D39lpL007384; Thu, 13 Feb 2025 03:09:47 GMT (envelope-from git) Date: Thu, 13 Feb 2025 03:09:47 GMT Message-Id: <202502130309.51D39lpL007384@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: 66bfb7438233 - main - x11-toolkits/py-qt6-graphs: Fix PLIST_SUBs List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 66bfb74382332e210d0ce6cf873ff05451999a75 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=66bfb74382332e210d0ce6cf873ff05451999a75 commit 66bfb74382332e210d0ce6cf873ff05451999a75 Author: Jason E. Hale AuthorDate: 2025-02-12 06:04:25 +0000 Commit: Jason E. Hale CommitDate: 2025-02-13 03:09:01 +0000 x11-toolkits/py-qt6-graphs: Fix PLIST_SUBs Fix failure to package after 4b51612759d2. PYQT_PYQTVERSION should have been PYQTGRAPHS_VERSION as these components don't always have the same version. [1] Fix over-agressive PYTHON_MAJOR_VER substitutions. Add missing Qt components. Reported by: pkg-fallout [1] MFH: 2025Q1 --- x11-toolkits/py-qt6-graphs/Makefile | 7 ++++-- x11-toolkits/py-qt6-graphs/pkg-plist | 42 ++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/x11-toolkits/py-qt6-graphs/Makefile b/x11-toolkits/py-qt6-graphs/Makefile index 5428ac927867..d03d1fe5a821 100644 --- a/x11-toolkits/py-qt6-graphs/Makefile +++ b/x11-toolkits/py-qt6-graphs/Makefile @@ -1,5 +1,6 @@ PORTNAME= graphs DISTVERSION= ${PYQTGRAPHS_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MASTER_SITES= ${MASTER_SITES_PYQTGRAPHS} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- @@ -15,9 +16,11 @@ USES= gl pyqt:6,dist python qt:6 USE_GL= opengl USE_PYQT= pyqt6 qtbuilder:build sip:build USE_PYTHON= concurrent flavors -USE_QT= base graphs +USE_QT= base declarative graphs quick3d shadertools -PLIST_SUB= PYQTGRAPHS_VERSION=${DISTVERSION} +PLIST_SUB= PYQTGRAPHS_VERSION=${DISTVERSION} \ + PYTHON_MAJOR_VER=${PYTHON_MAJOR_VER} \ + PYTHON_MAJOR_VER_regex=[[:<:]]${PYTHON_MAJOR_VER}[[:>:]] post-install: @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \ diff --git a/x11-toolkits/py-qt6-graphs/pkg-plist b/x11-toolkits/py-qt6-graphs/pkg-plist index a9f8db172d3d..bffe18f0e4ec 100644 --- a/x11-toolkits/py-qt6-graphs/pkg-plist +++ b/x11-toolkits/py-qt6-graphs/pkg-plist @@ -1,26 +1,26 @@ %%PYQT_APIDIR%%/PyQt6-Graphs.api %%PYQT_SIPDIR%%/QtGraphs/QtGraphs.toml %%PYQT_SIPDIR%%/QtGraphs/QtGraphsmod.sip -%%PYQT_SIPDIR%%/QtGraphs/q%%PYTHON_MAJOR_VER%%dscene.sip -%%PYQT_SIPDIR%%/QtGraphs/qabstract%%PYTHON_MAJOR_VER%%daxis.sip -%%PYQT_SIPDIR%%/QtGraphs/qabstract%%PYTHON_MAJOR_VER%%dseries.sip +%%PYQT_SIPDIR%%/QtGraphs/q3dscene.sip +%%PYQT_SIPDIR%%/QtGraphs/qabstract3daxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qabstract3dseries.sip %%PYQT_SIPDIR%%/QtGraphs/qabstractaxis.sip %%PYQT_SIPDIR%%/QtGraphs/qabstractdataproxy.sip %%PYQT_SIPDIR%%/QtGraphs/qabstractseries.sip %%PYQT_SIPDIR%%/QtGraphs/qareaseries.sip -%%PYQT_SIPDIR%%/QtGraphs/qbar%%PYTHON_MAJOR_VER%%dseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qbar3dseries.sip %%PYQT_SIPDIR%%/QtGraphs/qbarcategoryaxis.sip %%PYQT_SIPDIR%%/QtGraphs/qbardataitem.sip %%PYQT_SIPDIR%%/QtGraphs/qbardataproxy.sip %%PYQT_SIPDIR%%/QtGraphs/qbarmodelmapper.sip %%PYQT_SIPDIR%%/QtGraphs/qbarseries.sip %%PYQT_SIPDIR%%/QtGraphs/qbarset.sip -%%PYQT_SIPDIR%%/QtGraphs/qcategory%%PYTHON_MAJOR_VER%%daxis.sip -%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%ditem.sip -%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%dlabel.sip -%%PYQT_SIPDIR%%/QtGraphs/qcustom%%PYTHON_MAJOR_VER%%dvolume.sip +%%PYQT_SIPDIR%%/QtGraphs/qcategory3daxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qcustom3ditem.sip +%%PYQT_SIPDIR%%/QtGraphs/qcustom3dlabel.sip +%%PYQT_SIPDIR%%/QtGraphs/qcustom3dvolume.sip %%PYQT_SIPDIR%%/QtGraphs/qdatetimeaxis.sip -%%PYQT_SIPDIR%%/QtGraphs/qgraphs%%PYTHON_MAJOR_VER%%dnamespace.sip +%%PYQT_SIPDIR%%/QtGraphs/qgraphs3dnamespace.sip %%PYQT_SIPDIR%%/QtGraphs/qgraphstheme.sip %%PYQT_SIPDIR%%/QtGraphs/qheightmapsurfacedataproxy.sip %%PYQT_SIPDIR%%/QtGraphs/qitemmodelbardataproxy.sip @@ -28,32 +28,32 @@ %%PYQT_SIPDIR%%/QtGraphs/qitemmodelsurfacedataproxy.sip %%PYQT_SIPDIR%%/QtGraphs/qlineseries.sip %%PYQT_SIPDIR%%/QtGraphs/qlist.sip -%%PYQT_SIPDIR%%/QtGraphs/qlogvalue%%PYTHON_MAJOR_VER%%daxisformatter.sip +%%PYQT_SIPDIR%%/QtGraphs/qlogvalue3daxisformatter.sip %%PYQT_SIPDIR%%/QtGraphs/qpiemodelmapper.sip %%PYQT_SIPDIR%%/QtGraphs/qpieseries.sip %%PYQT_SIPDIR%%/QtGraphs/qpieslice.sip -%%PYQT_SIPDIR%%/QtGraphs/qscatter%%PYTHON_MAJOR_VER%%dseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qscatter3dseries.sip %%PYQT_SIPDIR%%/QtGraphs/qscatterdataitem.sip %%PYQT_SIPDIR%%/QtGraphs/qscatterdataproxy.sip %%PYQT_SIPDIR%%/QtGraphs/qscatterseries.sip %%PYQT_SIPDIR%%/QtGraphs/qsplineseries.sip -%%PYQT_SIPDIR%%/QtGraphs/qsurface%%PYTHON_MAJOR_VER%%dseries.sip +%%PYQT_SIPDIR%%/QtGraphs/qsurface3dseries.sip %%PYQT_SIPDIR%%/QtGraphs/qsurfacedataitem.sip %%PYQT_SIPDIR%%/QtGraphs/qsurfacedataproxy.sip %%PYQT_SIPDIR%%/QtGraphs/qutils.sip -%%PYQT_SIPDIR%%/QtGraphs/qvalue%%PYTHON_MAJOR_VER%%daxis.sip -%%PYQT_SIPDIR%%/QtGraphs/qvalue%%PYTHON_MAJOR_VER%%daxisformatter.sip +%%PYQT_SIPDIR%%/QtGraphs/qvalue3daxis.sip +%%PYQT_SIPDIR%%/QtGraphs/qvalue3daxisformatter.sip %%PYQT_SIPDIR%%/QtGraphs/qvalueaxis.sip %%PYQT_SIPDIR%%/QtGraphs/qxymodelmapper.sip %%PYQT_SIPDIR%%/QtGraphs/qxyseries.sip %%PYQT_SIPDIR%%/QtGraphsWidgets/QtGraphsWidgets.toml %%PYQT_SIPDIR%%/QtGraphsWidgets/QtGraphsWidgetsmod.sip -%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dbarswidgetitem.sip -%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dgraphswidgetitem.sip -%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dscatterwidgetitem.sip -%%PYQT_SIPDIR%%/QtGraphsWidgets/q%%PYTHON_MAJOR_VER%%dsurfacewidgetitem.sip +%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dbarswidgetitem.sip +%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dgraphswidgetitem.sip +%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dscatterwidgetitem.sip +%%PYQT_SIPDIR%%/QtGraphsWidgets/q3dsurfacewidgetitem.sip %%PYTHON_SITELIBDIR%%/PyQt6/QtGraphs.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PyQt6/QtGraphsWidgets.abi%%PYTHON_MAJOR_VER%%.so -%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/INSTALLER -%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQT_PYQTVERSION%%.dist-info/RECORD +%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQTGRAPHS_VERSION%%.dist-info/INSTALLER +%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQTGRAPHS_VERSION%%.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/PyQt6_Graphs-%%PYQTGRAPHS_VERSION%%.dist-info/RECORD