comparison src/glib-5-fix-stray-commas.patch @ 1045:e5716715fc09

upgrade packages: exiv2 gettext glib gst-plugins-good libevent libtool
author Mark Brand <mabrand@mabrand.nl>
date Sat, 05 Jun 2010 21:31:23 +0200
parents
children 749cbc1d5796
comparison
equal deleted inserted replaced
1044:2080bdef3760 1045:e5716715fc09
1 This file is part of mingw-cross-env.
2 See doc/index.html for further information.
3
4 This patch has been taken from:
5 http://mail.gnome.org/archives/gtk-devel-list/2010-June/msg00027.html
6
7 diff -urN a/gio/gioenums.h b/gio/gioenums.h
8 --- a/gio/gioenums.h 2010-05-24 18:39:22.000000000 +0200
9 +++ b/gio/gioenums.h 2010-06-05 20:37:07.923709408 +0200
10 @@ -770,7 +770,7 @@
11 {
12 G_BUS_NAME_OWNER_FLAGS_NONE = 0, /*< nick=none >*/
13 G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT = (1<<0), /*< nick=allow-replacement >*/
14 - G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1), /*< nick=replace >*/
15 + G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1) /*< nick=replace >*/
16 } GBusNameOwnerFlags;
17
18 /**
19 @@ -804,7 +804,7 @@
20 {
21 G_DBUS_PROXY_FLAGS_NONE = 0, /*< nick=none >*/
22 G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = (1<<0), /*< nick=do-not-load-properties >*/
23 - G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1), /*< nick=do-not-connect-signals >*/
24 + G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1) /*< nick=do-not-connect-signals >*/
25 } GDBusProxyFlags;
26
27 /**
28 @@ -949,7 +949,7 @@
29 G_DBUS_ERROR_INVALID_FILE_CONTENT, /* org.freedesktop.DBus.Error.InvalidFileContent */
30 G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, /* org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown */
31 G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN, /* org.freedesktop.DBus.Error.AdtAuditDataUnknown */
32 - G_DBUS_ERROR_OBJECT_PATH_IN_USE, /* org.freedesktop.DBus.Error.ObjectPathInUse */
33 + G_DBUS_ERROR_OBJECT_PATH_IN_USE /* org.freedesktop.DBus.Error.ObjectPathInUse */
34 } GDBusError;
35 /* Remember to update g_dbus_error_quark() in gdbuserror.c if you extend this enumeration */
36
37 @@ -988,7 +988,7 @@
38 */
39 typedef enum {
40 G_DBUS_CAPABILITY_FLAGS_NONE = 0,
41 - G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0),
42 + G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0)
43 } GDBusCapabilityFlags;
44
45 /**
46 @@ -1004,7 +1004,7 @@
47 */
48 typedef enum {
49 G_DBUS_CALL_FLAGS_NONE = 0,
50 - G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0),
51 + G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0)
52 } GDBusCallFlags;
53
54 /**
55 @@ -1088,7 +1088,7 @@
56 {
57 G_DBUS_PROPERTY_INFO_FLAGS_NONE = 0,
58 G_DBUS_PROPERTY_INFO_FLAGS_READABLE = (1<<0),
59 - G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1),
60 + G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1)
61 } GDBusPropertyInfoFlags;
62
63 /**
64 @@ -1105,7 +1105,7 @@
65 typedef enum
66 {
67 G_DBUS_SUBTREE_FLAGS_NONE = 0,
68 - G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0),
69 + G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0)
70 } GDBusSubtreeFlags;
71
72 /**