[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-5.4] 2 commits: backport patch from master to fix build with poppler 0.62

[Rene Engelhard]

Rene Engelhard pushed to branch debian-experimental-5.4 at Debian LibreOffice Maintainers / libreoffice / libreoffice


Commits:
941b8cc6 by Rene Engelhard at 2018-01-08T22:51:33+01:00
backport patch from master to fix build with poppler 0.62

- - - - -
fadb0acf by Rene Engelhard at 2018-01-08T22:55:29+01:00
Merge remote-tracking branch 'origin/master' into debian-experimental-5.4

- - - - -


3 changed files:

- changelog
- + patches/poppler-0.62.diff
- patches/series


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -13,6 +13,13 @@ libreoffice (1:5.4.5~rc1~git20171228-1) UNRELEASED; urgency=medium
 
  -- Rene Engelhard <rene at debian.org>  Tue, 12 Dec 2017 19:10:51 +0100
 
+libreoffice (1:5.4.4-2) UNRELEASED; urgency=medium
+
+  * debian/patches/poppler-0.62.diff: backport from master to fix build with
+    poppler 0.62
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 08 Jan 2018 22:44:59 +0100
+
 libreoffice (1:5.4.4-1) unstable; urgency=medium
 
   [ Rene Engelhard ]


=====================================
patches/poppler-0.62.diff
=====================================
--- /dev/null
+++ b/patches/poppler-0.62.diff
@@ -0,0 +1,31 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 5d4a797f7c96..9f6165e64b66 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/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"
+@@ -918,7 +920,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<uLen; ++i )


=====================================
patches/series
=====================================
--- a/patches/series
+++ b/patches/series
@@ -39,3 +39,4 @@ java9.diff
 icu-60.diff
 apparmor-complain.diff
 apparmor-usrmerge.diff
+poppler-0.62.diff



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/f257eddccb6a94450fa16f36e45b23ff79f761a1...fadb0acfe5b238978ff8a9e6c1d8c24b9b03246d

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/f257eddccb6a94450fa16f36e45b23ff79f761a1...fadb0acfe5b238978ff8a9e6c1d8c24b9b03246d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180108/2f90bed4/attachment-0001.html>