[libreoffice] 01/03: git update; update gcc-6.diff
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 0bfa44749f0541e8de5b65ce6bdabdc0a33e7a2b
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 3 17:31:09 2016 +0100
git update; update gcc-6.diff
---
changelog | 2 +-
patches/gcc-6.diff | 79 ++++++++++++++++++++++++++----------------------------
2 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/changelog b/changelog
index af7068d..8fb3865 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.1.1~rc1~git20160201-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.1~rc1~git20160203-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes scrolling direction with trackpad in gtk3 (closes: #809363)
diff --git a/patches/gcc-6.diff b/patches/gcc-6.diff
index 580432f..8eb520f 100644
--- a/patches/gcc-6.diff
+++ b/patches/gcc-6.diff
@@ -1,44 +1,3 @@
-From 352f9fdff619b5a0a1414c29cfc47068165a599c Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 19 Jan 2016 10:43:21 +0100
-Subject: -Werror=shift-negative-value (GCC 6)
-
-Change-Id: Ifc7b1d6675a8e8fb41dd47cc1282059c3790736f
-
-diff --git a/basebmp/inc/packedpixeliterator.hxx b/basebmp/inc/packedpixeliterator.hxx
-index 776a45e..693f59b 100644
---- a/basebmp/inc/packedpixeliterator.hxx
-+++ b/basebmp/inc/packedpixeliterator.hxx
-@@ -78,7 +78,7 @@ public:
- num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
- /** Bit mask for one pixel (least significant bits)
- */
-- bit_mask=~(~0 << bits_per_pixel)
-+ bit_mask=~(~0u << bits_per_pixel)
- };
-
- private:
-@@ -238,7 +238,7 @@ public:
- num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
- /** Bit mask for one pixel (least significant bits)
- */
-- bit_mask=~(~0 << bits_per_pixel)
-+ bit_mask=~(~0u << bits_per_pixel)
- };
-
- private:
-@@ -477,7 +477,7 @@ public:
- num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
- /** Bit mask for one pixel (least significant bits)
- */
-- bit_mask=~(~0 << bits_per_pixel)
-+ bit_mask=~(~0u << bits_per_pixel)
- };
-
- // TODO(F2): direction of iteration (ImageIterator can be made to
---
-cgit v0.10.2
-
From 4a5dda084a8257bde6d89f7657a54def9e286c21 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 19 Jan 2016 11:30:12 +0100
@@ -88,3 +47,41 @@ index aa65234..b2b1ba8 100644
--
cgit v0.10.2
+From b9fa2963cf12e6987b3a0acc219c4fa591e41be8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 3 Feb 2016 10:30:43 +0000
+Subject: fix gcc build error
+
+error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type
+{aka double}' and 'int' to binary 'operator%'
+
+apparently there's a template returning double for abs for the
+non-int/long/float/double argument case. So promote earlier to int so the
+abs<int> is called
+
+Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae
+
+diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
+index 744415e..cf061c9 100644
+--- a/sax/source/tools/converter.cxx
++++ b/sax/source/tools/converter.cxx
+@@ -1250,7 +1250,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
+
+
+ static void
+-lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset)
++lcl_AppendTimezone(OUStringBuffer & i_rBuffer, int const nOffset)
+ {
+ if (0 == nOffset)
+ {
+@@ -1435,7 +1435,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const sal_Int32 nYear)
+ static void lcl_ConvertToUTC(
+ sal_Int16 & o_rYear, sal_uInt16 & o_rMonth, sal_uInt16 & o_rDay,
+ sal_uInt16 & o_rHours, sal_uInt16 & o_rMinutes,
+- sal_Int16 const nSourceOffset)
++ int const nSourceOffset)
+ {
+ sal_Int16 nOffsetHours(abs(nSourceOffset) / 60);
+ sal_Int16 const nOffsetMinutes(abs(nSourceOffset) % 60);
+--
+cgit v0.10.2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: