[gnome-commander] Increased poppler dependency to 0.18



commit bdaede1d8d49720306b3ca1584b915e4a573210e
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Fri Feb 21 11:12:21 2014 +0100

    Increased poppler dependency to 0.18

 configure.in                       |    5 +----
 src/tags/gnome-cmd-tags-poppler.cc |    4 ----
 2 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/configure.in b/configure.in
index eeab227..9b4fbf2 100644
--- a/configure.in
+++ b/configure.in
@@ -53,7 +53,7 @@ PYTHON_REQ=2.5
 EXIV2_REQ=0.14
 TAGLIB_REQ=1.4
 LIBGSF_REQ=1.12.0
-POPPLER_REQ=0.6
+POPPLER_REQ=0.18
 
 AC_SUBST(GLIB_REQ)
 AC_SUBST(GTK_REQ)
@@ -261,9 +261,6 @@ AC_ARG_WITH(poppler, [  --without-poppler        disable PDF support])
 have_pdf=no
 if test x$with_poppler != xno; then
     PKG_CHECK_MODULES(POPPLER, poppler >= $POPPLER_REQ, have_pdf=yes, have_pdf=no)
-    if pkg-config --max-version=0.11.2 poppler; then
-        AC_DEFINE(POPPLER_HAS_GET_PDF_VERSION, 1, [Define to 1 if poppler has support for 
PDFDoc::getPDFVersion()])
-    fi
     if pkg-config --atleast-version=0.19.0 poppler; then
         AC_DEFINE(POPPLER_HAS_SET_ERROR_CALLBACK, 1, [Define to 1 if poppler has support for 
setErrorCallback()])
     fi
diff --git a/src/tags/gnome-cmd-tags-poppler.cc b/src/tags/gnome-cmd-tags-poppler.cc
index 14fec89..2baaafe 100644
--- a/src/tags/gnome-cmd-tags-poppler.cc
+++ b/src/tags/gnome-cmd-tags-poppler.cc
@@ -333,11 +333,7 @@ void gcmd_tags_poppler_load_metadata(GnomeCmdFile *f)
 
     f->metadata->mark_as_accessed(TAG_DOC);
 
-#ifdef POPPLER_HAS_GET_PDF_VERSION
-    f->metadata->addf(TAG_PDF_VERSION, "%.1f", doc.getPDFVersion());
-#else
     f->metadata->addf(TAG_PDF_VERSION, "%u.%u", doc.getPDFMajorVersion(), doc.getPDFMinorVersion());
-#endif
 
     f->metadata->addf(TAG_DOC_PAGECOUNT, "%i", doc.getNumPages());
     f->metadata->addf(TAG_PDF_OPTIMIZED, "%u", doc.isLinearized());


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]