From nobody Fri Jul 14 07:08:26 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 4R2MyM0PLyz4lVxg; Fri, 14 Jul 2023 07:08:27 +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 4R2MyL73T2z3NMc; Fri, 14 Jul 2023 07:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689318507; 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=e0WWE3c1kSSjMNAooMBwdZI9/os2YA0cmyQpLIxNIXc=; b=Zjj+ppuK591mry+tFhC7r+/iwcZ6nJ6I9HkBJ1CU8BPM3iQr07i6GiGxMxoBgKIthRFzqg Ozbw4lKesZFOLg44KrM8vQLrH0eL5DY0VVEdrBiCYQkKm7a9B/SJUlC746j/h1YonYpB8T uyJWk0rdtqPi1PJHr9pq09hMuYgrDqh13Q+8rdvxB7fhymsiyMym1kmQ+395AgAV8f1awn X7a5sPmpfydggwNWAiN2DKW6M6TQmH7h7195SvSe+GM8Kv17PuraRNqYAlatyykaxzG90n ATRC8TPiIu8Yg4VfwkNlnIdVW3Z0x//AAmU4jX+a79MqzqlY5HorGBn2AHTR0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689318507; 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=e0WWE3c1kSSjMNAooMBwdZI9/os2YA0cmyQpLIxNIXc=; b=bYx4JqE/h33ukD7eCm2Bwqx20GZiyXFS8or+6u3f2JYAjde8QCM8YJKj4Ao+az1YZxDLpT 4TN9x1fJBhr1ieESRw6EDpxQXnz2+zxJr/KBfW2I12dyBzh32lrORpvTsgZUAmUZmZl0Kq VPVaYQ7cCvSJJzV8S6XJbNX883tf0U+uFncwUzCwhITFXuoSyODKgC5dbyD4ijM4y528iQ 4Nafp2u5gw7aCrJ/g2DD+KbJTK11r29sZi2VqnThvxHheLNwyj8ZzFUcFk1dVM91AoA3dV 4asIPqnBa0wdkXOlBwUQmCXKpOis4IRt4u2WndGureCLqIyBb7yT/sWi+8LkKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689318507; a=rsa-sha256; cv=none; b=VRcOxyBJWyrcDnNnx+NncZ9E3r/h64w4m6+gG8IoZ473iO4yz+9BGP9tkrRelJo3HvBkjR n4wauQ2/OW7aX8FCluH+NIAgDhhBPW719QH/iZnxdakgaFm4HtHsQTz9CKl47gY+e6HYCo xuknp6fxpaVZEcxGKTntpBcjzBMOfpzszHhVvtFt4s9TaQFJM04GfNhqM7MfB41GjuV+NB rv7tIeISWBQh5bDqcO8PXCJtU7lB248EcRg3PuYH9SKL+LnkspRnZtgoIsUroUUwfcn5Xb VAV2lrfY/nzWWal9lRc6F2Q7zFoveKQXgVTXGP0qTYR9375d7zPeG7v1mTiY/Q== 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 4R2MyL67MNz1NRP; Fri, 14 Jul 2023 07:08:26 +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 36E78Ql7067260; Fri, 14 Jul 2023 07:08:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E78Qkr067259; Fri, 14 Jul 2023 07:08:26 GMT (envelope-from git) Date: Fri, 14 Jul 2023 07:08:26 GMT Message-Id: <202307140708.36E78Qkr067259@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: 1ebb3088a667 - 2023Q3 - graphics/qgis: 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: 1ebb3088a667ec8f99012eaeec79a020dfeb2310 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ebb3088a667ec8f99012eaeec79a020dfeb2310 commit 1ebb3088a667ec8f99012eaeec79a020dfeb2310 Author: alt2600@icloud.com AuthorDate: 2023-07-14 06:51:53 +0000 Commit: Rainer Hurling CommitDate: 2023-07-14 07:07:40 +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 MFH: 2023Q3 (cherry picked from commit c3a413762d4f057b69e689df9ceeaf17a64419ec) --- graphics/qgis/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index cc50667175e1..a6e1a15fda6c 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -116,10 +116,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 \