From a09756ea891507c129075d9a858c8a7169b0b493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 25 Aug 2016 12:38:55 +0200 Subject: [PATCH] libreoffice: further gcc6 fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../files/0002-fix-gcc-build-error.patch | 2 + ...03-Werror-shift-negative-value-GCC-6.patch | 46 +++++++++++++++++++ .../libreoffice/libreoffice.inc | 1 + 3 files changed, 49 insertions(+) create mode 100644 recipes-libreoffice/libreoffice/files/0003-Werror-shift-negative-value-GCC-6.patch diff --git a/recipes-libreoffice/libreoffice/files/0002-fix-gcc-build-error.patch b/recipes-libreoffice/libreoffice/files/0002-fix-gcc-build-error.patch index 914594d..8863b4d 100644 --- a/recipes-libreoffice/libreoffice/files/0002-fix-gcc-build-error.patch +++ b/recipes-libreoffice/libreoffice/files/0002-fix-gcc-build-error.patch @@ -11,6 +11,8 @@ non-int/long/float/double argument case. So promote earlier to int so the abs is called Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae + +Upstream-Status: Backport --- sax/source/tools/converter.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-libreoffice/libreoffice/files/0003-Werror-shift-negative-value-GCC-6.patch b/recipes-libreoffice/libreoffice/files/0003-Werror-shift-negative-value-GCC-6.patch new file mode 100644 index 0000000..661bde2 --- /dev/null +++ b/recipes-libreoffice/libreoffice/files/0003-Werror-shift-negative-value-GCC-6.patch @@ -0,0 +1,46 @@ +From 352f9fdff619b5a0a1414c29cfc47068165a599c Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 19 Jan 2016 10:43:21 +0100 +Subject: [PATCH] -Werror=shift-negative-value (GCC 6) + +Change-Id: Ifc7b1d6675a8e8fb41dd47cc1282059c3790736f + +Upstream-Status: Backport +--- + include/basebmp/packedpixeliterator.hxx | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/basebmp/packedpixeliterator.hxx b/include/basebmp/packedpixeliterator.hxx +index 776a45e..693f59b 100644 +--- a/include/basebmp/packedpixeliterator.hxx ++++ b/include/basebmp/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 +-- +2.7.4 + diff --git a/recipes-libreoffice/libreoffice/libreoffice.inc b/recipes-libreoffice/libreoffice/libreoffice.inc index d22aea8..9a125c3 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.inc +++ b/recipes-libreoffice/libreoffice/libreoffice.inc @@ -11,6 +11,7 @@ require libreoffice-version.inc SRC_URI += " \ file://0001-update-ax_boost-scripts-to-fix-configure-with-system.patch \ file://0002-fix-gcc-build-error.patch \ + file://0003-Werror-shift-negative-value-GCC-6.patch \ " inherit autotools-brokensep pkgconfig distutils-base perlnative