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

["Priit Laes" <plaes@plaes.org>]

commit:     e251a7a5128ababb1c23752acadd4ca5cb8ad242
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Dec 20 17:34:49 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Dec 20 17:34:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e251a7a5

net-libs/webkit-gtk: Bump to 1.7.3

---
 .../files/webkit-gtk-1.7.2-fix-gtk2-build.patch    |   13 ------
 .../files/webkit-gtk-1.7.2-fix-webgl-build.patch   |   44 --------------------
 ....2-r200.ebuild => webkit-gtk-1.7.3-r200.ebuild} |    2 -
 ....2-r300.ebuild => webkit-gtk-1.7.3-r300.ebuild} |    5 +-
 4 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-gtk2-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-gtk2-build.patch
deleted file mode 100644
index 77718b4..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-gtk2-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur webkit-1.7.2.orig//Source/WebKit/gtk/tests/testatk.c webkit-1.7.2//Source/WebKit/gtk/tests/testatk.c
---- webkit-1.7.2.orig//Source/WebKit/gtk/tests/testatk.c	2011-11-28 01:06:19.868230689 +0100
-+++ webkit-1.7.2//Source/WebKit/gtk/tests/testatk.c	2011-11-28 01:45:56.214331937 +0100
-@@ -1686,7 +1686,9 @@
-     g_test_init(&argc, &argv, 0);
-     gtk_disable_setlocale();
-     setlocale(LC_ALL, "C");
-+#ifndef GTK_API_VERSION_2
-     gdk_disable_multidevice();
-+#endif
-     gtk_init(&argc, &argv);
- }
- 

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
deleted file mode 100644
index 529b068..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-webgl-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit f3a5204d163a46adc16fcee03e5478aa5031763a
-Author: mrobinson@webkit.org <mrobinson@webkit.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.2-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.3-r200.ebuild
similarity index 97%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.3-r200.ebuild
index cba9d55..f62db47 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.3-r200.ebuild
@@ -91,8 +91,6 @@ 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"
-	epatch "${FILESDIR}/${P}-fix-gtk2-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.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild
similarity index 96%
rename from net-libs/webkit-gtk/webkit-gtk-1.7.2-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild
index faa8a47..4ae3a69 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.3-r300.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=dev-libs/glib-2.27.90:2
 	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
 	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.33.6:2.4[introspection?]
+	>=net-libs/libsoup-2.37.2.1:2.4[introspection?]
 	dev-db/sqlite:3
 	>=x11-libs/pango-1.12
 	x11-libs/libXrender
@@ -94,10 +94,9 @@ 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"
+	#epatch "${FILESDIR}/${PN}-1.7.1-install-docs.patch"
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf