Index | Thread | Search

From:
Klemens Nanni <kn@openbsd.org>
Subject:
Re: UPDATE: x11/qt6 6.6.1
To:
Rafael Sadowski <rafael@sizeofvoid.org>
Cc:
ports@openbsd.org, tb@openbsd.org
Date:
Mon, 22 Jan 2024 20:04:01 +0000

Download raw body.

Thread
On Mon, Jan 22, 2024 at 12:31:14AM +0100, Rafael Sadowski wrote:
> Hi ports hackers,
> 
> here is a reworked diff to update Qt6 to 6.6.1.
> 
> Notable changes:
> 
> - I added python as new dependency to qtbase to use compileall.py.
>   Objections to do this?

If just for that you can do MODPY_RUNDEP = No;  python is probably
pulled in one way or another on machines using Qt6 apps, but from a
quick look shipped files don't seem that relevant to warrant an RDEP:

	$ pkg_info -L qt6-qtbase | grep py
	/usr/local/include/X11/qt6/QtTest/QSignalSpy
	/usr/local/include/X11/qt6/QtTest/qsignalspy.h
	/usr/local/lib/cmake/Qt6/QtCopyFileIfDifferent.cmake
	/usr/local/lib/qt6/libexec/qt-testrunner.py

^ That looks like the only script potentially being run by users and/or
as part of ports tests, perhaps?

	/usr/local/lib/qt6/libexec/sanitizer-testrunner.py

^ This is for ASAN, do we have that?  Same as above:  What uses that?

	/usr/local/lib/qt6/mkspecs/features/uikit/devices.py

^ looks Apple specific and wants /usr/bin/xcrun:
$ pkglocate bin/xcrun ; echo $?
0

> @@ -57,6 +55,9 @@ WANTLIB-psql += ${COMPILER_LIBCXX} Qt6Core Qt6Sql c execinfo m pq
>  
>  MULTI_PACKAGES =	-main -global -mysql -psql
>  
> +MODULES =	lang/python
> +CONFIGURE_STYLE = cmake
> +
>  LIB_DEPENDS-main =	${LIB_DEPENDS} \
>  			archivers/brotli \
>  			archivers/zstd \
> @@ -132,6 +133,12 @@ post-extract:
>  	cp ${WRKDIST}/mkspecs/openbsd-g++/qplatformdefs.h \
>  		${WRKDIST}/mkspecs/openbsd-clang/
>  
> +post-install:
> +	${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> +		${PREFIX}/lib/qt6/libexec/qt-testrunner.py \
> +		${PREFIX}/lib/qt6/libexec/sanitizer-testrunner.py\
> +		${PREFIX}/lib/qt6/mkspecs/features/uikit/devices.py

If these are indeed relevant, you probably want them in MODPY_ADJ_FILES
as well for good measure as they're now using '#!/usr/bin/env python3'.