config_host/config_poppler.h.in | 2 -- configure.ac | 15 +-------------- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 ------- 3 files changed, 1 insertion(+), 23 deletions(-)
New commits: commit 8ae97ead49b31899c194e6086bd0e53be17da62e Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Wed Nov 24 16:06:11 2021 +0100 Commit: Jan-Marek Glogowski <[email protected]> CommitDate: Fri Nov 26 10:03:04 2021 +0100 Drop support for poppler w/o cpp/poppler-version.h Seems the first poppler including poppler-cpp.pc.in and also cpp/poppler-version.h.in was 0.14.0. So this also increases the minimal system poppler dependency from * poppler 0.12.0 (Wed Sep 9, 2009) to * poppler 0.14.0 (Tue Jun 8, 2010) Compiling the internal poppler, we're up-to-date anyway. Change-Id: Iee07cfeb43f4320fd596c772eeb26662505d0daf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125778 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <[email protected]> diff --git a/config_host/config_poppler.h.in b/config_host/config_poppler.h.in index 4b0596eb34e4..8cb1ddb95dbf 100644 --- a/config_host/config_poppler.h.in +++ b/config_host/config_poppler.h.in @@ -7,6 +7,4 @@ Settings for poppler header file detection #define ENABLE_PDFIMPORT 0 -#define HAVE_POPPLER_VERSION_H 0 - #endif diff --git a/configure.ac b/configure.ac index 81be833e671f..3d583bb00c5f 100644 --- a/configure.ac +++ b/configure.ac @@ -11992,27 +11992,14 @@ if test "$ENABLE_PDFIMPORT" = "TRUE" -a "$ENABLE_POPPLER" = "TRUE"; then if test "$with_system_poppler" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_POPPLER=TRUE - 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_DEFINE([HAVE_POPPLER_VERSION_H], 1)], - []) - CXXFLAGS=$save_CXXFLAGS - CPPFLAGS=$save_CPPFLAGS - AC_LANG_POP([C++]) + PKG_CHECK_MODULES(POPPLER,[poppler >= 0.14 poppler-cpp]) POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - FilterLibs "${POPPLER_LIBS}" POPPLER_LIBS="${filteredlibs}" else AC_MSG_RESULT([internal]) SYSTEM_POPPLER= BUILD_TYPE="$BUILD_TYPE POPPLER" - AC_DEFINE([HAVE_POPPLER_VERSION_H], 1) fi AC_DEFINE([ENABLE_PDFIMPORT],1) fi diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index f087915d97b9..b34fad1ba90a 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -55,14 +55,7 @@ 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)) || \
