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 81F9A139083 for ; Wed, 13 Sep 2017 12:12:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE88F1FC067; Wed, 13 Sep 2017 12:12:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BE5BB1FC067 for ; Wed, 13 Sep 2017 12:12:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A9B6133D3C7 for ; Wed, 13 Sep 2017 12:12:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3140F8B95 for ; Wed, 13 Sep 2017 12:12:05 +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: <1505304717.3171e9dadc5ff17ca8568f525eb6fe1581787b68.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 dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild X-VCS-Directories: dev-qt/qtdeclarative/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 3171e9dadc5ff17ca8568f525eb6fe1581787b68 X-VCS-Branch: master Date: Wed, 13 Sep 2017 12:12:05 +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: efccfec2-af92-45fd-b165-f02375c61063 X-Archives-Hash: 9787297d0ad422989d9631ad2b678ab7 commit: 3171e9dadc5ff17ca8568f525eb6fe1581787b68 Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 13 12:09:34 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 13 12:11:57 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3171e9da dev-qt/qtdeclarative: revert workaround The workaround is actually not required beginning with 5.8. This reverts commit 4512a456df71b4e9efb59b9952cc74ea565d9a03. This reverts commit f743270fbbe4e084be0f1496cbbcc6cb2fcaed85. dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild | 8 +------- dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild | 8 +------- dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild | 8 +------- dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 8 +------- 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild index c6957999..23c47148 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 flag-o-matic python-any-r1 qt5-build +inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,12 +34,6 @@ 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 \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild index c6957999..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit flag-o-matic python-any-r1 qt5-build +inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,12 +34,6 @@ 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 \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild index c6957999..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit flag-o-matic python-any-r1 qt5-build +inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,12 +34,6 @@ 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 \ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild index c6957999..23c47148 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5} ) -inherit flag-o-matic python-any-r1 qt5-build +inherit python-any-r1 qt5-build DESCRIPTION="The QML and Quick modules for the Qt5 framework" @@ -34,12 +34,6 @@ 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 \