[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] make poppler-0.62.diff apply for 6.0...

[Rene Engelhard]

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


Commits:
2a69de4e by Rene Engelhard at 2018-01-08T23:07:57+01:00
make poppler-0.62.diff apply for 6.0...

- - - - -


1 changed file:

- patches/poppler-0.62.diff


Changes:

=====================================
patches/poppler-0.62.diff
=====================================
--- a/patches/poppler-0.62.diff
+++ b/patches/poppler-0.62.diff
@@ -1,5 +1,18 @@
+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 5d4a797f7c96..9f6165e64b66 100644
+index 85647b6..4f6ff1d 100644
 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
 @@ -32,10 +32,12 @@
@@ -14,10 +27,10 @@ index 5d4a797f7c96..9f6165e64b66 100644
 +#if POPPLER_CHECK_VERSION(0, 62, 0)
 +#include <UnicodeMapFuncs.h>
 +#elif POPPLER_CHECK_VERSION(0, 21, 1)
- #include "UTF8.h"
+ #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,
+@@ -913,7 +915,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
              );
  
      // silence spurious warning
@@ -29,3 +42,6 @@ index 5d4a797f7c96..9f6165e64b66 100644
  
      char buf[9];
      for( int i=0; i<uLen; ++i )
+-- 
+cgit v1.1
+



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/2a69de4ec1b4beb3cd419fd4af0f614d92205895

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/2a69de4ec1b4beb3cd419fd4af0f614d92205895
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/48a15579/attachment-0001.html>