diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-04-26 23:01:54 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-04-26 23:01:54 +0000 |
| commit | a8d18919a239ca588e6974a4eb77212b076f8d34 (patch) | |
| tree | 56effb86d2df0e60ca6d920b1d18808be5278f16 /dev-qt/qtwebkit | |
| parent | Remove old. (diff) | |
| download | gentoo-2-a8d18919a239ca588e6974a4eb77212b076f8d34.tar.gz gentoo-2-a8d18919a239ca588e6974a4eb77212b076f8d34.tar.bz2 gentoo-2-a8d18919a239ca588e6974a4eb77212b076f8d34.zip | |
Prevent automagic dependency on qt-mobility (bug 547350).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-qt/qtwebkit')
| -rw-r--r-- | dev-qt/qtwebkit/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild | 16 |
2 files changed, 14 insertions, 7 deletions
diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog index 7cf1f371f855..3217389d323e 100644 --- a/dev-qt/qtwebkit/ChangeLog +++ b/dev-qt/qtwebkit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-qt/qtwebkit # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.29 2015/04/15 04:41:43 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.30 2015/04/26 23:01:54 pesa Exp $ + + 26 Apr 2015; Davide Pesavento <pesa@gentoo.org> qtwebkit-4.8.6-r1.ebuild: + Prevent automagic dependency on qt-mobility (bug 547350). 15 Apr 2015; Yixun Lan <dlan@gentoo.org> qtwebkit-5.4.1.ebuild: keyword arm64, tested on cortex-a53 hardware diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild index 4ed5ee414db3..e9080a6e8d42 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:53 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v 1.2 2015/04/26 23:01:54 pesa Exp $ EAPI=5 @@ -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 |