[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     0ae97df07920d82793e4c28657a96c302e388fd7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 23:12:16 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> 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