[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] poppler-0.62 is upstream, too

[Rene Engelhard]

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


Commits:
711320f6 by Rene Engelhard at 2018-01-29T09:26:33+01:00
poppler-0.62 is upstream, too

- - - - -


2 changed files:

- − patches/poppler-0.62.diff
- patches/series


Changes:

=====================================
patches/poppler-0.62.diff deleted
=====================================
--- a/patches/poppler-0.62.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-From 38368be8527ca655854ee1231d9f355b8c0591ec Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar at suse.de>
-Date: Fri, 5 Jan 2018 12:16:03 +0100
-Subject: Allow building with poppler-0.62
-
-Change-Id: Ia627f1628a67dd8ece7d9318639d9ccd06b89765
-Reviewed-on: https://gerrit.libreoffice.org/47460
-Tested-by: Jenkins <ci at libreoffice.org>
-Reviewed-by: Michael Stahl <mstahl at redhat.com>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 85647b6..4f6ff1d 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"
-@@ -913,7 +915,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 )
--- 
-cgit v1.1
-


=====================================
patches/series
=====================================
--- a/patches/series
+++ b/patches/series
@@ -35,7 +35,6 @@ tdf108963-test.diff
 sal-fix-kfreebsd-build.diff
 apparmor-usrmerge.diff
 revert-bd260a59cfdd050db3aa9a641ef0fa09efcedf5b.diff
-poppler-0.62.diff
 apparmor-fixes.diff
 apparmor-complain.diff
 temporary-buildfix.diff



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/711320f686f970946da48cdd8d06d5e837127053

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/711320f686f970946da48cdd8d06d5e837127053
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/20180129/50954456/attachment-0001.html>