diff --git a/0001-Make-cpp-poppler-version.h-header-optional.patch b/0001-Make-cpp-poppler-version.h-header-optional.patch index 9ffaa41..d0884f1 100644 --- a/0001-Make-cpp-poppler-version.h-header-optional.patch +++ b/0001-Make-cpp-poppler-version.h-header-optional.patch @@ -1,4 +1,4 @@ -From 9d12508156c354b1ee903727b07a2107be99e90a Mon Sep 17 00:00:00 2001 +From e0d1a6ee0a54f677ce31c612e198f9c1a7dc555a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 10:13:06 +0200 Subject: [PATCH] Make cpp/poppler-version.h header optional @@ -9,12 +9,12 @@ possible working candidate and also raise the .pc check to the same. Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c --- - configure.ac | 7 ++++--- + configure.ac | 8 +++++--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++ - 2 files changed, 11 insertions(+), 3 deletions(-) + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 9e8e1d2..4dff95b 100644 +index 9e8e1d2..426e909 100644 --- a/configure.ac +++ b/configure.ac @@ -10432,14 +10432,15 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_ @@ -31,20 +31,28 @@ index 9e8e1d2..4dff95b 100644 - AC_CHECK_HEADER([cpp/poppler-version.h], [], - [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], []) + AC_CHECK_HEADER([cpp/poppler-version.h], -+ [AC_DEFINE([HAVE_POPPLER_VERSION_H],[1],[Define to 1 if you have .])], -+ [AC_DEFINE([HAVE_POPPLER_VERSION_H],[0],[Define to 1 if you have .])]) ++ [AC_DEFINE([HAVE_POPPLER_VERSION_H])], ++ []) CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS AC_LANG_POP([C++]) +@@ -10449,6 +10450,7 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_ + AC_MSG_RESULT([internal]) + SYSTEM_POPPLER= + BUILD_TYPE="$BUILD_TYPE POPPLER" ++ AC_DEFINE([HAVE_POPPLER_VERSION_H]) + fi + else + AC_MSG_RESULT([no]) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index d15491b..fbe40a8 100644 +index d15491b..06a0120 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -50,7 +50,14 @@ class GfxPath; class GfxFont; class PDFDoc; -+#ifdef HAVE_POPPLER_VERSION_H ++#if HAVE_POPPLER_VERSION_H #include +#else +#define POPPLER_VERSION "0.12.3" diff --git a/libreoffice.changes b/libreoffice.changes index 6055f6c..de4eb40 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 16 11:45:39 UTC 2015 - tchvatal@suse.com + +- Update the old-poppler patch to work correctly: + * 0001-Make-cpp-poppler-version.h-header-optional.patch + ------------------------------------------------------------------- Thu Apr 16 11:43:32 UTC 2015 - tchvatal@suse.com