[webkitgtk3] try again, with an upstream build fix

[Matthias Clasen]

commit 45014e76f932786a862035fd184bbd4f64e07ba6
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Feb 2 19:56:13 2011 -0500

    try again, with an upstream build fix

 build-fix.patch |   26 ++++++++++++++++++++++++++
 webkitgtk3.spec |    3 +++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/build-fix.patch b/build-fix.patch
new file mode 100644
index 0000000..2ca8d1f
--- /dev/null
+++ b/build-fix.patch
@@ -0,0 +1,26 @@
+diff -up webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c.build-fix webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c
+--- webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c.build-fix	2011-02-02 19:54:07.056203345 -0500
++++ webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c	2011-02-02 19:55:00.157539483 -0500
+@@ -46,7 +46,9 @@
+ #include "xembed.h"
+ #include "gtk2xtbin.h"
+ #include <gtk/gtk.h>
++#ifdef GTK_API_VERSION_2
+ #include <gdk/gdkx.h>
++#endif
+ #include <glib.h>
+ #include <assert.h>
+ #include <sys/time.h>
+diff -up webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h.build-fix webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h
+--- webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h.build-fix	2011-02-02 19:54:16.973079366 -0500
++++ webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h	2011-02-02 19:54:35.888842885 -0500
+@@ -41,6 +41,9 @@
+ #define __GTK_XTBIN_H__
+ 
+ #include <gtk/gtk.h>
++#ifndef GTK_API_VERSION_2
++#include <gtk/gtkx.h>
++#endif
+ #include <X11/Intrinsic.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xlib.h>
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index daac9ae..8c0341d 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -18,6 +18,8 @@ Source0:        http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
 Patch1:         webkit-1.3.4-no-execmem.patch
 Patch2:         webkit-1.1.14-nspluginwrapper.patch
+# upstream patch
+Patch3:         build-fix.patch
 
 BuildRequires:  bison
 BuildRequires:  chrpath
@@ -68,6 +70,7 @@ files for developing applications that use %{name}.
 %setup -qn "webkit-%{version}"
 %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
+%patch3 -p1 -b .build-fix
 
 %build
 %ifarch s390