[webkitgtk3] fix patches so they apply within the rpm
Peter Robinson
pbrobinson at fedoraproject.org
Wed Apr 18 10:31:24 UTC 2012
commit 410abb9ad54934d3fc9dba5fafc0214a2abbfc27
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Wed Apr 18 11:31:20 2012 +0100
fix patches so they apply within the rpm
webkit-r113389.diff | 25 +++----------------------
webkit-r114385.diff | 36 +++---------------------------------
2 files changed, 6 insertions(+), 55 deletions(-)
---
diff --git a/webkit-r113389.diff b/webkit-r113389.diff
index ac7f728..9b95825 100644
--- a/webkit-r113389.diff
+++ b/webkit-r113389.diff
@@ -1,26 +1,7 @@
-Index: /trunk/Source/JavaScriptCore/ChangeLog
+Index: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
===================================================================
---- /trunk/Source/JavaScriptCore/ChangeLog (revision 113365)
-+++ /trunk/Source/JavaScriptCore/ChangeLog (revision 113389)
-@@ -1,2 +1,14 @@
-+2012-04-05 Oliver Hunt <oliver at apple.com>
-+
-+ SIGILL in JavaScriptCore on a Geode processor
-+ https://bugs.webkit.org/show_bug.cgi?id=82496
-+
-+ Reviewed by Gavin Barraclough.
-+
-+ Don't attempt to use the DFG when SSE2 is not available.
-+
-+ * dfg/DFGCapabilities.cpp:
-+ (JSC::DFG::canCompileOpcodes):
-+
- 2012-04-05 Oliver Hunt <oliver at apple.com>
-
-Index: /trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
-===================================================================
---- /trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 98179)
-+++ /trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 113389)
+--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 98179)
++++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (revision 113389)
@@ -62,4 +62,6 @@
bool canCompileOpcodes(CodeBlock* codeBlock)
{
diff --git a/webkit-r114385.diff b/webkit-r114385.diff
index e85dafa..3b28d83 100644
--- a/webkit-r114385.diff
+++ b/webkit-r114385.diff
@@ -1,40 +1,10 @@
-Index: /trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
+Index: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp
===================================================================
---- /trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 113147)
-+++ /trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 114385)
+--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 113147)
++++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (revision 114385)
@@ -3623,5 +3623,4 @@
gtk_widget_set_can_focus(GTK_WIDGET(webView), TRUE);
- gtk_widget_set_double_buffered(GTK_WIDGET(webView), FALSE);
priv->mainFrame = WEBKIT_WEB_FRAME(webkit_web_frame_new(webView));
-Index: /trunk/Source/WebKit/gtk/ChangeLog
-===================================================================
---- /trunk/Source/WebKit/gtk/ChangeLog (revision 113533)
-+++ /trunk/Source/WebKit/gtk/ChangeLog (revision 114385)
-@@ -1,2 +1,25 @@
-+2012-04-17 Carlos Garnacho <carlos at lanedo.com>
-+
-+ [GTK] Enable back double buffering on WebKitWebView to fix flickering
-+ https://bugs.webkit.org/show_bug.cgi?id=84149
-+
-+ Reviewed by Martin Robinson.
-+
-+ Despite having WebKitWebView its own backing buffer, calling
-+ gtk_widget_set_double_buffered(...,FALSE) may still pose side
-+ effects, such as ensuring that all drawing operations are
-+ flushed to the X server before rendering a non-double buffered
-+ widget, which may translate into flickering of the parent
-+ GdkWindow before the WebKitWebView itself is rendered.
-+
-+ Enabling back double buffering solves this as all contents are
-+ first composited together before getting to the front buffer,
-+ but effectively acts as 3rd buffer. This is sort of unavoidable
-+ unless GTK+ gains a "let me take ownership of the backing buffer
-+ for this widget", which currently lacks.
-+
-+ * webkit/webkitwebview.cpp:
-+ (webkit_web_view_init): Remove call to gtk_widget_set_double_buffered(..., FALSE)
-+
- 2012-04-06 Martin Robinson <mrobinson at igalia.com>
-
More information about the scm-commits
mailing list