OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=259

0001-Make-cpp-poppler-version.h-header-optional.patch

@@ -1,4 +1,4 @@
-From 20e8dfef3957e6e94677f7609543a24b60f2ebfb Mon Sep 17 00:00:00 2001
+From 459fe2262e26c3f24108e5ba1bdf342b6236cf54 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
 Date: Thu, 16 Apr 2015 10:13:06 +0200
 Subject: [PATCH] Make cpp/poppler-version.h header optional
@@ -11,8 +11,8 @@ Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c
 ---
  config_host/config_poppler.h.in                       | 10 ++++++++++
  configure.ac                                          |  9 ++++++---
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  7 +++++++
- 3 files changed, 23 insertions(+), 3 deletions(-)
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |  8 ++++++++
+ 3 files changed, 24 insertions(+), 3 deletions(-)
  create mode 100644 config_host/config_poppler.h.in
 
 diff --git a/config_host/config_poppler.h.in b/config_host/config_poppler.h.in
@@ -71,10 +71,18 @@ index 9e8e1d2..79effbe 100644
  
  if test "$CROSS_COMPILING" = TRUE; then
 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index d15491b..06a0120 100644
+index d15491b..f4fa810 100644
 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -50,7 +50,14 @@
+@@ -21,6 +21,7 @@
+ #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
+ 
+ #include <sal/types.h>
++#include <config_poppler.h>
+ 
+ #if defined __GNUC__
+ # pragma GCC diagnostic push
+@@ -50,7 +51,14 @@
  class GfxPath;
  class GfxFont;
  class PDFDoc;