diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index 6f7e838..9aa8c2a 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -13,6 +13,7 @@ SRC_URI += " \ file://0007-Package.mk-workaround-icu-missing-error-for-without-.patch \ file://0008-configure.ac-avoid-finding-calling-pg_config.patch \ file://0009-avoid-downloading-by-git-submodules.patch \ + file://0010-Fix-build-with-poppler-0.62.0.patch \ " SRC_URI[translations.md5sum] = "644f33f2bc84fe9ffd8a4c09b41a36fc" diff --git a/recipes-libreoffice/libreoffice/libreoffice/0010-Fix-build-with-poppler-0.62.0.patch b/recipes-libreoffice/libreoffice/libreoffice/0010-Fix-build-with-poppler-0.62.0.patch new file mode 100644 index 0000000..1a455d0 --- /dev/null +++ b/recipes-libreoffice/libreoffice/libreoffice/0010-Fix-build-with-poppler-0.62.0.patch @@ -0,0 +1,50 @@ +From c317f7f33ecc275f4e39dae1dcdfc444b99b1d9f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 18 Mar 2018 17:06:55 +0100 +Subject: [PATCH] Fix build with poppler >= 0.62.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +see [1] for further details + +[1] https://bugs.freedesktop.org/attachment.cgi?id=135409 + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index b7c47d8..e505a43 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -34,7 +34,10 @@ + // sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 + // 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) ++// Maybe change cam in earlier but meta-oe is going to jump to 0.62.0 ++#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" +@@ -916,7 +919,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, + ); + + // silence spurious warning ++#if POPPLER_CHECK_VERSION(0, 62, 0) ++ (void)&mapUTF16; ++#else + (void)&mapUCS2; ++#endif + + char buf[9]; + for( int i=0; i