|
 |
4fd0213 |
From b80670a266c8d138d11a3b62577afd18d17ee6bd Mon Sep 17 00:00:00 2001
|
|
|
4fd0213 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
4fd0213 |
Date: Thu, 20 Feb 2014 11:36:38 +0000
|
|
|
4fd0213 |
Subject: [PATCH] poppler fixes
|
|
|
4fd0213 |
|
|
|
4fd0213 |
Change-Id: Iaad3d6ba494a00e7581c5d7a35ec3ec5f57134dc
|
|
|
4fd0213 |
---
|
|
|
4fd0213 |
configure.ac | 10 ----------
|
|
|
4fd0213 |
sdext/Module_sdext.mk | 5 -----
|
|
|
4fd0213 |
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 +++-
|
|
|
4fd0213 |
3 files changed, 3 insertions(+), 16 deletions(-)
|
|
|
4fd0213 |
|
|
|
4fd0213 |
diff --git a/configure.ac b/configure.ac
|
|
|
4fd0213 |
index b8def00..5c34e29 100644
|
|
|
4fd0213 |
--- a/configure.ac
|
|
|
4fd0213 |
+++ b/configure.ac
|
|
|
4fd0213 |
@@ -10425,16 +10425,6 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
|
|
 |
1ed7cb0 |
AC_MSG_RESULT([external])
|
|
|
1ed7cb0 |
SYSTEM_POPPLER=YES
|
|
|
1ed7cb0 |
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
|
|
|
1ed7cb0 |
- AC_LANG_PUSH([C++])
|
|
|
1ed7cb0 |
- save_CXXFLAGS=$CXXFLAGS
|
|
|
1ed7cb0 |
- save_CPPFLAGS=$CPPFLAGS
|
|
|
1ed7cb0 |
- CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
|
|
|
1ed7cb0 |
- CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
|
|
|
1ed7cb0 |
- AC_CHECK_HEADER([cpp/poppler-version.h], [],
|
|
|
82f2389 |
- [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
|
|
|
1ed7cb0 |
- CXXFLAGS=$save_CXXFLAGS
|
|
|
1ed7cb0 |
- CPPFLAGS=$save_CPPFLAGS
|
|
|
1ed7cb0 |
- AC_LANG_POP([C++])
|
|
|
1ed7cb0 |
libo_MINGW_CHECK_DLL([libpoppler])
|
|
|
1ed7cb0 |
POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
|
|
|
1ed7cb0 |
else
|
|
|
4fd0213 |
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
|
|
|
4fd0213 |
index 5299cd8..94baf45 100644
|
|
|
7fe959c |
--- a/sdext/Module_sdext.mk
|
|
|
7fe959c |
+++ b/sdext/Module_sdext.mk
|
|
|
4fd0213 |
@@ -26,11 +26,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
|
|
|
7fe959c |
StaticLibrary_pdfimport_s \
|
|
|
7fe959c |
))
|
|
|
7fe959c |
|
|
|
7fe959c |
-$(eval $(call gb_Module_add_check_targets,sdext,\
|
|
|
7fe959c |
- CppunitTest_pdfimport \
|
|
|
7fe959c |
- Executable_pdf2xml \
|
|
|
7fe959c |
- Executable_pdfunzip \
|
|
|
7fe959c |
-))
|
|
|
7fe959c |
endif
|
|
|
7fe959c |
|
|
|
7fe959c |
# vim:set noet sw=4 ts=4:
|
|
|
4fd0213 |
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
|
4fd0213 |
index f7e4a98..d1218578 100644
|
|
|
4fd0213 |
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
|
4fd0213 |
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
|
|
4fd0213 |
@@ -58,7 +58,9 @@
|
|
|
4fd0213 |
class GfxPath;
|
|
|
4fd0213 |
class GfxFont;
|
|
|
4fd0213 |
class PDFDoc;
|
|
|
4fd0213 |
-#include <cpp/poppler-version.h>
|
|
|
4fd0213 |
+#define POPPLER_VERSION_MAJOR 0
|
|
|
4fd0213 |
+#define POPPLER_VERSION_MINOR 12
|
|
|
4fd0213 |
+#define POPPLER_VERSION_MICRO 4
|
|
|
4fd0213 |
#define POPPLER_CHECK_VERSION(major,minor,micro) \
|
|
|
4fd0213 |
(POPPLER_VERSION_MAJOR > (major) || \
|
|
|
4fd0213 |
(POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
|
|
|
4fd0213 |
--
|
|
|
4fd0213 |
1.8.5.3
|
|
|
4fd0213 |
|