diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-27 22:52:19 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-27 22:52:19 +0200 |
| commit | 3fdf280568b01a7fa971ddc63e84fdbea11e691b (patch) | |
| tree | eb3a20ab1e5fbe9bec5e863d68b28edc6e71550b /package/webkit/webkit-1.2.3-fix-build-issue-with-old-gtk.patch | |
| parent | f2860bbc8ea6ff959b91eaa8919177d273ee4497 (diff) | |
| parent | 3c77bab2eeace3ee675bd745ca335fa3dd1630bb (diff) | |
Merge branch 'various-bumps' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/webkit/webkit-1.2.3-fix-build-issue-with-old-gtk.patch')
| -rw-r--r-- | package/webkit/webkit-1.2.3-fix-build-issue-with-old-gtk.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/package/webkit/webkit-1.2.3-fix-build-issue-with-old-gtk.patch b/package/webkit/webkit-1.2.3-fix-build-issue-with-old-gtk.patch new file mode 100644 index 000000000..2b20bae6d --- /dev/null +++ b/package/webkit/webkit-1.2.3-fix-build-issue-with-old-gtk.patch @@ -0,0 +1,22 @@ +The WebKit code conditionally calls getRootCoords() when the Gtk +version is old (i.e < 2.17.3), but fails to declare the prototype of +this function (which is implemented after its call site). This build +failure has probably been missed due to the fact that not many people +try to compile recent WebKit versions with old Gtk. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: webkit-1.2.3/WebKitTools/DumpRenderTree/gtk/EventSender.cpp +=================================================================== +--- webkit-1.2.3.orig/WebKitTools/DumpRenderTree/gtk/EventSender.cpp 2010-07-19 20:42:27.000000000 +0200 ++++ webkit-1.2.3/WebKitTools/DumpRenderTree/gtk/EventSender.cpp 2010-07-19 20:42:57.000000000 +0200 +@@ -86,6 +86,9 @@ + static void sendOrQueueEvent(GdkEvent event); + static void dispatchEvent(GdkEvent event); + static guint getStateFlags(); ++#if !GTK_CHECK_VERSION(2,17,3) ++static void getRootCoords(GtkWidget* view, int* rootX, int* rootY); ++#endif + + static JSValueRef getDragModeCallback(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception) + { |