[gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/

[Alexandre Restovtsev]

commit:     843751634fc300555c18e04451931d5018c69fc3
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 02:28:01 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr  6 02:35:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=84375163

net-libs/webkit-gtk: 1.7.92 → 1.8.0

Enable optional webkit2 support, add patch for CVE-2011-3064, add
workaround for paludis --disable-dependency-tracking bug (#406117,
thanks to Maciej Piechotka).

---
 .../webkit-gtk-1.8.0-svgimagebuffer-clip.patch     |  114 ++++++++++++++++++++
 ...92-r200.ebuild => webkit-gtk-1.8.0-r200.ebuild} |    9 ++-
 ...92-r300.ebuild => webkit-gtk-1.8.0-r300.ebuild} |   16 +++-
 3 files changed, 135 insertions(+), 4 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-svgimagebuffer-clip.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-svgimagebuffer-clip.patch
new file mode 100644
index 0000000..e93059f
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-svgimagebuffer-clip.patch
@@ -0,0 +1,114 @@
+Index: /trunk/Source/WebCore/ChangeLog
+===================================================================
+--- /trunk/Source/WebCore/ChangeLog	(revision 110561)
++++ /trunk/Source/WebCore/ChangeLog	(revision 110563)
+@@ -1,2 +1,31 @@
++2012-03-13  Stephen Chenney  <schenney@××××××××.org>
++
++        Crash in WebCore::GraphicsContext::paintingDisabled
++        https://bugs.webkit.org/show_bug.cgi?id=80669
++
++        Reviewed by Nikolas Zimmermann.
++
++        The SVGImageBufferTools::clipToImageBuffer method deletes the clip
++        image when it thinks it is not needed. However, there are cases when
++        it is in fact still needed, particularly when the clip buffer is
++        coming from higher up in the stack where it may be needed again.
++
++        So this patch adds a flag to only allow deletion of the image buffer
++        if it was created at the most recent call site.
++
++        Tests: svg/custom/circular-clip-path-references-crash-expected.svg
++               svg/custom/circular-clip-path-references-crash.svg
++
++        * rendering/svg/RenderSVGResourceClipper.cpp:
++        (WebCore::RenderSVGResourceClipper::applyClippingToContext):
++        * rendering/svg/RenderSVGResourceGradient.cpp:
++        (WebCore::clipToTextMask):
++        * rendering/svg/RenderSVGResourceMasker.cpp:
++        (WebCore::RenderSVGResourceMasker::applyResource):
++        * rendering/svg/SVGImageBufferTools.cpp:
++        (WebCore::SVGImageBufferTools::clipToImageBuffer):
++        * rendering/svg/SVGImageBufferTools.h:
++        (SVGImageBufferTools):
++
+ 2012-03-13  Gavin Peters  <gavinp@××××××××.org>
+ 
+Index: /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.cpp
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.cpp	(revision 109016)
++++ /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.cpp	(revision 110563)
+@@ -122,5 +122,5 @@
+ }
+ 
+-void SVGImageBufferTools::clipToImageBuffer(GraphicsContext* context, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>& imageBuffer)
++void SVGImageBufferTools::clipToImageBuffer(GraphicsContext* context, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>& imageBuffer, bool safeToClear)
+ {
+     ASSERT(context);
+@@ -137,5 +137,5 @@
+     // When nesting resources, with objectBoundingBox as content unit types, there's no use in caching the
+     // resulting image buffer as the parent resource already caches the result.
+-    if (!currentContentTransformation().isIdentity())
++    if (safeToClear && !currentContentTransformation().isIdentity())
+         imageBuffer.clear();
+ }
+Index: /trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp	(revision 106108)
++++ /trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp	(revision 110563)
+@@ -99,5 +99,5 @@
+ 
+     targetRect = textRootBlock->repaintRectInLocalCoordinates();
+-    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, targetRect, imageBuffer);
++    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, targetRect, imageBuffer, false);
+ 
+     AffineTransform matrix;
+Index: /trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp	(revision 106108)
++++ /trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp	(revision 110563)
+@@ -87,5 +87,6 @@
+     ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);
+ 
+-    if (!m_masker.contains(object))
++    bool missingMaskerData = !m_masker.contains(object);
++    if (missingMaskerData)
+         m_masker.set(object, new MaskerData);
+ 
+@@ -117,5 +118,5 @@
+         return false;
+ 
+-    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, maskerData->maskImage);
++    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, maskerData->maskImage, missingMaskerData);
+     return true;
+ }
+Index: /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.h
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.h	(revision 106157)
++++ /trunk/Source/WebCore/rendering/svg/SVGImageBufferTools.h	(revision 110563)
+@@ -43,5 +43,5 @@
+ 
+     static void renderSubtreeToImageBuffer(ImageBuffer*, RenderObject*, const AffineTransform&);
+-    static void clipToImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>&);
++    static void clipToImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>&, bool safeToClear);
+ 
+     static void calculateTransformationToOutermostSVGCoordinateSystem(const RenderObject*, AffineTransform& absoluteTransform);
+Index: /trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp
+===================================================================
+--- /trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp	(revision 109097)
++++ /trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp	(revision 110563)
+@@ -156,5 +156,6 @@
+                                                       const FloatRect& repaintRect, GraphicsContext* context)
+ {
+-    if (!m_clipper.contains(object))
++    bool missingClipperData = !m_clipper.contains(object);
++    if (missingClipperData)
+         m_clipper.set(object, new ClipperData);
+ 
+@@ -202,5 +203,5 @@
+         return false;
+ 
+-    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, clipperData->clipMaskImage);
++    SVGImageBufferTools::clipToImageBuffer(context, absoluteTransform, repaintRect, clipperData->clipMaskImage, missingClipperData);
+     return true;
+ }

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.0-r200.ebuild
similarity index 94%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.8.0-r200.ebuild
index 2ba8aef..999fe29 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.0-r200.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 #SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
@@ -82,6 +82,9 @@ src_prepare() {
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
 
+	# CVE-2011-3064, https://bugzilla.redhat.com/show_bug.cgi?id=807596
+	epatch "${FILESDIR}/${P}-svgimagebuffer-clip.patch"
+
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
 	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
@@ -127,6 +130,10 @@ src_prepare() {
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
+
+	# Ugly hack of a workaround for paludis braindamage, bug #406117
+	# http://paludis.exherbo.org/trac/ticket/1230
+	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
 }
 
 src_configure() {

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.0-r300.ebuild
similarity index 92%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.8.0-r300.ebuild
index 743f185..7573a17 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.92-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.0-r300.ebuild
@@ -10,14 +10,14 @@ inherit autotools eutils flag-o-matic gnome2-utils pax-utils python virtualx
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 #SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
-IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl"
+IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl webkit2"
 # bug 372493
 REQUIRED_USE="introspection? ( gstreamer )"
 
@@ -50,6 +50,8 @@ RDEPEND="
 	spell? ( >=app-text/enchant-0.22 )
 
 	webgl? ( virtual/opengl )
+
+	webkit2? ( >=x11-libs/gtk+-2.13:2 )
 "
 # paxctl needed for bug #407085
 DEPEND="${RDEPEND}
@@ -66,6 +68,7 @@ DEPEND="${RDEPEND}
 	test? (
 		x11-themes/hicolor-icon-theme
 		jit? ( sys-apps/paxctl ) )
+	webkit2? ( app-accessibility/at-spi2-core )
 "
 # Need real bison, not yacc
 
@@ -85,6 +88,9 @@ src_prepare() {
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
 
+	# CVE-2011-3064, https://bugzilla.redhat.com/show_bug.cgi?id=807596
+	epatch "${FILESDIR}/${P}-svgimagebuffer-clip.patch"
+
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
 	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
@@ -130,6 +136,10 @@ src_prepare() {
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
+
+	# Ugly hack of a workaround for paludis braindamage, bug #406117
+	# http://paludis.exherbo.org/trac/ticket/1230
+	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
 }
 
 src_configure() {
@@ -157,9 +167,9 @@ src_configure() {
 		$(use_enable gstreamer video)
 		$(use_enable jit)
 		$(use_enable webgl)
+		$(use_enable webkit2)
 		--enable-web-sockets
 		--with-gtk=3.0
-		--disable-webkit2
 		--enable-dependency-tracking
 		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
 		# Aqua support in gtk3 is untested