r33129 - in /packages/unstable/pygobject-2/debian: changelog patches/00git_gio_flag_type.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Mar 13 17:48:13 2012
New Revision: 33129

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33129
Log:
Add 00git_gio_flag_type.patch: Fix definition of flag types. Backported
from upstream git. (LP: #918607)

Added:
    packages/unstable/pygobject-2/debian/patches/00git_gio_flag_type.patch
Modified:
    packages/unstable/pygobject-2/debian/changelog
    packages/unstable/pygobject-2/debian/patches/series

Modified: packages/unstable/pygobject-2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pygobject-2/debian/changelog?rev=33129&op=diff
==============================================================================
--- packages/unstable/pygobject-2/debian/changelog [utf-8] (original)
+++ packages/unstable/pygobject-2/debian/changelog [utf-8] Tue Mar 13 17:48:13 2012
@@ -6,6 +6,8 @@
   [ Martin Pitt ]
   * Add 00git_fix_qdata_warning.patch: Fix set_qdata warning on accessing NULL
     gobject property. Backported from upstream git.
+  * Add 00git_gio_flag_type.patch: Fix definition of flag types. Backported
+    from upstream git. (LP: #918607)
 
  -- Josselin Mouette <joss at debian.org>  Sat, 31 Dec 2011 14:55:08 +0100
 

Added: packages/unstable/pygobject-2/debian/patches/00git_gio_flag_type.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pygobject-2/debian/patches/00git_gio_flag_type.patch?rev=33129&op=file
==============================================================================
--- packages/unstable/pygobject-2/debian/patches/00git_gio_flag_type.patch (added)
+++ packages/unstable/pygobject-2/debian/patches/00git_gio_flag_type.patch [utf-8] Tue Mar 13 17:48:13 2012
@@ -1,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Mon, 12 Mar 2012 16:44:14 -0400
+Subject: gio-types.defs: change some enums to flags
+
+These flags types were originally incorrectly handled in glib as being
+enums.  That bug was fixed, but they're still enums here, leading to
+warnings about the mismatch.
+
+Change them to flags.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668522
+---
+ gio/gio-types.defs |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio-types.defs b/gio/gio-types.defs
+index 331e0bc..7eee5c8 100644
+--- a/gio/gio-types.defs
++++ b/gio/gio-types.defs
+@@ -526,7 +526,7 @@
+   )
+ )
+ 
+-(define-enum MountMountFlags
++(define-flags MountMountFlags
+   (in-module "gio")
+   (c-name "GMountMountFlags")
+   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+@@ -545,7 +545,7 @@
+   )
+ )
+ 
+-(define-enum DriveStartFlags
++(define-flags DriveStartFlags
+   (in-module "gio")
+   (c-name "GDriveStartFlags")
+   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
+@@ -770,7 +770,7 @@
+   )
+ )
+ 
+-(define-enum SocketMsgFlags
++(define-flags SocketMsgFlags
+   (in-module "gio")
+   (c-name "GSocketMsgFlags")
+   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
+-- 
+1.7.9.1
+

Modified: packages/unstable/pygobject-2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pygobject-2/debian/patches/series?rev=33129&op=diff
==============================================================================
--- packages/unstable/pygobject-2/debian/patches/series [utf-8] (original)
+++ packages/unstable/pygobject-2/debian/patches/series [utf-8] Tue Mar 13 17:48:13 2012
@@ -7,4 +7,5 @@
 00git_python3_build.patch
 00git_python3-maketrans.patch
 00git_fix_qdata_warning.patch
+00git_gio_flag_type.patch
 20_deprecated_spam.patch