From nobody Fri Jul 14 07:27:10 2023 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 4R2NMz06gqz4mdSC; Fri, 14 Jul 2023 07:27:11 +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 4R2NMy6p7yz3hWQ; Fri, 14 Jul 2023 07:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689319631; 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=1yKFBSRp6emwjNUZ720aeZpBlInGBYVNjdfG8zGGm1M=; b=h/o8xdUsRadKp4Hc9zcYtwznWnX0XBE7YSkZT+E/Y3nSapC10CFouvg0sSvr0/HjwoQRaV 6x1Ao8o4Qcz8VIIPOsSbkUf0f1AxHxQpgrkh9AeyVlvBqXdmwY1dXhvnw6FHp9eRB3XGNi oNIQ37kClPD07r6bQtgB6E8evMRZAoZFbqffX0FYTiPYQNocfl2g311a7S1oPuucukHu/0 sz6xzF95Gc2C+wFStw0ONVsNACq1FZGEBQxlGFl/Jsqlwa8eAszGQRg2Q9lbybN/UBe6M9 9tfcmBYS9rv8espgYsAXeCJpwaXiN+JX+3yAE8qkdr2dI4e1kKVWRhNeRl2DNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689319631; 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=1yKFBSRp6emwjNUZ720aeZpBlInGBYVNjdfG8zGGm1M=; b=LqKqDcK+rzfK8K16wxaBn6EDuWWMmTUsp3eW3zPfQnB3NYHn3MIyQPgq6iMTNUSsicgVoz 3P7oZTZLhQm/z//Bppt33eijIhmQjGsY+6kXDImjLUSy9XC4vN7/LZeYfW37QgMsO2YvFH CHjLTjUnav3N8YxzLn2XKT84WpNRvvucnGDEQGb0Esc4NxBpiKlWQt/AF13s32K5/A5EAd kRUDmKrM3sClzHEaOPW3H5JfVm1eXcCgLS/JCKcTCtMLR6dOKzNSUNIyU5Wu4kC0cpl5L1 DoDMxQ0olbt4BRYzISkoXFtvJBXAByRRa94KI0CV5UAjcJioeX3HMde6vOD6vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689319631; a=rsa-sha256; cv=none; b=lLXMgcdzOVOq3NB65tsGEjaBRGUMa+/O1h7b07hJC7amN/ZJ8McDqC+E7izx+Esbm5snLj EToCw+z5Cp1EbeKpbfkZU0PNU0DnvVq+0V4953P39nY7M5+opXa5/SRw+1de3qVCBPKSUS Je9q3u0pR5sA62OPRXMXKvSiPbhHW18IVXPWUfxT8pEauGcazIYYSFjxN9ps7NfHAXGQup ep9zDjbibc8VQH/hGndCGyxoyla67x5p65Yw+I5Ru1MV3mpDyQHKsmuyC0PRcdLgo6Jvbs 6Qx82L1ciRDZz74Rvs7pCs/UNmkaVYnKrQVZQOQ35C1dGy3DcKFTFU4pY9ohGQ== 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 4R2NMy5s7bz1N4t; Fri, 14 Jul 2023 07:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E7RADI000056; Fri, 14 Jul 2023 07:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E7RAEh000055; Fri, 14 Jul 2023 07:27:10 GMT (envelope-from git) Date: Fri, 14 Jul 2023 07:27:10 GMT Message-Id: <202307140727.36E7RAEh000055@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rainer Hurling Subject: git: 37513514834b - 2023Q3 - graphics/qgis-ltr: Use default Python version 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: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 37513514834bc0a27a792f458f2dbcd5ae3d7143 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=37513514834bc0a27a792f458f2dbcd5ae3d7143 commit 37513514834bc0a27a792f458f2dbcd5ae3d7143 Author: alt2600@icloud.com AuthorDate: 2023-07-14 07:22:33 +0000 Commit: Rainer Hurling CommitDate: 2023-07-14 07:26:39 +0000 graphics/qgis-ltr: 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 PR: 272457 MFH: 2023Q3 (cherry picked from commit 347cd7d336121850e3b6234d4d4ebea96ab42588) --- graphics/qgis-ltr/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index b1870e0f75ff..32ce5586f737 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -116,11 +116,13 @@ 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 \ -DWITH_INTERNAL_MDAL:BOOL=false \ -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 \