[jhbuild] [3.0] Patch WebKit-1.3.9 to build with latest GTK 3.0
- From: Craig Keogh <cskeogh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] [3.0] Patch WebKit-1.3.9 to build with latest GTK 3.0
- Date: Mon, 10 Jan 2011 10:57:58 +0000 (UTC)
commit aaedd1f0d4e1b793c0c6652f4db872ed66d31b0c
Author: Craig Keogh <cskeogh adam com au>
Date: Mon Jan 10 20:55:39 2011 +1030
[3.0] Patch WebKit-1.3.9 to build with latest GTK 3.0
modulesets/gnome-suites-core-deps-3.0.modules | 3 ++
patches/WebKit-1.3.9-changeset_r75081.diff | 28 +++++++++++++++++++++++++
2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index 35725c3..5a5ae38 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -1198,6 +1198,9 @@
module="webkit-1.3.9.tar.gz" version="1.3.9"
hash="sha256:2d67836d8bc3e327e5cf762e3b2d2096438881750f481b879c6544f29c442f86"
md5sum="8c48b15b5683adef3cb450a5c0f0c145" size="8821122">
+ <!-- 1 patch needed to build with gtk3, remove when 1.3.10 released -->
+ <!-- see http://trac.webkit.org/changeset/75081 -->
+ <patch file="WebKit-1.3.9-changeset_r75081.diff" strip="2"/>
</branch>
<dependencies>
<dep package="cairo"/>
diff --git a/patches/WebKit-1.3.9-changeset_r75081.diff b/patches/WebKit-1.3.9-changeset_r75081.diff
new file mode 100644
index 0000000..b6208fb
--- /dev/null
+++ b/patches/WebKit-1.3.9-changeset_r75081.diff
@@ -0,0 +1,28 @@
+Index: /trunk/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
+===================================================================
+--- /trunk/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp (revision 70133)
++++ /trunk/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp (revision 75081)
+@@ -546,5 +546,4 @@
+ gtk_scale_set_draw_value(GTK_SCALE(m_timeHScale), FALSE);
+ gtk_range_set_show_fill_level(GTK_RANGE(m_timeHScale), TRUE);
+- gtk_range_set_update_policy(GTK_RANGE(m_timeHScale), GTK_UPDATE_CONTINUOUS);
+ g_signal_connect(m_timeHScale, "button-press-event", G_CALLBACK(timeScaleButtonPressed), this);
+ g_signal_connect(m_timeHScale, "button-release-event", G_CALLBACK(timeScaleButtonReleased), this);
+Index: /trunk/WebKit/gtk/ChangeLog
+===================================================================
+--- /trunk/WebKit/gtk/ChangeLog (revision 75072)
++++ /trunk/WebKit/gtk/ChangeLog (revision 75081)
+@@ -1,2 +1,13 @@
++2011-01-05 Martin Robinson <mrobinson igalia com>
++
++ Reviewed by Gustavo Noronha.
++
++ Build fix for GTK+ 3.x. Remove the call to gtk_range_set_update_policy.
++ GTK+ 3.x has removed this method and the default in GTK+ 2.x is continuous,
++ so this call is unnecessary.
++
++ * WebCoreSupport/FullscreenVideoController.cpp:
++ (FullscreenVideoController::createHud): Remove call to gtk_range_set_update_policy().
++
+ 2011-01-04 Chris Fleizach <cfleizach apple com>
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]