diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-04-12 17:13:12 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-04-12 17:13:12 +0000 |
| commit | af73472c3ca5169d38caa1ff819989dee22bb632 (patch) | |
| tree | b2a73b3dd3731859bcb3ec8a6c80b5eb56fac18a /x11-libs | |
| parent | Mask glib-networking[smartcard] on ia64 and sparc because gnutls[pkcs11] cann... (diff) | |
| download | gentoo-2-af73472c3ca5169d38caa1ff819989dee22bb632.tar.gz gentoo-2-af73472c3ca5169d38caa1ff819989dee22bb632.tar.bz2 gentoo-2-af73472c3ca5169d38caa1ff819989dee22bb632.zip | |
Make dev-libs/icu optional as requested in bug 411091.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild | 23 |
2 files changed, 18 insertions, 10 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index 55e189a50ee9..db498ab0d19b 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,9 @@ # 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.141 2012/04/05 15:47:39 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.142 2012/04/12 17:13:12 pesa Exp $ + + 12 Apr 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.1.ebuild: + Make dev-libs/icu optional as requested in bug 411091. 05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-webkit-4.8.0-r1.ebuild: Drop Qt-4.8.0 diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild index b85345474a15..bd1c40f2a940 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.8.1.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.1.ebuild,v 1.2 2012/04/04 13:29:25 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild,v 1.3 2012/04/12 17:13:12 pesa Exp $ EAPI=4 @@ -9,11 +9,12 @@ inherit qt4-build flag-o-matic DESCRIPTION="The WebKit module for the Qt toolkit" SLOT="4" KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="+gstreamer +jit" +IUSE="+gstreamer +icu +jit" + +REQUIRED_USE="gstreamer? ( icu )" #407315 DEPEND=" dev-db/sqlite:3 - dev-libs/icu x11-libs/libX11 x11-libs/libXrender ~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,ssl,qpa=] @@ -23,7 +24,9 @@ DEPEND=" dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 - )" + ) + icu? ( dev-libs/icu ) +" RDEPEND="${DEPEND}" PATCHES=( @@ -56,21 +59,23 @@ src_prepare() { sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - # 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 - # Remove -Werror from CXXFLAGS sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ src/3rdparty/webkit/Source/WebKit.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 + fi + qt4-build_src_prepare } src_configure() { myconf+=" -webkit - -icu -system-sqlite + -system-sqlite + $(qt_use icu) $(qt_use jit javascript-jit) $(use gstreamer || echo -DENABLE_VIDEO=0)" |