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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0CC4B1396D0 for ; Tue, 12 Sep 2017 15:28:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B9D41FC161; Tue, 12 Sep 2017 15:28:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21A131FC161 for ; Tue, 12 Sep 2017 15:28:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4825C340806 for ; Tue, 12 Sep 2017 15:28:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FBAD8F73 for ; Tue, 12 Sep 2017 15:28:28 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1505230100.f743270fbbe4e084be0f1496cbbcc6cb2fcaed85.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild X-VCS-Directories: dev-qt/qtdeclarative/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: f743270fbbe4e084be0f1496cbbcc6cb2fcaed85 X-VCS-Branch: master Date: Tue, 12 Sep 2017 15:28:28 +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-Archives-Salt: b2c23428-75b6-4ca2-a905-f19b70826973 X-Archives-Hash: 049ae3a7218f3cadde660e2eef9fd4d8 commit: f743270fbbe4e084be0f1496cbbcc6cb2fcaed85 Author: Michael Palimaka gentoo org> AuthorDate: Tue Sep 12 15:28:04 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Sep 12 15:28:20 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f743270f dev-qt/qtdeclarative: apply forgotten changes to 5.10.9999 Package-Manager: Portage-2.3.6, Repoman-2.3.3 dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild index 23c47148..c6957999 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit python-any-r1 qt5-build +inherit flag-o-matic python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,6 +34,12 @@ RDEPEND="${COMMON_DEPEND} " src_prepare() { + # this is supposed to be handled by the build system (src/qml/qml.pro), + # fails because we override QMAKE_CXXFLAGS. bug 626070 + if tc-is-gcc && [[ $(gcc-major-version) -ge 6 ]]; then + append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse + fi + use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") qt_use_disable_mod localstorage sql \