[gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: qt-webkit-4.8.1.ebuild ChangeLog

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

pesa        12/04/12 17:13:12

  Modified:             qt-webkit-4.8.1.ebuild ChangeLog
  Log:
  Make dev-libs/icu optional as requested in bug 411091.
  
  (Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild?r1=1.2&r2=1.3

Index: qt-webkit-4.8.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-webkit-4.8.1.ebuild	4 Apr 2012 13:29:25 -0000	1.2
+++ qt-webkit-4.8.1.ebuild	12 Apr 2012 17:13:12 -0000	1.3
@@ -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 @@
 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 @@
 		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 @@
 	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)"
 



1.142                x11-libs/qt-webkit/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.141&r2=1.142

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- ChangeLog	5 Apr 2012 15:47:39 -0000	1.141
+++ ChangeLog	12 Apr 2012 17:13:12 -0000	1.142
@@ -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