From nobody Fri Jul 14 07:18:28 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 4R2NB607pJz4mZHC; Fri, 14 Jul 2023 07:18:38 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from mailer.gwdg.de (mailer.gwdg.de [134.76.10.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2NB50NbLz3QLW; Fri, 14 Jul 2023 07:18:36 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of rhurlin@gwdg.de designates 134.76.10.26 as permitted sender) smtp.mailfrom=rhurlin@gwdg.de; dmarc=none Received: from excmbx-13.um.gwdg.de ([134.76.9.222] helo=email.gwdg.de) by mailer.gwdg.de with esmtp (GWDG Mailer) (envelope-from ) id 1qKD4U-000LIb-G0; Fri, 14 Jul 2023 09:18:34 +0200 Received: from MBX19-GWD-03.um.gwdg.de (10.108.142.56) by EXCMBX-13.um.gwdg.de (134.76.9.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.2507.27; Fri, 14 Jul 2023 09:18:34 +0200 Received: from [192.168.178.23] (10.250.9.199) by MBX19-GWD-03.um.gwdg.de (10.108.142.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.1118.30; Fri, 14 Jul 2023 09:18:34 +0200 Message-ID: Date: Fri, 14 Jul 2023 09:18:28 +0200 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: git: c3a413762d4f - main - graphics/qgis: Use default Python version To: , , References: <202307140706.36E76hOr066927@gitrepo.freebsd.org> Content-Language: en-US Reply-To: Rainer Hurling From: Rainer Hurling In-Reply-To: <202307140706.36E76hOr066927@gitrepo.freebsd.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.250.9.199] X-ClientProxiedBy: EXCMBX-23.um.gwdg.de (134.76.9.233) To MBX19-GWD-03.um.gwdg.de (10.108.142.56) X-Virus-Scanned: (clean) by clamav X-Spamd-Result: default: False [-3.88 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; NEURAL_HAM_MEDIUM(-0.99)[-0.987]; RWL_MAILSPIKE_EXCELLENT(-0.40)[134.76.10.26:from]; RCVD_IN_DNSWL_MED(-0.20)[134.76.10.26:from]; R_SPF_ALLOW(-0.20)[+ip4:134.76.10.0/23]; MIME_GOOD(-0.10)[text/plain]; FREEFALL_USER(0.00)[rhurlin]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; HAS_REPLYTO(0.00)[rhurlin@FreeBSD.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:207592, ipnet:134.76.0.0/16, country:DE]; DMARC_NA(0.00)[gwdg.de]; TO_DN_NONE(0.00)[]; REPLYTO_DN_EQ_FROM_DN(0.00)[]; HAS_XOIP(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-ports-all@FreeBSD.org,dev-commits-ports-main@FreeBSD.org] X-Rspamd-Queue-Id: 4R2NB50NbLz3QLW X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N 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 > 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 \