r28760 - in /packages/unstable/json-glib/debian: changelog patches/ patches/0001-Fix-GVariant-creation-on-some-architectures-bug-6504.patch patches/series
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Wed Jul 6 13:46:38 UTC 2011
Author: bigon
Date: Wed Jul 6 13:46:38 2011
New Revision: 28760
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28760
Log:
d/p/0001-Fix-GVariant-creation-on-some-architectures-bug-6504.patch:
Fix FTBFS on some architectures (Closes: #632823)
Added:
packages/unstable/json-glib/debian/patches/
packages/unstable/json-glib/debian/patches/0001-Fix-GVariant-creation-on-some-architectures-bug-6504.patch
packages/unstable/json-glib/debian/patches/series
Modified:
packages/unstable/json-glib/debian/changelog
Modified: packages/unstable/json-glib/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/changelog?rev=28760&op=diff
==============================================================================
--- packages/unstable/json-glib/debian/changelog [utf-8] (original)
+++ packages/unstable/json-glib/debian/changelog [utf-8] Wed Jul 6 13:46:38 2011
@@ -1,8 +1,10 @@
json-glib (0.13.4-2) UNRELEASED; urgency=low
* Rename gir1.2-json-glib-1.0 package to gir1.2-json-1.0 to follow policy
+ * d/p/0001-Fix-GVariant-creation-on-some-architectures-bug-6504.patch:
+ Fix FTBFS on some architectures (Closes: #632823)
- -- Laurent Bigonville <bigon at debian.org> Tue, 21 Jun 2011 16:51:59 +0200
+ -- Laurent Bigonville <bigon at debian.org> Wed, 06 Jul 2011 15:43:22 +0200
json-glib (0.13.4-1) unstable; urgency=low
Added: packages/unstable/json-glib/debian/patches/0001-Fix-GVariant-creation-on-some-architectures-bug-6504.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/patches/0001-Fix-GVariant-creation-on-some-architectures-bug-6504.patch?rev=28760&op=file
==============================================================================
--- packages/unstable/json-glib/debian/patches/0001-Fix-GVariant-creation-on-some-architectures-bug-6504.patch (added)
+++ packages/unstable/json-glib/debian/patches/0001-Fix-GVariant-creation-on-some-architectures-bug-6504.patch [utf-8] Wed Jul 6 13:46:38 2011
@@ -1,0 +1,100 @@
+From 4537f7cd76e9b929197be2d92652a9e7037827db Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at bigon.be>
+Date: Wed, 6 Jul 2011 12:34:56 +0200
+Subject: [PATCH] Fix GVariant creation on some architectures (bug #650483)
+
+Fix casting issue in Gvariant creation on some architectures.
+---
+ json-glib/json-gvariant.c | 46 +++++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 40 insertions(+), 6 deletions(-)
+
+diff --git a/json-glib/json-gvariant.c b/json-glib/json-gvariant.c
+index c239457..cae43e0 100644
+--- a/json-glib/json-gvariant.c
++++ b/json-glib/json-gvariant.c
+@@ -1126,10 +1126,8 @@ json_to_gvariant_recurse (JsonNode *json_node,
+ {
+ GVariant *variant = NULL;
+ GVariantClass class;
+- gchar class_type[2] = {0, 0};
+
+ class = json_to_gvariant_get_next_class (json_node, signature);
+- class_type[0] = class;
+
+ if (class == JSON_G_VARIANT_CLASS_DICTIONARY)
+ {
+@@ -1143,31 +1141,67 @@ json_to_gvariant_recurse (JsonNode *json_node,
+ {
+ case G_VARIANT_CLASS_BOOLEAN:
+ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_BOOLEAN, error))
+- variant = g_variant_new (class_type, json_node_get_boolean (json_node));
++ variant = g_variant_new_boolean (json_node_get_boolean (json_node));
+ break;
+
+ case G_VARIANT_CLASS_BYTE:
++ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_INT64, error))
++ variant = g_variant_new_byte (json_node_get_int (json_node));
++ break;
++
+ case G_VARIANT_CLASS_INT16:
++ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_INT64, error))
++ variant = g_variant_new_int16 (json_node_get_int (json_node));
++ break;
++
+ case G_VARIANT_CLASS_UINT16:
++ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_INT64, error))
++ variant = g_variant_new_uint16 (json_node_get_int (json_node));
++ break;
++
+ case G_VARIANT_CLASS_INT32:
++ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_INT64, error))
++ variant = g_variant_new_int32 (json_node_get_int (json_node));
++ break;
++
+ case G_VARIANT_CLASS_UINT32:
++ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_INT64, error))
++ variant = g_variant_new_uint32 (json_node_get_int (json_node));
++ break;
++
+ case G_VARIANT_CLASS_INT64:
++ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_INT64, error))
++ variant = g_variant_new_int64 (json_node_get_int (json_node));
++ break;
++
+ case G_VARIANT_CLASS_UINT64:
++ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_INT64, error))
++ variant = g_variant_new_uint64 (json_node_get_int (json_node));
++ break;
++
+ case G_VARIANT_CLASS_HANDLE:
+ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_INT64, error))
+- variant = g_variant_new (class_type, json_node_get_int (json_node));
++ variant = g_variant_new_handle (json_node_get_int (json_node));
+ break;
+
+ case G_VARIANT_CLASS_DOUBLE:
+ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_DOUBLE, error))
+- variant = g_variant_new (class_type, json_node_get_double (json_node));
++ variant = g_variant_new_double (json_node_get_double (json_node));
+ break;
+
+ case G_VARIANT_CLASS_STRING:
++ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_STRING, error))
++ variant = g_variant_new_string (json_node_get_string (json_node));
++ break;
++
+ case G_VARIANT_CLASS_OBJECT_PATH:
++ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_STRING, error))
++ variant = g_variant_new_object_path (json_node_get_string (json_node));
++ break;
++
+ case G_VARIANT_CLASS_SIGNATURE:
+ if (json_node_assert_type (json_node, JSON_NODE_VALUE, G_TYPE_STRING, error))
+- variant = g_variant_new (class_type, json_node_get_string (json_node));
++ variant = g_variant_new_signature (json_node_get_string (json_node));
+ break;
+
+ case G_VARIANT_CLASS_VARIANT:
+--
+1.7.4.1
+
Added: packages/unstable/json-glib/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/patches/series?rev=28760&op=file
==============================================================================
--- packages/unstable/json-glib/debian/patches/series (added)
+++ packages/unstable/json-glib/debian/patches/series [utf-8] Wed Jul 6 13:46:38 2011
@@ -1,0 +1,1 @@
+0001-Fix-GVariant-creation-on-some-architectures-bug-6504.patch
More information about the pkg-gnome-commits
mailing list