r49135 - in /desktop/experimental/glib2.0/debian: changelog control patches/0001-gsettings-test-Wrap-guint64-literals-in-G_GUINT64_CO.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Thu Jun 23 15:55:59 2016
New Revision: 49135

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49135
Log:
d/p/0001-gsettings-test-Wrap-guint64-literals-in-G_GUINT64_CO.patch:
Cherry-pick from upstream to fix test failure on non-64 bit arches.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-gsettings-test-Wrap-guint64-literals-in-G_GUINT64_CO.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=49135&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Thu Jun 23 15:55:59 2016
@@ -1,3 +1,10 @@
+glib2.0 (2.49.2-2) UNRELEASED; urgency=medium
+
+  * d/p/0001-gsettings-test-Wrap-guint64-literals-in-G_GUINT64_CO.patch:
+    Cherry-pick from upstream to fix test failure on non-64 bit arches.
+
+ -- Iain Lane <laney at debian.org>  Tue, 21 Jun 2016 14:21:51 +0100
+
 glib2.0 (2.49.2-1) experimental; urgency=medium
 
   [ Emilio Pozuelo Monfort ]

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=49135&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control	[utf-8] Thu Jun 23 15:55:59 2016
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.93),
                dh-autoreconf,

Added: desktop/experimental/glib2.0/debian/patches/0001-gsettings-test-Wrap-guint64-literals-in-G_GUINT64_CO.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-gsettings-test-Wrap-guint64-literals-in-G_GUINT64_CO.patch?rev=49135&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-gsettings-test-Wrap-guint64-literals-in-G_GUINT64_CO.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-gsettings-test-Wrap-guint64-literals-in-G_GUINT64_CO.patch	[utf-8] Thu Jun 23 15:55:59 2016
@@ -0,0 +1,37 @@
+From 536a1fc6cf108d4fff1315ac097dac344b6c3739 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Thu, 23 Jun 2016 15:56:38 +0100
+Subject: [PATCH] gsettings test: Wrap guint64 literals in G_GUINT64_CONSTANT
+
+This fixes test failures on some architectures.
+---
+ gio/tests/gsettings.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
+index 86cc85c..7cbf775 100644
+--- a/gio/tests/gsettings.c
++++ b/gio/tests/gsettings.c
+@@ -1182,13 +1182,13 @@ test_simple_binding (void)
+ 
+   g_settings_bind (settings, "uint64", obj, "uint64", G_SETTINGS_BIND_DEFAULT);
+ 
+-  g_object_set (obj, "uint64", 12345, NULL);
+-  g_assert_cmpuint (g_settings_get_uint64 (settings, "uint64"), ==, 12345);
++  g_object_set (obj, "uint64", G_GUINT64_CONSTANT (12345), NULL);
++  g_assert_cmpuint (g_settings_get_uint64 (settings, "uint64"), ==, G_GUINT64_CONSTANT (12345));
+ 
+-  g_settings_set_uint64 (settings, "uint64", 54321);
+-  u = 1111;
+-  g_object_get (obj, "uint64", &u, NULL);
+-  g_assert_cmpuint (u, ==, 54321);
++  g_settings_set_uint64 (settings, "uint64", G_GUINT64_CONSTANT (54321));
++  u64 = G_GUINT64_CONSTANT (1111);
++  g_object_get (obj, "uint64", &u64, NULL);
++  g_assert_cmpuint (u64, ==, G_GUINT64_CONSTANT (54321));
+ 
+   g_settings_bind (settings, "int64", obj, "int64", G_SETTINGS_BIND_DEFAULT);
+ 
+-- 
+2.7.4
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=49135&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Thu Jun 23 15:55:59 2016
@@ -1,3 +1,4 @@
+0001-gsettings-test-Wrap-guint64-literals-in-G_GUINT64_CO.patch
 01_gettext-desktopfiles.patch
 02_gettext-desktopfiles-ubuntu.patch
 03_disble_glib_compile_schemas_warning.patch