[webkitgtk] Rebuild for new libpng webkit-1.6.1-new-glib.patch: Fix for new glib headers

[Adam Jackson]

commit b39e360715be2805fdafc003da5ec665081b1e2f
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 5 20:53:22 2011 -0500

    Rebuild for new libpng
    webkit-1.6.1-new-glib.patch: Fix for new glib headers

 webkit-1.6.1-new-glib.patch |   12 ++++++++++++
 webkitgtk.spec              |    4 ++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/webkit-1.6.1-new-glib.patch b/webkit-1.6.1-new-glib.patch
new file mode 100644
index 0000000..4c6a187
--- /dev/null
+++ b/webkit-1.6.1-new-glib.patch
@@ -0,0 +1,12 @@
+diff -up webkit-1.6.1/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.jx webkit-1.6.1/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+--- webkit-1.6.1/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.jx	2011-09-26 16:54:57.000000000 -0400
++++ webkit-1.6.1/Source/JavaScriptCore/wtf/gobject/GTypedefs.h	2011-12-05 20:39:25.098997211 -0500
+@@ -52,7 +52,7 @@ typedef struct _GFile GFile;
+ typedef struct _GHashTable GHashTable;
+ typedef struct _GInputStream GInputStream;
+ typedef struct _GList GList;
+-typedef struct _GMutex GMutex;
++typedef union _GMutex GMutex;
+ typedef struct _GPatternSpec GPatternSpec;
+ typedef struct _GPollableOutputStream GPollableOutputStream;
+ typedef struct _GSocketClient GSocketClient;
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 3430407..7df9694 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -57,6 +57,8 @@ Patch1: 	webkit-1.3.12-no-execmem.patch
 Patch2: 	webkit-1.3.10-nspluginwrapper.patch
 # https://bugs.webkit.org/show_bug.cgi?id=69940
 Patch3:         webkit-1.6.1-dtoa-s390.patch
+# GMutex changed type, eh.
+Patch4:		webkit-1.6.1-new-glib.patch
 
 BuildRequires:	bison
 BuildRequires:	chrpath
@@ -121,6 +123,7 @@ LICENSE, README, and AUTHORS files.
 %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
 %patch3 -p1 -b .dtoa-s390
+%patch4 -p1 -b .glib
 
 %build
 %ifarch s390
@@ -212,6 +215,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %changelog
 * Mon Dec 05 2011 Adam Jackson <ajax at redhat.com> 1.6.1-3
 - Rebuild for new libpng
+- webkit-1.6.1-new-glib.patch: Fix for new glib headers
 
 * Wed Oct 12 2011 Dan Horák <dan[at]danny.cz> - 1.6.1-2
 - fix build on s390(x)