From nobody Fri Jul 14 07:25:56 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 4R2NLY0Tt5z4mdG8; Fri, 14 Jul 2023 07:25:57 +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 4R2NLY02P0z3hMS; Fri, 14 Jul 2023 07:25:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689319557; 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=h0rlzVjQkzCzlkvhHOjaoTlaB7UuY1/G55ipXb0sRHo=; b=kNoqOmtZnJAdU8XACnybPpvPUXcEZmJ2shJ3r2tqPAz/DsFOngVcyaatCz8UtjQaeaev9n f7oKl9vkF7h2dhSWnqcbte2Zr/I+DyNWvgq+Chr/bqsfONlT2LCRvrROQWMNV5VyCX1A/c KERB25vvsrY4cvottFIBPK13r4sB6KcICbef4aiFlDFlCuYzoVRyqYzxWGT1KYCtyssuZy 6Et+afb6nhLGFF2TiUtqwS2WJNbx8+DxgxhYyxLyoofEf8pskKF0d7SmYWuN9haAJW/2yW 47J5wZBbOOAEoetUm8ktaBPfcS/Sur0kvyUJjJpE+m4DqZkLfz5wydwx7dQm8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689319557; 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=h0rlzVjQkzCzlkvhHOjaoTlaB7UuY1/G55ipXb0sRHo=; b=nWEMNTI6kkG8z92kFwAuG6wq8Ft5dK4yDRoimacmoDV3G1C3Ps1kGWgGLQraiBpY3dDaMG uCgcYAefsUWcjTiOgFJo3MYQyPhbTgDrWR/uFmfF+GuzpEnqL/2ceUaV6vqKW8w7RiuALV kT04/uAgixCn1vQP+TwHNfyNY8NVSCUyCArieLzpi1IV0UjA2IL60dBBlOkeccHc5XLaD2 dl6eFQnqnokrqOrSKCDP47O2xutYZ6Ls7ez+sQ3W6EOguktMqyv0ZPDfDJNtd3K68mYduR I7mOx1kfvUGlPRKoU4jDCu0k4bCh8Za/wrhHkjmygyiTOC6kiooVQn107W1dnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689319557; a=rsa-sha256; cv=none; b=PM/cNDLTZJXooot6KJvAOVgLQ/Pq18lTw1I8nXW+m57ZB83CUVFkK9uz1Cc/bn5G7ki3sA oGIhjvoNRsIPZz5PH7osAQWO1m5ugo3SINc62hkhcY7qxQk+9zWk6/bMZTXk8Dv/B8Br71 W3+K/fzCOZlM2Y0+ziYgu2/YRWYR11BvDfTsyq4oLB3TdsxX+lOiEgXiXOlVH150KFydN0 cmu0EjAZFkiREl6m/qteb3+QLSFb/Pof3/rUdSAX2Ab54aBBydiU9ImbqqYoHxm8eAcoTd Ce5sxWidZmlnxhwqMQCai4zrXlK9T464PqHFsuaZ//EylXHBxxdD8CBOpirF9g== 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 4R2NLX65mnz1NWC; Fri, 14 Jul 2023 07:25:56 +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 36E7Pu3w099780; Fri, 14 Jul 2023 07:25:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E7PuWP099779; Fri, 14 Jul 2023 07:25:56 GMT (envelope-from git) Date: Fri, 14 Jul 2023 07:25:56 GMT Message-Id: <202307140725.36E7PuWP099779@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: 347cd7d33612 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 347cd7d336121850e3b6234d4d4ebea96ab42588 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=347cd7d336121850e3b6234d4d4ebea96ab42588 commit 347cd7d336121850e3b6234d4d4ebea96ab42588 Author: alt2600@icloud.com AuthorDate: 2023-07-14 07:22:33 +0000 Commit: Rainer Hurling CommitDate: 2023-07-14 07:24:52 +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 --- graphics/qgis-ltr/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index f16b4eed3641..342c9dd4cd77 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -117,11 +117,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 \