[mingw-webkitgtk: 23/36] Fix FTBFS against glib 2.31.2 or higher

[Kalev Lember]

commit 1e026eaae541a4f142df9eabca9a09aa2ebbb518
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Jan 31 21:16:26 2012 +0100

    Fix FTBFS against glib 2.31.2 or higher
    
    - Fix compilation against glib 2.31.2 or higher
    - Rebuild against libpng 1.5
    - Dropped all .la files

 mingw32-webkitgtk.spec             |   19 ++++++++++++++++---
 webkit-glib231-compatibility.patch |   11 +++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index 3cd0747..dc78748 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -45,7 +45,7 @@
 
 Name:		mingw32-webkitgtk
 Version:	1.6.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	MinGW Windows web content engine library
 
 Group:		Development/Libraries
@@ -65,6 +65,12 @@ Patch1:		webkit-1.6.1-mingw-fixes.patch
 # the .dll so it's safe to skip building this tool
 Patch2:		webkit-dont-build-dump-render-tree.patch
 
+# Fix FTBFS against glib 2.31.2 or higher
+# This is actually upstream bug #69840, but upstream
+# decided to break Win32 support with the applied patch
+# so we use a more simple patch here
+Patch3:         webkit-glib231-compatibility.patch
+
 BuildArch:	noarch
 
 BuildRequires:	bison
@@ -119,6 +125,7 @@ Static version of the MinGW Windows WebKitGTK+ library.
 
 %patch1 -p1 -b .mingw
 %patch2 -p0 -b .dumprendertree
+%patch3 -p0 -b .glib231
 
 
 %build
@@ -146,6 +153,9 @@ make %{?_smp_mflags} V=99
 make install DESTDIR=%{buildroot}
 install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{_mingw32_bindir}
 
+# Drop all .la files
+find $RPM_BUILD_ROOT -name "*.la" -delete
+
 %find_lang webkit-2.0
 
 
@@ -181,9 +191,7 @@ fi
 %{_mingw32_bindir}/libwebkitgtk-1.0-0.dll
 %{_mingw32_includedir}/webkit-1.0/
 %{_mingw32_libdir}/libjavascriptcoregtk-1.0.dll.a
-%{_mingw32_libdir}/libjavascriptcoregtk-1.0.la
 %{_mingw32_libdir}/libwebkitgtk-1.0.dll.a
-%{_mingw32_libdir}/libwebkitgtk-1.0.la
 %{_mingw32_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
 %{_mingw32_libdir}/pkgconfig/webkit-1.0.pc
 %{_mingw32_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
@@ -195,6 +203,11 @@ fi
 
 
 %changelog
+* Tue Jan 31 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.6.1-3
+- Fix compilation against glib 2.31.2 or higher
+- Rebuild against libpng 1.5
+- Dropped all .la files
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/webkit-glib231-compatibility.patch b/webkit-glib231-compatibility.patch
new file mode 100644
index 0000000..4e12316
--- /dev/null
+++ b/webkit-glib231-compatibility.patch
@@ -0,0 +1,11 @@
+--- ./Source/JavaScriptCore/wtf/gobject/GTypedefs.h.orig	2012-01-24 21:12:13.874779387 +0100
++++ ./Source/JavaScriptCore/wtf/gobject/GTypedefs.h	2012-01-24 21:12:25.671995613 +0100
+@@ -52,7 +52,7 @@
+ 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;