[gnome-commander/gcmd-1-2-8] Add patch to compile with poppler 0.24, fixes #705724



commit 4b1b8afa5e6a1c32ac8a9f23e621b36ffaa812d6
Author: Pino Toscano <pino debian org>
Date:   Thu Oct 31 20:07:18 2013 +0100

    Add patch to compile with poppler 0.24, fixes #705724

 configure.in                       |    3 +++
 src/tags/gnome-cmd-tags-poppler.cc |    7 ++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index 134b52e..9ebf008 100644
--- a/configure.in
+++ b/configure.in
@@ -242,6 +242,9 @@ if test x$with_poppler != xno; then
     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
+    if pkg-config --atleast-version=0.23.0 poppler; then
+        AC_DEFINE(POPPLER_HAS_GOFFSET, 1, [Define to 1 if poppler has Goffset])
+    fi
 fi
 if test "x$have_pdf" = "xyes"; then
    AC_DEFINE(HAVE_PDF, 1, [Define to 1 if you have PDF support])
diff --git a/src/tags/gnome-cmd-tags-poppler.cc b/src/tags/gnome-cmd-tags-poppler.cc
index 64141b3..7277cbe 100644
--- a/src/tags/gnome-cmd-tags-poppler.cc
+++ b/src/tags/gnome-cmd-tags-poppler.cc
@@ -41,7 +41,12 @@ using namespace std;
 static regex_t rxDate;
 static gboolean rxDate_OK;
 #ifdef POPPLER_HAS_SET_ERROR_CALLBACK
-static void noErrorReporting(void *, ErrorCategory, int pos, char *msg)
+#ifdef POPPLER_HAS_GOFFSET
+typedef Goffset gcmd_poppler_offset_t;
+#else
+typedef int gcmd_poppler_offset_t;
+#endif
+static void noErrorReporting(void *, ErrorCategory, gcmd_poppler_offset_t pos, char *msg)
 #else
 static void noErrorReporting(int pos, char *msg, va_list args)
 #endif


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