[mingw-gtk2: 59/65] Fix gmodule linker failure when using the latest pango

[epienbro]

commit d722670f96dc9530edefe38e66e5641e62612be2
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Feb 1 23:53:20 2012 +0100

    Fix gmodule linker failure when using the latest pango
    
    Also reset the release tag back to 1 as I forgot
    to do that while doing the version bump to 2.24.9

 gtk2-fixdso.patch |   15 +++++++++++++++
 mingw32-gtk2.spec |    8 +++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/gtk2-fixdso.patch b/gtk2-fixdso.patch
new file mode 100644
index 0000000..15bc65d
--- /dev/null
+++ b/gtk2-fixdso.patch
@@ -0,0 +1,15 @@
+--- gtk+-2.24.8/gtk/Makefile.am.orig   2012-02-01 11:14:25.468115547 +0000
++++ gtk+-2.24.8/gtk/Makefile.am        2012-02-01 11:14:57.920116650 +0000
+@@ -904,10 +904,10 @@
+ libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources)
+ libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
+ 
+-libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
++libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) -lgmodule-2.0
+ libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
+ libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
+-libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
++libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) -lgmodule-2.0
+ 
+ libgtk_x11_2_0_la_LIBADD = $(libadd)
+ libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
diff --git a/mingw32-gtk2.spec b/mingw32-gtk2.spec
index 2f73292..2459295 100644
--- a/mingw32-gtk2.spec
+++ b/mingw32-gtk2.spec
@@ -4,7 +4,7 @@
 
 Name:           mingw32-gtk2
 Version:        2.24.9
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
@@ -21,6 +21,9 @@ Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
 # Enable building a static library of GTK
 Patch1001:      mingw32-gtk2-enable_static_build.patch
 
+# Fix gmodule linking failure when using the latest pango
+Patch1002:      gtk2-fixdso.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 68
@@ -79,6 +82,7 @@ Static version of the MinGW Windows Gtk2 library.
 
 %patch1000 -p1
 %patch1001 -p0
+%patch1002 -p1 -b .fixdso
 
 
 %build
@@ -192,6 +196,8 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-2.0/modules/*.dll.a
 - Update to 2.24.9
 - Dropped the .la files
 - Dropped the .dll.a files for all modules
+- Fix gmodule linker failure when using the latest pango
+  (patch copied over from native gtk2 package)
 
 * Tue Jan 31 2012 Kalev Lember <kalevlember at gmail.com> - 2.24.8-3
 - Rebuilt for libpng 1.5