# HG changeset patch # User Volker Grabsch # Date 1275778427 -7200 # Node ID 1de4ae343808b5a81b34af4bbe31c15864bd15fd # Parent e5716715fc093354a28ca47b0a9fe53cee82abfc corrected numbering of patches in package glib diff -r e5716715fc09 -r 1de4ae343808 src/glib-2-fix-tool-paths.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glib-2-fix-tool-paths.patch Sun Jun 06 00:53:47 2010 +0200 @@ -0,0 +1,22 @@ +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=610865 + +diff -r ed58be46e216 glib-2.0.pc.in +--- a/glib-2.0.pc.in Sun May 16 16:07:16 2010 +0200 ++++ b/glib-2.0.pc.in Sun May 16 16:07:35 2010 +0200 +@@ -3,9 +3,9 @@ + libdir=@libdir@ + includedir=@includedir@ + +-glib_genmarshal=glib-genmarshal +-gobject_query=gobject-query +-glib_mkenums=glib-mkenums ++glib_genmarshal=@bindir@/glib-genmarshal ++gobject_query=@bindir@/gobject-query ++glib_mkenums=@bindir@/glib-mkenums + + Name: GLib + Description: C Utility Library diff -r e5716715fc09 -r 1de4ae343808 src/glib-3-fix-dependency-libs.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glib-3-fix-dependency-libs.patch Sun Jun 06 00:53:47 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 e5716715fc09 -r 1de4ae343808 src/glib-3-fix-tool-paths.patch --- a/src/glib-3-fix-tool-paths.patch Sat Jun 05 21:31:23 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -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=610865 - -diff -r ed58be46e216 glib-2.0.pc.in ---- a/glib-2.0.pc.in Sun May 16 16:07:16 2010 +0200 -+++ b/glib-2.0.pc.in Sun May 16 16:07:35 2010 +0200 -@@ -3,9 +3,9 @@ - libdir=@libdir@ - includedir=@includedir@ - --glib_genmarshal=glib-genmarshal --gobject_query=gobject-query --glib_mkenums=glib-mkenums -+glib_genmarshal=@bindir@/glib-genmarshal -+gobject_query=@bindir@/gobject-query -+glib_mkenums=@bindir@/glib-mkenums - - Name: GLib - Description: C Utility Library diff -r e5716715fc09 -r 1de4ae343808 src/glib-4-fix-dependency-libs.patch --- a/src/glib-4-fix-dependency-libs.patch Sat Jun 05 21:31:23 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -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 e5716715fc09 -r 1de4ae343808 src/glib-4-fix-stray-commas.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glib-4-fix-stray-commas.patch Sun Jun 06 00:53:47 2010 +0200 @@ -0,0 +1,72 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://mail.gnome.org/archives/gtk-devel-list/2010-June/msg00027.html + +diff -urN a/gio/gioenums.h b/gio/gioenums.h +--- a/gio/gioenums.h 2010-05-24 18:39:22.000000000 +0200 ++++ b/gio/gioenums.h 2010-06-05 20:37:07.923709408 +0200 +@@ -770,7 +770,7 @@ + { + G_BUS_NAME_OWNER_FLAGS_NONE = 0, /*< nick=none >*/ + G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT = (1<<0), /*< nick=allow-replacement >*/ +- G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1), /*< nick=replace >*/ ++ G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1) /*< nick=replace >*/ + } GBusNameOwnerFlags; + + /** +@@ -804,7 +804,7 @@ + { + G_DBUS_PROXY_FLAGS_NONE = 0, /*< nick=none >*/ + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = (1<<0), /*< nick=do-not-load-properties >*/ +- G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1), /*< nick=do-not-connect-signals >*/ ++ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1) /*< nick=do-not-connect-signals >*/ + } GDBusProxyFlags; + + /** +@@ -949,7 +949,7 @@ + G_DBUS_ERROR_INVALID_FILE_CONTENT, /* org.freedesktop.DBus.Error.InvalidFileContent */ + G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, /* org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown */ + G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN, /* org.freedesktop.DBus.Error.AdtAuditDataUnknown */ +- G_DBUS_ERROR_OBJECT_PATH_IN_USE, /* org.freedesktop.DBus.Error.ObjectPathInUse */ ++ G_DBUS_ERROR_OBJECT_PATH_IN_USE /* org.freedesktop.DBus.Error.ObjectPathInUse */ + } GDBusError; + /* Remember to update g_dbus_error_quark() in gdbuserror.c if you extend this enumeration */ + +@@ -988,7 +988,7 @@ + */ + typedef enum { + G_DBUS_CAPABILITY_FLAGS_NONE = 0, +- G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0), ++ G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0) + } GDBusCapabilityFlags; + + /** +@@ -1004,7 +1004,7 @@ + */ + typedef enum { + G_DBUS_CALL_FLAGS_NONE = 0, +- G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0), ++ G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0) + } GDBusCallFlags; + + /** +@@ -1088,7 +1088,7 @@ + { + G_DBUS_PROPERTY_INFO_FLAGS_NONE = 0, + G_DBUS_PROPERTY_INFO_FLAGS_READABLE = (1<<0), +- G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1), ++ G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1) + } GDBusPropertyInfoFlags; + + /** +@@ -1105,7 +1105,7 @@ + typedef enum + { + G_DBUS_SUBTREE_FLAGS_NONE = 0, +- G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0), ++ G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0) + } GDBusSubtreeFlags; + + /** diff -r e5716715fc09 -r 1de4ae343808 src/glib-5-fix-stray-commas.patch --- a/src/glib-5-fix-stray-commas.patch Sat Jun 05 21:31:23 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://mail.gnome.org/archives/gtk-devel-list/2010-June/msg00027.html - -diff -urN a/gio/gioenums.h b/gio/gioenums.h ---- a/gio/gioenums.h 2010-05-24 18:39:22.000000000 +0200 -+++ b/gio/gioenums.h 2010-06-05 20:37:07.923709408 +0200 -@@ -770,7 +770,7 @@ - { - G_BUS_NAME_OWNER_FLAGS_NONE = 0, /*< nick=none >*/ - G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT = (1<<0), /*< nick=allow-replacement >*/ -- G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1), /*< nick=replace >*/ -+ G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1) /*< nick=replace >*/ - } GBusNameOwnerFlags; - - /** -@@ -804,7 +804,7 @@ - { - G_DBUS_PROXY_FLAGS_NONE = 0, /*< nick=none >*/ - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = (1<<0), /*< nick=do-not-load-properties >*/ -- G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1), /*< nick=do-not-connect-signals >*/ -+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1) /*< nick=do-not-connect-signals >*/ - } GDBusProxyFlags; - - /** -@@ -949,7 +949,7 @@ - G_DBUS_ERROR_INVALID_FILE_CONTENT, /* org.freedesktop.DBus.Error.InvalidFileContent */ - G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, /* org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown */ - G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN, /* org.freedesktop.DBus.Error.AdtAuditDataUnknown */ -- G_DBUS_ERROR_OBJECT_PATH_IN_USE, /* org.freedesktop.DBus.Error.ObjectPathInUse */ -+ G_DBUS_ERROR_OBJECT_PATH_IN_USE /* org.freedesktop.DBus.Error.ObjectPathInUse */ - } GDBusError; - /* Remember to update g_dbus_error_quark() in gdbuserror.c if you extend this enumeration */ - -@@ -988,7 +988,7 @@ - */ - typedef enum { - G_DBUS_CAPABILITY_FLAGS_NONE = 0, -- G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0), -+ G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0) - } GDBusCapabilityFlags; - - /** -@@ -1004,7 +1004,7 @@ - */ - typedef enum { - G_DBUS_CALL_FLAGS_NONE = 0, -- G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0), -+ G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0) - } GDBusCallFlags; - - /** -@@ -1088,7 +1088,7 @@ - { - G_DBUS_PROPERTY_INFO_FLAGS_NONE = 0, - G_DBUS_PROPERTY_INFO_FLAGS_READABLE = (1<<0), -- G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1), -+ G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1) - } GDBusPropertyInfoFlags; - - /** -@@ -1105,7 +1105,7 @@ - typedef enum - { - G_DBUS_SUBTREE_FLAGS_NONE = 0, -- G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0), -+ G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0) - } GDBusSubtreeFlags; - - /**