Bug#663879: #663879 error messages after upgrading to new version of python-gobject-2=2.28.6-10

[Tony Houghton]

reassign 663879 glib2.0 2.30.2-6
found 663879 glib2.0/2.31.20-1
thanks

This appears to be caused by python-gobject-2 getting ahead of the
glib2.0 packages. These should be flags but were originally registered
as enums in glib.

I upgraded libglib2.0-0 etc to experimental and that removed all but one
of the warnings. The attached patch removes that one too, HTH. But there
still seem to be several other sets of flags in 2.31.20 that are still
registered as enums and should be changed; I don't know whether upstream
has done that or is doing it.

Index: glib2.0-2.31.20/gio/gioenums.h
===================================================================
--- glib2.0-2.31.20.orig/gio/gioenums.h	2012-02-27 03:09:02.000000000 +0000
+++ glib2.0-2.31.20/gio/gioenums.h	2012-03-15 19:44:21.953520201 +0000
@@ -733,7 +733,7 @@
  *
  * Since: 2.22
  */
-typedef enum
+typedef enum /*< flags >*/
 {
   G_SOCKET_MSG_NONE,
   G_SOCKET_MSG_OOB = GLIB_SYSDEF_MSG_OOB,
Index: glib2.0-2.31.20/gio/gioenumtypes.c
===================================================================
--- glib2.0-2.31.20.orig/gio/gioenumtypes.c	2012-03-05 12:08:36.000000000 +0000
+++ glib2.0-2.31.20/gio/gioenumtypes.c	2012-03-15 19:44:23.469520181 +0000
@@ -745,7 +745,7 @@
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
-      static const GEnumValue values[] = {
+      static const GFlagsValue values[] = {
         { G_SOCKET_MSG_NONE, "G_SOCKET_MSG_NONE", "none" },
         { G_SOCKET_MSG_OOB, "G_SOCKET_MSG_OOB", "oob" },
         { G_SOCKET_MSG_PEEK, "G_SOCKET_MSG_PEEK", "peek" },
@@ -753,7 +753,7 @@
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("GSocketMsgFlags"), values);
+        g_flags_register_static (g_intern_static_string ("GSocketMsgFlags"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }