From 9437783396f058efa195d10d6b438f129de204985cdf074bfd21010260232e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 5 Jan 2018 10:23:29 +0000
Subject: [PATCH] Accepting request 561753 from home:dimstar:Factory

Fix build with poppler 0.62 - will take a while to build, but the build fail usually happened in the first 5 minutes, which is well passed already

OBS-URL: https://build.opensuse.org/request/show/561753
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=575
---
 libreoffice-poppler-0.62.patch | 31 +++++++++++++++++++++++++++++++
 libreoffice.changes            |  7 +++++++
 libreoffice.spec               |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 libreoffice-poppler-0.62.patch

diff --git a/libreoffice-poppler-0.62.patch b/libreoffice-poppler-0.62.patch
new file mode 100644
index 0000000..5416752
--- /dev/null
+++ b/libreoffice-poppler-0.62.patch
@@ -0,0 +1,31 @@
+Index: libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+===================================================================
+--- libreoffice-6.0.0.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -32,10 +32,12 @@
+ #pragma warning(push, 1)
+ #endif
+ 
+-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
++// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then renamed to UnicodeMapFuncs.h in 0.62.0
+ // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
+ //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
+-#if POPPLER_CHECK_VERSION(0, 21, 1)
++#if POPPLER_CHECK_VERSION(0, 62, 0)
++#include <UnicodeMapFuncs.h>
++#elif POPPLER_CHECK_VERSION(0, 21, 1)
+ #include <UTF8.h>
+ #elif POPPLER_CHECK_VERSION(0, 21, 0)
+ #include "UTF.h"
+@@ -913,7 +915,11 @@ void PDFOutDev::drawChar(GfxState *state
+             );
+ 
+     // silence spurious warning
++#if POPPLER_CHECK_VERSION(0, 62, 0)
++    (void)&mapUTF16;
++#else
+     (void)&mapUCS2;
++#endif
+ 
+     char buf[9];
+     for( int i=0; i<uLen; ++i )
diff --git a/libreoffice.changes b/libreoffice.changes
index 32070ec..0f438cf 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan  4 21:30:45 UTC 2018 - dimstar@opensuse.org
+
+- Add libreoffice-poppler-0.62.patch: Fix build with poppler 0.62,
+  where UTF8.h (explcitly marked as an experimental header) was
+  renamed to UnicodeMapFuncs.h.
+
 -------------------------------------------------------------------
 Tue Jan  2 12:51:58 UTC 2018 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 0cbe0ab..695e7d1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -92,6 +92,7 @@ Patch1:         scp2-user-config-suse.diff
 Patch4:         nlpsolver-no-broken-help.diff
 Patch5:         mediawiki-no-broken-help.diff
 Patch6:         kde5-configure-checks.patch
+Patch7:         libreoffice-poppler-0.62.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 BuildRequires:  %{name}-share-linker
@@ -885,6 +886,7 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch4
 %patch5
 %patch6 -p1
+%patch7 -p1
 %patch990 -p1
 
 # Disable some of the failing tests (some are random)