# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1274301349 -7200
# Node ID 77ef614fd370a68162f96bc1407291856d388d6e
# Parent  73644e566f034ce7bf67f6412f0e3d6572d2ecf2
replaced $(SED) action with a clean patch in package glib

diff -r 73644e566f03 -r 77ef614fd370 src/glib-4-fix-dependency-libs.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glib-4-fix-dependency-libs.patch	Wed May 19 22:35:49 2010 +0200
@@ -0,0 +1,28 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+https://bugzilla.gnome.org/show_bug.cgi?id=619126
+
+diff -r 1168b72613ae configure.in
+--- a/configure.in      Wed May 19 20:15:53 2010 +0200
++++ b/configure.in      Wed May 19 21:11:17 2010 +0200
+@@ -2711,7 +2711,7 @@
+ 	G_LIBS_EXTRA="-luser32 -lkernel32"
+     ;;
+   *-*-mingw*)
+-	G_LIBS_EXTRA="-lws2_32 -lole32"
++	G_LIBS_EXTRA="-lws2_32 -lole32 -lshlwapi"
+     ;;
+   *)
+ 	G_LIBS_EXTRA=""
+diff -r 1168b72613ae glib-2.0.pc.in
+--- a/glib-2.0.pc.in	Wed May 19 20:15:53 2010 +0200
++++ b/glib-2.0.pc.in	Wed May 19 20:17:05 2010 +0200
+@@ -11,5 +11,5 @@
+ Description: C Utility Library
+ Version: @VERSION@
+ Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
+-Libs.private: @ICONV_LIBS@
++Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
+ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
diff -r 73644e566f03 -r 77ef614fd370 src/glib.mk
--- a/src/glib.mk	Wed May 19 20:59:36 2010 +0200
+++ b/src/glib.mk	Wed May 19 22:35:49 2010 +0200
@@ -53,7 +53,6 @@
     $(MAKE) -C '$(1).native/gio'     -j '$(JOBS)' glib-compile-schemas
 
     # cross build
-    $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in'
     # wine confuses the cross-compiling detection, so set it explicitly
     $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \