libreoffice: Fix build with recent icu/gcc

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

recipes-libreoffice/libreoffice/files/0006-Fix-build-with-recent-icu.patch

@@ -19,7 +19,9 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  i18npool/source/ordinalsuffix/ordinalsuffix.cxx      |  2 +-
  i18nutil/source/utility/unicode.cxx                  |  6 +++---
  vcl/generic/glyphs/scrptrun.h                        |  2 +-
- 8 files changed, 25 insertions(+), 24 deletions(-)
+ opencl/source/openclconfig.cxx                       | 2 +-
+ lotuswordpro/source/filter/localtime.cxx             | 2 +-
+ 10 files changed, 27 insertions(+), 24 deletions(-)
 
 diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
 index edbb128..ceb9e11 100644
@@ -245,6 +247,32 @@ index 625ca7b..2b8ce0b 100644
  public:
      ScriptRun();
  
+diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
+index 688dab1..aa1f913 100644
+--- a/opencl/source/openclconfig.cxx
++++ b/opencl/source/openclconfig.cxx
+@@ -121,7 +121,7 @@ bool match(const OUString& rPattern, const OUString& rInput)
+     UErrorCode nIcuError(U_ZERO_ERROR);
+     icu::UnicodeString sIcuPattern(reinterpret_cast<const UChar*>(rPattern.getStr()), rPattern.getLength());
+     icu::UnicodeString sIcuInput(reinterpret_cast<const UChar*>(rInput.getStr()), rInput.getLength());
+-    RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
++    icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
+ 
+     if (U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) && U_SUCCESS(nIcuError))
+         return true;
+diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx
+index f8af7e6..73903c8 100644
+--- a/lotuswordpro/source/filter/localtime.cxx
++++ b/lotuswordpro/source/filter/localtime.cxx
+@@ -176,7 +176,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm)
+ 
+     if ((rtime > 3 * DAY_SEC)&&(rtime < LONG_MAX - 3 * DAY_SEC))
+     {
+-        TimeZone* pLocalZone = TimeZone::createDefault();
++        icu::TimeZone* pLocalZone = icu::TimeZone::createDefault();
+         long offset = (pLocalZone->getRawOffset())/1000;
+         delete pLocalZone;
+         long ltime = rtime + offset;
 -- 
 2.14.3
 

recipes-libreoffice/libreoffice/files/0007-FIx-build-with-recent-gcc.patch

@@ -0,0 +1,53 @@
+From 575a48e4a1683b30a8171225b7484a8c7ab6f94b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 8 Jun 2018 19:47:11 +0200
+Subject: [PATCH 2/3] FIx build with recent gcc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Ic7f8aa08c8268ecc51abb7710e4a91b9ed892ee7
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++--
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index e505a43..db5f361 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -456,7 +456,7 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
+     FontAttributes aNewFont;
+     int nSize = 0;
+ 
+-    GooString* pFamily = gfxFont->getName();
++    const GooString* pFamily = gfxFont->getName();
+     if( pFamily )
+     {
+         aNewFont.familyName.clear();
+@@ -753,7 +753,7 @@ void PDFOutDev::updateFont(GfxState *state)
+         FontAttributes aFont;
+         int nEmbedSize=0;
+ 
+-        Ref* pID = gfxFont->getID();
++        const Ref* pID = gfxFont->getID();
+         // TODO(Q3): Portability problem
+         long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
+         std::unordered_map< long long, FontAttributes >::const_iterator it =
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index b5dd4e4..f6cefda 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -237,7 +237,7 @@ namespace pdfi
+                               double dx, double dy,
+                               double originX, double originY,
+                               CharCode code, int nBytes, Unicode *u, int uLen) SAL_OVERRIDE;
+-        virtual void drawString(GfxState *state, GooString *s) SAL_OVERRIDE;
++        virtual void drawString(GfxState *state, GooString *s);
+         virtual void endTextObject(GfxState *state) SAL_OVERRIDE;
+ 
+         //----- image drawing
+-- 
+2.14.3
+

recipes-libreoffice/libreoffice/libreoffice.inc

@@ -16,6 +16,7 @@ SRC_URI += " \
     file://0004-remove-dictmgr.hxx-to-be-compatible-with-later-hunsp.patch \
     file://0005-packedpixeliterator.hxx-fix-typo-detected-by-gcc7.patch \
     file://0006-Fix-build-with-recent-icu.patch \
+    file://0007-FIx-build-with-recent-gcc.patch \
 "
 SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"