diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-03-08 15:25:07 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-03-08 15:25:07 +0000 |
| commit | b89f3f9699a492000e75fcfb06d8a815043bb44c (patch) | |
| tree | 0a5ec58744bcfcc4f41270076421d3a4d950caec /x11-libs/qt-webkit | |
| parent | Marking fxruby-1.6.20-r1 ppc64 for bug 395983 (diff) | |
| download | gentoo-2-b89f3f9699a492000e75fcfb06d8a815043bb44c.tar.gz gentoo-2-b89f3f9699a492000e75fcfb06d8a815043bb44c.tar.bz2 gentoo-2-b89f3f9699a492000e75fcfb06d8a815043bb44c.zip | |
Forcefully enable text_breaking_with_icu to fix building with USE=gstreamer when dev-libs/libxml2[icu] is installed.
Fixes bug #407315 by Mark Nowiasz; thanks to Jouni Kosonen and Coacher for testing.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-webkit')
| -rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index 5389438f3668..9550cfafefa6 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.133 2012/03/07 15:02:56 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.134 2012/03/08 15:25:07 pesa Exp $ + + 08 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.0-r1.ebuild: + Forcefully enable text_breaking_with_icu to fix building with USE=gstreamer + when dev-libs/libxml2[icu] is installed. Fixes bug #407315 by Mark Nowiasz; + thanks to Jouni Kosonen and Coacher for testing. 07 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.0-r1.ebuild: Fix build with USE=gstreamer (bug 405701). diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild index 49f5e4f6bc0d..538c4aacc48d 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.2 2012/03/07 15:02:56 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.3 2012/03/08 15:25:07 pesa Exp $ EAPI="3" inherit qt4-build flag-o-matic toolchain-funcs @@ -12,6 +12,7 @@ IUSE="+gstreamer +jit" DEPEND=" dev-db/sqlite:3 + dev-libs/icu x11-libs/libXrender ~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl] ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=] @@ -49,7 +50,11 @@ src_prepare() { [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 use c++0x && append-cxxflags -fpermissive - sed -i -e '/QMAKE_CXXFLAGS[[:blank:]]*+=/s:-Werror::g' \ + # Always enable icu to avoid build failure, bug 407315 + sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ + src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die + + sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ src/3rdparty/webkit/Source/WebKit.pri || die qt4-build_src_prepare @@ -58,7 +63,7 @@ src_prepare() { src_configure() { myconf+=" -webkit - -system-sqlite + -icu -system-sqlite $(qt_use jit javascript-jit) $(use gstreamer || echo -DENABLE_VIDEO=0) " |