From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8814415800D for ; Sat, 8 Jul 2023 21:26:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE31EE090E; Sat, 8 Jul 2023 21:26:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4195E090E for ; Sat, 8 Jul 2023 21:26:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2D9E340E03 for ; Sat, 8 Jul 2023 21:26:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B105ACF for ; Sat, 8 Jul 2023 21:26:04 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1688851334.dac7c921f474318661b1031f6f78b556e496a1d4.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtlocation/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtlocation/qtlocation-5.15.10.9999.ebuild X-VCS-Directories: dev-qt/qtlocation/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: dac7c921f474318661b1031f6f78b556e496a1d4 X-VCS-Branch: master Date: Sat, 8 Jul 2023 21:26:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f0caa54-60fd-4dc6-b115-47d81dbfe6f0 X-Archives-Hash: 78150fe3295313cfe281ec47c8783a67 commit: dac7c921f474318661b1031f6f78b556e496a1d4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 8 20:47:46 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 8 21:22:14 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dac7c921 dev-qt/qtlocation: Move quirk back into local src_configure() Of course, qtlocation is not a qttools module, so qt5_tools_oos_quirk was never executed. Solve this by making the eclass function public and call qt5_configure_oos_quirk before qt5-build_src_configure. Closes: https://bugs.gentoo.org/910066 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtlocation/qtlocation-5.15.10.9999.ebuild | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev-qt/qtlocation/qtlocation-5.15.10.9999.ebuild b/dev-qt/qtlocation/qtlocation-5.15.10.9999.ebuild index a560ac92..badb3cba 100644 --- a/dev-qt/qtlocation/qtlocation-5.15.10.9999.ebuild +++ b/dev-qt/qtlocation/qtlocation-5.15.10.9999.ebuild @@ -38,3 +38,10 @@ QT5_TARGET_SUBDIRS=( src/imports/locationlabs src/plugins/geoservices ) + +src_configure() { + # src/plugins/geoservices requires files that are only generated when + # qmake is run in the root directory. Bug 633776. + qt5_configure_oos_quirk qtlocation-config.pri src/location + qt5-build_src_configure +}