From nobody Fri Jul 14 07:06:43 2023 X-Original-To: dev-commits-ports-main@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 4R2MwM5JQBz4lVV4; Fri, 14 Jul 2023 07:06:43 +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 4R2MwM21ycz3N44; Fri, 14 Jul 2023 07:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689318403; 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=3hRicb5BOv7KfyoICV8a91p8c6pxqydI3ua3Rka6LY0=; b=K9DVgAx31NZoMqb1vq47NmClirJryQmsPOmtkFn3IRDGGvEzd1cNSDUAiFRctboq1cg549 FqehYxdSPdaFzjev1NNPUcuuPUykHGmfAjdNcigL3snzyz4csa1J07EE4+k9NFrQN++8hs WJtQ7bVOSiRTPr2fYWRaF7I3l+gtM7+J5T3X1k5AwXjgeFxBITghFjQj2KfxoSBf4Xj17M n6b8J/YmMdKJItHBZd2XC96biWocjWesXK7XHnb/7WqUx3BtVKzfM7Oe33Z1qDHBdzSVVp 5CTfKPc3yYbDSvPJvTUryqQ0Zozkj10xCR+InX7f0B9+tOEc//e+XzIj+HrsBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689318403; 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=3hRicb5BOv7KfyoICV8a91p8c6pxqydI3ua3Rka6LY0=; b=wcSR4Zj2DISMjINI2BwvkYsLwR1EO/AH8WaKRSpcvLGLPr8+ExYMvEnz86H2rUzz1QdC5e HWMFxKNfIYBVdLFwzjMRS00ZM1M3kn0U3TyQ/EALXx8d8P+yd89tdJOKj74zTVw38pKyp1 gVmhTkYdlGUXOTVSeQRBOUx2olZ4+zV/t52Gvb4xKN1mOFM99cGp3AZsrzWkhdQ9oiLbGv MvEwYDiAOrz2d/z2GrFwuKWQUlD95MlqRZqQkdJ7W9cl4g+vBUCQvYj75eSlXJhZyfc9sJ KYD1n+mbSEzbU/5Yxcm5CEijX7rJUezKyVCxWTi4FvdXGV1nF+DIty/9/hlYoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689318403; a=rsa-sha256; cv=none; b=bq+N24iXk1ZN+k6WVH3lpQZ+gDgvC0BOhO98JfTpn+/L4S1vSutPKh+Gu3Kvh6sLWBz+iN s7J9GfEEYP0WNw0sRIh4/Y+pNcPPLFjMdHm6K+F4qIX0QB7jHj2onhdehaTXg/6DGHZulk SlvHrr7P7wxFW/I/Qw/kkneHU+vgEvEPVExyjr9CLu57jwLMSdHCEfyXqRfO73dOfNPCNa fq1nfvEx7L/rFAICqaXxks+lhwlEKpku+me3uiKvKKI2BKw0xmxDcKMlvlTLpQn8Wdb04V 0iBZdhwAVWbLeDekzSFDVAailKzp/5DdskShtipDh9XfpgXC/L6ia8/3d1qndw== 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 4R2MwM16mSz1NPQ; Fri, 14 Jul 2023 07:06:43 +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 36E76h3j066928; Fri, 14 Jul 2023 07:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E76hOr066927; Fri, 14 Jul 2023 07:06:43 GMT (envelope-from git) Date: Fri, 14 Jul 2023 07:06:43 GMT Message-Id: <202307140706.36E76hOr066927@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: c3a413762d4f - main - graphics/qgis: Use default Python version List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: c3a413762d4f057b69e689df9ceeaf17a64419ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3a413762d4f057b69e689df9ceeaf17a64419ec commit c3a413762d4f057b69e689df9ceeaf17a64419ec Author: alt2600@icloud.com AuthorDate: 2023-07-14 06:51:53 +0000 Commit: Rainer Hurling 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 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 \