r47101 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-tests-fix-a-test-on-32-bit-builds.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Thu Nov 26 16:11:35 2015
New Revision: 47101

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47101
Log:
debian/patches/0001-tests-fix-a-test-on-32-bit-builds.patch: Cherry-pick
from upstream. Fix tests (and therefore the build) on 32 bit arches.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-tests-fix-a-test-on-32-bit-builds.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    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=47101&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Thu Nov 26 16:11:35 2015
@@ -1,3 +1,10 @@
+glib2.0 (2.47.3-2) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-tests-fix-a-test-on-32-bit-builds.patch: Cherry-pick
+    from upstream. Fix tests (and therefore the build) on 32 bit arches.
+
+ -- Iain Lane <laney at debian.org>  Wed, 25 Nov 2015 18:21:25 +0000
+
 glib2.0 (2.47.3-1) experimental; urgency=medium
 
   * New upstream release

Added: desktop/experimental/glib2.0/debian/patches/0001-tests-fix-a-test-on-32-bit-builds.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-tests-fix-a-test-on-32-bit-builds.patch?rev=47101&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-tests-fix-a-test-on-32-bit-builds.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-tests-fix-a-test-on-32-bit-builds.patch	[utf-8] Thu Nov 26 16:11:35 2015
@@ -0,0 +1,30 @@
+From a266ac62ea1e4deb7edd9332b87b29097607d7c7 Mon Sep 17 00:00:00 2001
+From: Allison Ryan Lortie <desrt at desrt.ca>
+Date: Thu, 26 Nov 2015 09:25:39 -0500
+Subject: [PATCH] tests: fix a test on 32-bit builds
+
+We were trying to squeeze 64-bit test vectors into gsize, which is fine
+on 64bit systems but doesn't work very well on 32-bit.
+
+Change that to a guint64.
+Applied-Upstream: 2.47.4
+---
+ glib/tests/overflow.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/tests/overflow.c b/glib/tests/overflow.c
+index f241abd..5c68d95 100644
+--- a/glib/tests/overflow.c
++++ b/glib/tests/overflow.c
+@@ -16,7 +16,7 @@
+ typedef struct
+ {
+   gboolean success;
+-  gsize c, a, b;
++  guint64 c, a, b;
+ } Case;
+ 
+ static void
+-- 
+2.6.2
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=47101&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Thu Nov 26 16:11:35 2015
@@ -1,3 +1,4 @@
+0001-tests-fix-a-test-on-32-bit-builds.patch
 01_gettext-desktopfiles.patch
 02_gettext-desktopfiles-ubuntu.patch
 03_disble_glib_compile_schemas_warning.patch