pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-qt5: Fully depend on py-sip-qt5



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Thu Dec 1 11:39:39 2022 -0500
Changeset:	cb9ee8ddfe08b6783b9233c24fd65e73bef03624

Modified Files:
	py-qt5/Makefile

Log Message:
py-qt5: Fully depend on py-sip-qt5

It turns out that py-sip-qt5 provides qt5 bindings that have been
created with sip, not support for using sip with qt5.  It is not
possible to use py-qt5 without those files also being installed.
Therefore, change TOOL_DEPENDS to DEPENDS.

(It is possible DESCR of both should be updated, and that programs that
only want to use qt5 (rather than also run qt5 build tools) should
simply use py-sip-qt5 instead of py-qt5, but that remains to be
understood.)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cb9ee8ddfe08b6783b9233c24fd65e73bef03624

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-qt5/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diffs:
diff --git a/py-qt5/Makefile b/py-qt5/Makefile
index a353eb3a13..492684cc0d 100644
--- a/py-qt5/Makefile
+++ b/py-qt5/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	PyQt5-5.15.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/PyQt5/qt5/}
+PKGREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_PYPI:=P/PyQt5/}
 
@@ -11,9 +12,10 @@ HOMEPAGE=	https://www.riverbankcomputing.com/software/pyqt/intro
 LICENSE=	gnu-gpl-v3
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-sip6-[0-9]*:../../wip/py-sip6
-TOOL_DEPENDS+=	${PYPKGPREFIX}-sip-qt5>=12:../../wip/py-sip-qt5
 TOOL_DEPENDS+=	${PYPKGPREFIX}-qt-builder-[0-9]*:../../wip/py-qt-builder
 
+DEPENDS+=	${PYPKGPREFIX}-sip-qt5>=12:../../wip/py-sip-qt5
+
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake pkg-config
 


Home | Main Index | Thread Index | Old Index