36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
Index: libreoffice-4.0.3.2a/configure.ac
|
||
|
|
===================================================================
|
||
|
|
--- configure.ac
|
||
|
|
+++ configure.ac
|
||
|
|
@@ -9723,16 +9723,6 @@ if test "$_os" != Android -a "$_os" != i
|
||
|
|
AC_MSG_RESULT([external])
|
||
|
|
SYSTEM_POPPLER=YES
|
||
|
|
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.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])], [])
|
||
|
|
- CXXFLAGS=$save_CXXFLAGS
|
||
|
|
- CPPFLAGS=$save_CPPFLAGS
|
||
|
|
- AC_LANG_POP([C++])
|
||
|
|
libo_MINGW_CHECK_DLL([POPPLER], [libpoppler])
|
||
|
|
else
|
||
|
|
AC_MSG_RESULT([internal])
|
||
|
|
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.old 2013-05-01 16:10:03.000000000 +0200
|
||
|
|
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-05-01 16:11:22.000000000 +0200
|
||
|
|
@@ -62,7 +62,10 @@ class PDFDoc;
|
||
|
|
#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
|
||
|
|
typedef GString GooString;
|
||
|
|
#else
|
||
|
|
-#include <cpp/poppler-version.h>
|
||
|
|
+#define POPPLER_VERSION "0.12.3"
|
||
|
|
+#define POPPLER_VERSION_MAJOR 0
|
||
|
|
+#define POPPLER_VERSION_MINOR 12
|
||
|
|
+#define POPPLER_VERSION_MICRO 3
|
||
|
|
#define POPPLER_CHECK_VERSION(major,minor,micro) \
|
||
|
|
(POPPLER_VERSION_MAJOR > (major) || \
|
||
|
|
(POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
|