From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 053E1138C9D for ; Sun, 26 Apr 2015 23:12:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C512E0784; Sun, 26 Apr 2015 23:12:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11204E0784 for ; Sun, 26 Apr 2015 23:12:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03BE8340D3E for ; Sun, 26 Apr 2015 23:12:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D061197D for ; Sun, 26 Apr 2015 23:12:30 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1430089936.0ae97df07920d82793e4c28657a96c302e388fd7.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild X-VCS-Directories: dev-qt/qtwebkit/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 0ae97df07920d82793e4c28657a96c302e388fd7 X-VCS-Branch: master Date: Sun, 26 Apr 2015 23:12:30 +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: f16ce2aa-0c73-46da-8b56-c097be9189e7 X-Archives-Hash: 6a82c1abc3b6d215bec175c997ffe032 commit: 0ae97df07920d82793e4c28657a96c302e388fd7 Author: Davide Pesavento gentoo org> AuthorDate: Sun Apr 26 23:12:16 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Apr 26 23:12:16 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0ae97df0 [dev-qt/qtwebkit:4] Prevent automagic dep on qt-mobility (bug 547350). Package-Manager: portage-2.2.18 dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild index 17b7957..8097f8b 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild @@ -47,14 +47,18 @@ QCONFIG_ADD="webkit" QCONFIG_DEFINE="QT_WEBKIT" src_prepare() { - # Fix version number in generated pkgconfig file, bug 406443 - sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ - src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - # Remove -Werror from CXXFLAGS sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ src/3rdparty/webkit/Source/WebKit.pri || die + # Fix version number in generated pkgconfig file (bug 406443) + sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ + src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die + + # Prevent automagic dependency on qt-mobility (bug 547350) + sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \ + src/3rdparty/webkit/Source/WebCore/features.pri || die + if use icu; then sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die