[mingw-gtk2: 60/65] Made gmodule linker patch compatible with gtk win32 library

[epienbro]

commit d74fed07461adb8850720eeaf58ca27d7af0b3cb
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Feb 2 00:11:24 2012 +0100

    Made gmodule linker patch compatible with gtk win32 library
    
    It turned out the patch from the native gtk2 package didn't really
    fix the gmodule linker failure so the patch had to be rewritten

 gtk2-fixdso.patch |   18 +++++++-----------
 mingw32-gtk2.spec |    3 +--
 2 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/gtk2-fixdso.patch b/gtk2-fixdso.patch
index 15bc65d..02a55dd 100644
--- a/gtk2-fixdso.patch
+++ b/gtk2-fixdso.patch
@@ -1,15 +1,11 @@
---- 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 @@
+--- gtk/Makefile.in.orig	2012-02-02 00:04:08.937777889 +0100
++++ gtk/Makefile.in	2012-02-02 00:04:32.399182680 +0100
+@@ -1592,7 +1592,7 @@
  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_x11_2_0_la_LDFLAGS = $(libtool_opts)
+-libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
++libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid -lgmodule-2.0
  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_directfb_2_0_la_LDFLAGS = $(libtool_opts)
  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 2459295..12ee693 100644
--- a/mingw32-gtk2.spec
+++ b/mingw32-gtk2.spec
@@ -82,7 +82,7 @@ Static version of the MinGW Windows Gtk2 library.
 
 %patch1000 -p1
 %patch1001 -p0
-%patch1002 -p1 -b .fixdso
+%patch1002 -p0 -b .fixdso
 
 
 %build
@@ -197,7 +197,6 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-2.0/modules/*.dll.a
 - 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