diff -Nru glib2.0-2.32.4/debian/changelog glib2.0-2.32.4/debian/changelog --- glib2.0-2.32.4/debian/changelog 2013-03-13 16:52:10.000000000 +0100 +++ glib2.0-2.32.4/debian/changelog 2015-03-09 12:10:53.000000000 +0100 @@ -1,3 +1,10 @@ +glib2.0 (2.32.4-0ubuntu2) precise-proposed; urgency=medium + + * debian/patches/0001-GUINT32-64_SWAP_LE_BE-macros-do-not-enclose-val-argu.patch + LP: #1214352 Fix SMB/CIFS server file open with libreoffice. + + -- Gianfranco Costamagna Mon, 09 Mar 2015 12:10:00 +0100 + glib2.0 (2.32.4-0ubuntu1) precise; urgency=low * New upstream release (LP: #1154657) diff -Nru glib2.0-2.32.4/debian/patches/0001-GUINT32-64_SWAP_LE_BE-macros-do-not-enclose-val-argu.patch glib2.0-2.32.4/debian/patches/0001-GUINT32-64_SWAP_LE_BE-macros-do-not-enclose-val-argu.patch --- glib2.0-2.32.4/debian/patches/0001-GUINT32-64_SWAP_LE_BE-macros-do-not-enclose-val-argu.patch 1970-01-01 01:00:00.000000000 +0100 +++ glib2.0-2.32.4/debian/patches/0001-GUINT32-64_SWAP_LE_BE-macros-do-not-enclose-val-argu.patch 2013-08-20 13:12:51.000000000 +0200 @@ -0,0 +1,35 @@ +From ee50e5b69a6a2d44e2ce05a5d772aadbd5814d60 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Fri, 15 Mar 2013 17:30:24 +0100 +Subject: [PATCH] GUINT32/64_SWAP_LE_BE macros do not enclose val argument in + parentheses + +See the mail thread starting at + "GCC +produced wrong code in gvfs-1.14.2-3.fc18.x86_64" for how this caused trouble +with GVFS (which in turn caused trouble with LibreOffice, where running "soffice +sftp://.../.../test.odt" to access an .odt file via GVFS failed to properly +type-detect that file as a Writer document and produced bogus error messages +about the file being broken). +--- + glib/gtypes.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/glib/gtypes.h b/glib/gtypes.h +index 57829e2..c18e0bf 100644 +--- a/glib/gtypes.h ++++ b/glib/gtypes.h +@@ -183,8 +183,8 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str, + #if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__) + + # if __GNUC__ >= 4 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 3 +-# define GUINT32_SWAP_LE_BE(val) ((guint32) __builtin_bswap32 ((gint32) val)) +-# define GUINT64_SWAP_LE_BE(val) ((guint64) __builtin_bswap64 ((gint64) val)) ++# define GUINT32_SWAP_LE_BE(val) ((guint32) __builtin_bswap32 ((gint32) (val))) ++# define GUINT64_SWAP_LE_BE(val) ((guint64) __builtin_bswap64 ((gint64) (val))) + # endif + + # if defined (__i386__) +-- +1.8.1.4 + diff -Nru glib2.0-2.32.4/debian/patches/series glib2.0-2.32.4/debian/patches/series --- glib2.0-2.32.4/debian/patches/series 2013-03-13 12:42:42.000000000 +0100 +++ glib2.0-2.32.4/debian/patches/series 2015-03-09 12:09:42.000000000 +0100 @@ -7,3 +7,4 @@ 61_glib-compile-binaries-path.patch 90-gio-modules-multiarch-compat.patch revert_schema_path_warning.patch +0001-GUINT32-64_SWAP_LE_BE-macros-do-not-enclose-val-argu.patch