r47108 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-gtypes.h-move-G_STATIC_ASSERT-to-function-scope.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Sun Nov 29 18:44:51 2015
New Revision: 47108

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47108
Log:
debian/patches/0001-gtypes.h-move-G_STATIC_ASSERT-to-function-scope.patch:
Another cherry-pick. Should fix g-ir-scanner.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-gtypes.h-move-G_STATIC_ASSERT-to-function-scope.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=47108&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Sun Nov 29 18:44:51 2015
@@ -1,3 +1,10 @@
+glib2.0 (2.47.3-3) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-gtypes.h-move-G_STATIC_ASSERT-to-function-scope.patch:
+    Another cherry-pick. Should fix g-ir-scanner.
+
+ -- Iain Lane <laney at debian.org>  Sun, 29 Nov 2015 18:43:17 +0000
+
 glib2.0 (2.47.3-2) experimental; urgency=medium
 
   * debian/patches/0001-tests-fix-a-test-on-32-bit-builds.patch: Cherry-pick

Added: desktop/experimental/glib2.0/debian/patches/0001-gtypes.h-move-G_STATIC_ASSERT-to-function-scope.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-gtypes.h-move-G_STATIC_ASSERT-to-function-scope.patch?rev=47108&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-gtypes.h-move-G_STATIC_ASSERT-to-function-scope.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-gtypes.h-move-G_STATIC_ASSERT-to-function-scope.patch	[utf-8] Sun Nov 29 18:44:51 2015
@@ -0,0 +1,28 @@
+From ec6971b864a3faffadd0bf4a87c7c1b47697fc83 Mon Sep 17 00:00:00 2001
+From: Allison Ryan Lortie <desrt at desrt.ca>
+Date: Fri, 27 Nov 2015 11:27:51 -0500
+Subject: [PATCH] gtypes.h: move G_STATIC_ASSERT to function scope
+
+It seems that some compilers get upset if this is done at global scope,
+so let's move it to function scope where we know it works.
+---
+ glib/gtypes.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/gtypes.h b/glib/gtypes.h
+index 8575052..c20217b 100644
+--- a/glib/gtypes.h
++++ b/glib/gtypes.h
+@@ -419,8 +419,8 @@ static inline gboolean _GLIB_CHECKED_ADD_U32 (guint32 *dest, guint32 a, guint32
+ static inline gboolean _GLIB_CHECKED_MUL_U32 (guint32 *dest, guint32 a, guint32 b) {
+   return !__builtin_umul_overflow(a, b, dest); }
+ static inline gboolean _GLIB_CHECKED_ADD_U64 (guint64 *dest, guint64 a, guint64 b) {
+-  return !__builtin_uaddll_overflow(a, b, (unsigned long long *) dest); }
+   G_STATIC_ASSERT(sizeof (unsigned long long) == sizeof (guint64));
++  return !__builtin_uaddll_overflow(a, b, (unsigned long long *) dest); }
+ static inline gboolean _GLIB_CHECKED_MUL_U64 (guint64 *dest, guint64 a, guint64 b) {
+   return !__builtin_umulll_overflow(a, b, (unsigned long long *) dest); }
+ #else
+-- 
+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=47108&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Sun Nov 29 18:44:51 2015
@@ -1,4 +1,5 @@
 0001-tests-fix-a-test-on-32-bit-builds.patch
+0001-gtypes.h-move-G_STATIC_ASSERT-to-function-scope.patch
 01_gettext-desktopfiles.patch
 02_gettext-desktopfiles-ubuntu.patch
 03_disble_glib_compile_schemas_warning.patch