Re: git: c3a413762d4f - main - graphics/qgis: Use default Python version

From: Rainer Hurling <rhurlin_at_gwdg.de>
Date: Fri, 14 Jul 2023 07:18:28 UTC
Forgot to reference the related PR 272457, sorry!

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272457


Am 14.07.23 um 09:06 schrieb Rainer Hurling:
> The branch main has been updated by rhurlin:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=c3a413762d4f057b69e689df9ceeaf17a64419ec
> 
> commit c3a413762d4f057b69e689df9ceeaf17a64419ec
> Author:     alt2600@icloud.com <alt2600@icloud.com>
> AuthorDate: 2023-07-14 06:51:53 +0000
> Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
> CommitDate: 2023-07-14 07:06:17 +0000
> 
>      graphics/qgis: Use default Python version
>      
>      cmake's FindPython.cmake always returns the highest found Python version,
>      although the default version is needed here, since only for this usually
>      further tools like SIP etc. are installed.
>      
>      Passing the path of the default version to Python_EXECUTABLE causes the
>      cmake configuration to use it.
>      
>      Co-authored-by: Rainer Hurling <rhurlin@gwdg.de>
>      
>      MFH:            2023Q3
> ---
>   graphics/qgis/Makefile | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
> index 7b23636144c0..e7f655bc5820 100644
> --- a/graphics/qgis/Makefile
> +++ b/graphics/qgis/Makefile
> @@ -118,10 +118,12 @@ USE_QT=		3d buildtools:build core concurrent dbus declarative \
>   
>   SHEBANG_FILES=	src/plugins/grass/scripts/*.py
>   
> +# Python_EXECUTABLE: Use the default version if multiple Pythons are available
>   CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Release \
>   		-DHAVE_PGCONFIG=1 \
>   		-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
>   		-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
> +		-DPython_EXECUTABLE=${PYTHON_CMD} \
>   		-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
>   		-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
>   		-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \