r32565 - in /desktop/unstable/pygobject/debian: changelog patches/glib_2.30.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Feb  9 05:48:15 2012
New Revision: 32565

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32565
Log:
Add glib_2.30.patch: Partially revert commit ee62df4 to drop the usage of
g_value_*_schar. This was introduced in glib 2.31 only.

Added:
    desktop/unstable/pygobject/debian/patches/glib_2.30.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=32565&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Thu Feb  9 05:48:15 2012
@@ -1,3 +1,10 @@
+pygobject (3.1.0-2) UNRELEASED; urgency=low
+
+  * Add glib_2.30.patch: Partially revert commit ee62df4 to drop the usage of
+    g_value_*_schar. This was introduced in glib 2.31 only.
+
+ -- Martin Pitt <mpitt at debian.org>  Thu, 09 Feb 2012 06:47:36 +0100
+
 pygobject (3.1.0-1) unstable; urgency=low
 
   * New upstream release. No new features or code reorg, just a lot of crash

Added: desktop/unstable/pygobject/debian/patches/glib_2.30.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/glib_2.30.patch?rev=32565&op=file
==============================================================================
--- desktop/unstable/pygobject/debian/patches/glib_2.30.patch (added)
+++ desktop/unstable/pygobject/debian/patches/glib_2.30.patch [utf-8] Thu Feb  9 05:48:15 2012
@@ -1,0 +1,26 @@
+Description: Partially revert commit ee62df4 to drop the usage of g_value_*_schar. This was introduced in glib 2.31 only.
+Author: Martin Pitt <mpitt at debian.org>
+Forwarded: No, Debian specific. Can be dropped once Debian gets glib >= 2.31.
+
+Index: pygobject/gi/pygi-property.c
+===================================================================
+--- pygobject.orig/gi/pygi-property.c	2012-02-06 18:52:49.000000000 +0100
++++ pygobject/gi/pygi-property.c	2012-02-09 06:45:09.421541123 +0100
+@@ -121,8 +121,6 @@
+             arg.v_boolean = g_value_get_boolean (&value);
+             break;
+         case GI_TYPE_TAG_INT8:
+-            arg.v_int8 = g_value_get_schar (&value);
+-            break;
+         case GI_TYPE_TAG_INT16:
+         case GI_TYPE_TAG_INT32:
+             if (G_VALUE_HOLDS_LONG (&value))
+@@ -316,8 +314,6 @@
+             g_value_set_boolean (&value, arg.v_boolean);
+             break;
+         case GI_TYPE_TAG_INT8:
+-            g_value_set_schar (&value, arg.v_int8);
+-            break;
+         case GI_TYPE_TAG_INT16:
+         case GI_TYPE_TAG_INT32:
+             if (G_VALUE_HOLDS_LONG (&value))

Modified: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=32565&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/series [utf-8] Thu Feb  9 05:48:15 2012
@@ -1,0 +1,1 @@
+glib_2.30.patch