r32432 - in /desktop/unstable/pygobject/debian: changelog patches/00git_ghashtable_gerror_callback_args.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Jan 25 06:16:34 2012
New Revision: 32432

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32432
Log:
Add 00git_ghashtable_gerror_callback_args.patch: Support GHashTable and
GError as callback/closure arguments. Backported from upstream git head,
but without the test cases, as they require an addition to
gobject-introspection. (LP: #904783)

Added:
    desktop/unstable/pygobject/debian/patches/00git_ghashtable_gerror_callback_args.patch
Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/patches/series

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=32432&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Wed Jan 25 06:16:34 2012
@@ -2,6 +2,10 @@
 
   * debian/control.in: Set python-gobject-dbg section/priority to debug/extra,
     according to to archive overrides.
+  * Add 00git_ghashtable_gerror_callback_args.patch: Support GHashTable and
+    GError as callback/closure arguments. Backported from upstream git head,
+    but without the test cases, as they require an addition to
+    gobject-introspection. (LP: #904783)
 
  -- Martin Pitt <mpitt at debian.org>  Fri, 06 Jan 2012 20:05:07 +0100
 

Added: desktop/unstable/pygobject/debian/patches/00git_ghashtable_gerror_callback_args.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/00git_ghashtable_gerror_callback_args.patch?rev=32432&op=file
==============================================================================
--- desktop/unstable/pygobject/debian/patches/00git_ghashtable_gerror_callback_args.patch (added)
+++ desktop/unstable/pygobject/debian/patches/00git_ghashtable_gerror_callback_args.patch [utf-8] Wed Jan 25 06:16:34 2012
@@ -1,0 +1,31 @@
+From 77f32d9110bfeb6dad8457f565b4c70b5998fef6 Mon Sep 17 00:00:00 2001
+From: Alberto Mardegan <mardy at users.sourceforge.net>
+Date: Thu, 15 Dec 2011 16:12:01 +0200
+Subject: [PATCH 1/2] Support GHashTable and GError as callback/closure
+ arguments
+
+Marshalling of these types from C is already implemented, let's take it
+into use for calbacks and closures too.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=666270
+Bug-Ubuntu: https://launchpad.net/bugs/904783
+
+Signed-off-by: Martin Pitt <martin.pitt at ubuntu.com>
+---
+ gi/pygi-closure.c        |    2 ++
+ tests/test_everything.py |   35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 37 insertions(+), 0 deletions(-)
+
+diff --git a/gi/pygi-closure.c b/gi/pygi-closure.c
+index 7cd0436..6fc08fb 100644
+--- a/gi/pygi-closure.c
++++ b/gi/pygi-closure.c
+@@ -163,6 +163,8 @@ _pygi_closure_convert_ffi_arguments (GICallableInfo *callable_info, void **args)
+ 
+                     g_base_info_unref (interface);
+                 }
++                case GI_TYPE_TAG_ERROR:
++                case GI_TYPE_TAG_GHASH:
+                 case GI_TYPE_TAG_GLIST:
+                 case GI_TYPE_TAG_GSLIST:
+                     g_args[i].v_pointer = * (gpointer *) args[i];

Modified: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=32432&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/series [utf-8] Wed Jan 25 06:16:34 2012
@@ -1,1 +1,2 @@
+00git_ghashtable_gerror_callback_args.patch
 01_revert_tree_model_unicode_conversion.patch