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

[Priit Laes]

commit:     8bac2c8ca9edbea37aea508c176eea6e3e211042
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Nov 26 08:32:08 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Nov 26 08:32:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8bac2c8c

net-libs/webkit-gtk: 1.7.1 → 1.7.2

---
 .../files/webkit-gtk-1.7.2-fix-webgl-build.patch   |   44 ++++++++++++++++++++
 ....1-r200.ebuild => webkit-gtk-1.7.2-r200.ebuild} |    4 +-
 ....1-r300.ebuild => webkit-gtk-1.7.2-r300.ebuild} |    4 +-
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-webgl-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-webgl-build.patch
new file mode 100644
index 0000000..529b068
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-webgl-build.patch
@@ -0,0 +1,44 @@
+commit f3a5204d163a46adc16fcee03e5478aa5031763a
+Author: mrobinson@××××××.org <mrobinson@××××××.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date:   Wed Nov 23 12:48:12 2011 +0000
+
+    Build fix for GTK+.
+    
+    * platform/graphics/gtk/DrawingBufferGtk.cpp:
+    (WebCore::DrawingBuffer::DrawingBuffer): Update signature and ASSERT
+    for the GTK+ port.
+    
+    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@101067 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+diff --git a/Source/WebCore/platform/graphics/gtk/DrawingBufferGtk.cpp b/Source/WebCore/platform/graphics/gtk/DrawingBufferGtk.cpp
+index 64a5310..f9a248b 100644
+--- a/Source/WebCore/platform/graphics/gtk/DrawingBufferGtk.cpp
++++ b/Source/WebCore/platform/graphics/gtk/DrawingBufferGtk.cpp
+@@ -36,17 +36,25 @@ namespace WebCore {
+ DrawingBuffer::DrawingBuffer(GraphicsContext3D* context,
+                              const IntSize& size,
+                              bool multisampleExtensionSupported,
+-                             bool packedDepthStencilExtensionSupported)
+-    : m_context(context)
++                             bool packedDepthStencilExtensionSupported,
++                             bool separateBackingTexture)
++    : m_separateBackingTexture(separateBackingTexture)
++    , m_scissorEnabled(false)
++    , m_context(context)
+     , m_size(-1, -1)
+     , m_multisampleExtensionSupported(multisampleExtensionSupported)
+     , m_packedDepthStencilExtensionSupported(packedDepthStencilExtensionSupported)
+     , m_fbo(context->createFramebuffer())
+     , m_colorBuffer(0)
+     , m_depthStencilBuffer(0)
++    , m_depthBuffer(0)
++    , m_stencilBuffer(0)
+     , m_multisampleFBO(0)
+     , m_multisampleColorBuffer(0)
+ {
++    // Support for a separate backing texture has only been enabled for
++    // the chromium port.
++    ASSERT(!m_separateBackingTexture);
+     ASSERT(m_fbo);
+     if (!m_fbo) {
+         clear();

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
similarity index 97%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
index 1e7d478..4d7744b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
@@ -10,8 +10,7 @@ inherit autotools eutils flag-o-matic eutils python virtualx
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-# Upstream is still shipping silly gzip files
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
 #SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
@@ -92,6 +91,7 @@ src_prepare() {
 
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
+	epatch "${FILESDIR}/${PN}-1.7.2-fix-webgl-build.patch"
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.2-r300.ebuild
similarity index 97%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.2-r300.ebuild
index 9888ea5..faa8a47 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.2-r300.ebuild
@@ -10,8 +10,7 @@ inherit autotools eutils flag-o-matic eutils python virtualx
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-# Upstream is still shipping silly gzip files
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
 #SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
@@ -95,6 +94,7 @@ src_prepare() {
 
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
+	epatch "${FILESDIR}/${PN}-1.7.2-fix-webgl-build.patch"
 
 	# Install docs on "make install" when USE=doc
 	epatch "${FILESDIR}/${PN}-1.7.1-install-docs.patch"