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 6980C158086 for ; Thu, 9 Dec 2021 14:36:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71889E079E; Thu, 9 Dec 2021 14:36:08 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41DBDE079E for ; Thu, 9 Dec 2021 14:36:08 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C6BD342E8C for ; Thu, 9 Dec 2021 14:36:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 603C9206 for ; Thu, 9 Dec 2021 14:36:04 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1639060462.07d2091e4df014f600972c225d8aebc149657855.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtbase/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtbase/qtbase-6.9999.ebuild X-VCS-Directories: dev-qt/qtbase/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 07d2091e4df014f600972c225d8aebc149657855 X-VCS-Branch: master Date: Thu, 9 Dec 2021 14:36: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: d2fb130a-d72b-4b2b-8bb9-fde3475e0773 X-Archives-Hash: aec3c090a1989d7793f4361bd749a6d5 commit: 07d2091e4df014f600972c225d8aebc149657855 Author: Jimi Huotari gentoo org> AuthorDate: Thu Dec 9 14:33:51 2021 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Thu Dec 9 14:34:22 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=07d2091e dev-qt/qtbase: remove disable androiddeployqt from src_prepare() There's a switch for it now, and this currently breaks configure. Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Jimi Huotari gentoo.org> dev-qt/qtbase/qtbase-6.9999.ebuild | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index c0867b42..d6907aa7 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -103,14 +103,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - qt6-build_src_prepare - - # TODO: fails without QtGui - sed -e "/androiddeployqt/s/^/#DONT/" -e "/androidtestrunner/s/^/#DONT/" \ - -i src/tools/CMakeLists.txt || die -} - src_configure() { local mycmakeargs=( -DINSTALL_BINDIR=${QT6_BINDIR} @@ -126,6 +118,7 @@ src_configure() { -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR} -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} + -DQT_FEATURE_androiddeployqt=OFF -DQT_FEATURE_zstd=ON $(qt_feature concurrent) $(qt_feature dbus)