From nobody Sun May 29 11:22:03 2022 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 4263B1B5619C; Sun, 29 May 2022 11:22:04 +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 4L9x2g53pNz3D7D; Sun, 29 May 2022 11:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653823323; 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=quOEu95OTZP9KUdYYU5r2ZCRH9qdnjsnmbFcjeBQUcQ=; b=RWA5fYIGFUyMRVTxWX8ktuPbncMnCHBsdhoCIniK2zjwuimQs8cGGemI6JeBKI472JF9rG PhG8oOCPyT/IyBKPwES9nXhe+ZUUm7xyXiaF5yMu2l9HaYK2WQFduoJy2gijjsVsNUn0LN qol9G/uxM+1DT4yZeo2xslbLrSQbqhtWVRYtGwY8WrNh9SRYN7po0apri+1YMV7ONHwNDX YQtNH61KR6HUG2yJPTaXs6gGQ5FDrrp1f57LxTQTCCRte+ts0b5YFL/9e6N425X6pHlGC6 TaTMRJ+I5T6n58qnPqumHCZW3EVkJyqj+h/V1vB3X+jbZcw8kXOxcQGUBQwDMg== 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 708D4221F8; Sun, 29 May 2022 11:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24TBM3p7067672; Sun, 29 May 2022 11:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24TBM3C0067671; Sun, 29 May 2022 11:22:03 GMT (envelope-from git) Date: Sun, 29 May 2022 11:22:03 GMT Message-Id: <202205291122.24TBM3C0067671@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: c289bc627850 - main - Uses/pyqt.mk: repair PORTEPOCH of py-sip dependency 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c289bc6278504bd2dd455851a5de8de4bf48af4e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653823323; 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=quOEu95OTZP9KUdYYU5r2ZCRH9qdnjsnmbFcjeBQUcQ=; b=RNRyahEKBWc26R5rowShjQoiywk4SODdljw7BF5tqMMYUNCOwc8rp3PFJdYVuU1q3Wgs/Z rU3KDM/bixZjmqLnkjx4ZBccV8rEatbr1CpR/MljUrm7lQmpYpijg5+bbsqUD01FVNVZLh XCiZxzqPAJ1yyo0T+kEA+f+fIfXTjoyjrOQxbczrkTHyQDk3JfZnooFMfqenRZXUXbyOQg 97ZXGUo6RBtBDyHq2suNFpWxEkxBJ1ibMKFmYf0ijcaT51ENNd727/kSLSSJwYh4egXY99 jg1a4abrYvOdRbzTvxar+g969ZAThdFJjwZh6RQmIh+5euzTpz/vKdboT8jc4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653823323; a=rsa-sha256; cv=none; b=lhgTAFhPeO7IirP4/tY3mynXKiGRsedQZH3BJ58LEXb5nDJJ1I+49E+dhv8f8FeUKF+QUt HvFZ+IgLu53Fxh73H705gsdBy3Bdir0gg9kTrb9dsjxTyo1kMJ828p+yjib+OxlI0Hcl0/ s/n/BArnHwxVrIeOpGrogRFOjSKTDsbeU0OGgV9zJN9ZDy1mIBQvIWokrj5Rjj0pE7Ue8s IFhC22NKw/LRzjfiP+A+Zvb8LrpDWjpnPjfOX24bmOpMJKFb5FOnZ+rSIGGaWoyOH7icDQ gO7j5rU7SMWQjgG7nzU4FHO5RNMCJKAhro0Wb4cR73MKN/hdjuMbrjxOMUJirA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=c289bc6278504bd2dd455851a5de8de4bf48af4e commit c289bc6278504bd2dd455851a5de8de4bf48af4e Author: Adriaan de Groot AuthorDate: 2022-05-29 11:02:53 +0000 Commit: Adriaan de Groot CommitDate: 2022-05-29 11:16:44 +0000 Uses/pyqt.mk: repair PORTEPOCH of py-sip dependency When using BUILD_DEPENDS with a dependency-version, as described in section 5.9.9 of the Porters Handbook, a desired-version can be compared with an installed-version, e.g.: py38-sip>=6.5.1:devel/py-sip@py38 The version is compared fully with all the ports-versioning parts included. That includes the PORTEPOCH, which isn't visible (because =0 in the specification above). Since py-sip was epoched at some point, the installed version of py-sip might be this: py38-sip-5.5.0,1 Python to C and C++ bindings generator Because of the epoch, the version 5.5.0,1 > 6.5.1, even though visually it seems like it wouldn't be. Massage the dependency generation in pyqt.mk to take that epoch into account. PR: 262129 Reported by: Rafael Grether --- Mk/Uses/pyqt.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index 62013f08c376..a421a438056b 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -63,7 +63,15 @@ MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \ SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ GENTOO -SIP_VERSION= 6.5.1 +# PORTEPOCH is important here, because version-comparisons in *_DEPENDS +# take it into account (visually, 6.5.1 >= 5.5.3,1, but it isn't). +# Adding the epoch directly into the version here cannot be done, +# because the DISTVERSION of each of these ports is obtained from the +# *_VERSION variable (and PORTEPOCH is set in each individual port). +# +# Where noted, the ports are epoched and the py-${comp}-PATH variables, +# below, should have a suitable epoch appended to the version. +SIP_VERSION= 6.5.1 # ,1 SIP4_VERSION= 4.19.25 QSCI2_VERSION= 2.13.2 PYQT5_VERSION= 5.15.6 @@ -99,8 +107,8 @@ PYQT_DISTNAME= ${PYQT${_PYQT_VERSION}_DISTNAME} PYQT_DISTINFO_FILE= ${PYQT${_PYQT_VERSION}_DISTINFO_FILE} PYQT_LICENSE= ${PYQT${_PYQT_VERSION}_LICENSE} -# PATH -py-sip_PATH= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION} +# PATH (see note about epochs, above) +py-sip_PATH= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION},1 py-pysip_PATH= ${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION} py-qscintilla2_PATH= ${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION} py-qtbuilder_PATH= ${PYTHON_PKGNAMEPREFIX}qtbuilder>=${PYQTBUILDER_VERSION}