95 lines
3.4 KiB
Diff
95 lines
3.4 KiB
Diff
From 20e8dfef3957e6e94677f7609543a24b60f2ebfb 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
|
|
|
|
Older popler (SLE11) does not have this header yet.
|
|
With the code simply if the header not found define version to oldest
|
|
possible working candidate and also raise the .pc check to the same.
|
|
|
|
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(-)
|
|
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
|
|
new file mode 100644
|
|
index 0000000..458c49b
|
|
--- /dev/null
|
|
+++ b/config_host/config_poppler.h.in
|
|
@@ -0,0 +1,10 @@
|
|
+/*
|
|
+Settings for poppler header file dection
|
|
+*/
|
|
+
|
|
+#ifndef CONFIG_POPPLER_H
|
|
+#define CONFIG_POPPLER_H
|
|
+
|
|
+#define HAVE_POPPLER_VERSION_H 0
|
|
+
|
|
+#endif
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 9e8e1d2..79effbe 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -10432,14 +10432,15 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
|
|
if test "$with_system_poppler" = "yes"; then
|
|
AC_MSG_RESULT([external])
|
|
SYSTEM_POPPLER=TRUE
|
|
- PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
|
|
+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
|
|
AC_LANG_PUSH([C++])
|
|
save_CXXFLAGS=$CXXFLAGS
|
|
save_CPPFLAGS=$CPPFLAGS
|
|
CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
|
|
CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
|
|
- 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)],
|
|
+ [])
|
|
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], 1)
|
|
fi
|
|
else
|
|
AC_MSG_RESULT([no])
|
|
@@ -13002,6 +13004,7 @@ AC_CONFIG_HEADERS([config_host/config_vcl.h])
|
|
AC_CONFIG_HEADERS([config_host/config_vclplug.h])
|
|
AC_CONFIG_HEADERS([config_host/config_version.h])
|
|
AC_CONFIG_HEADERS([config_host/config_oauth2.h])
|
|
+AC_CONFIG_HEADERS([config_host/config_poppler.h])
|
|
AC_OUTPUT
|
|
|
|
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
|
|
--- 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;
|
|
+#if HAVE_POPPLER_VERSION_H
|
|
#include <cpp/poppler-version.h>
|
|
+#else
|
|
+#define POPPLER_VERSION "0.12.3"
|
|
+#define POPPLER_VERSION_MAJOR 0
|
|
+#define POPPLER_VERSION_MINOR 12
|
|
+#define POPPLER_VERSION_MICRO 3
|
|
+#endif
|
|
#define POPPLER_CHECK_VERSION(major,minor,micro) \
|
|
(POPPLER_VERSION_MAJOR > (major) || \
|
|
(POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
|
|
--
|
|
2.3.5
|
|
|