You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
2.0 KiB
53 lines
2.0 KiB
13 years ago
|
--- gnome-commander-1.2.8.15/config.h.in 2011-12-06 20:15:56.000000000 +0100
|
||
|
|
+++ gnome-commander-1.2.8.15/config.h.in 2012-05-17 14:20:16.000000000 +0200
|
||
|
|
@@ -112,6 +112,9 @@
|
||
|
|
/* Define to 1 if poppler has support for PDFDoc::getPDFVersion() */
|
||
|
|
#undef POPPLER_HAS_GET_PDF_VERSION
|
||
|
|
|
||
|
|
+/* Define to 1 if poppler has support for setErrorCallback() */
|
||
|
|
+#undef POPPLER_HAS_SET_ERROR_CALLBACK
|
||
|
|
+
|
||
|
|
/* definition of PREFIX */
|
||
|
|
#undef PREFIX
|
||
|
|
|
||
|
|
--- gnome-commander-1.2.8.15/configure.in 2011-12-06 20:10:27.000000000 +0100
|
||
|
|
+++ gnome-commander-1.2.8.15/configure.in 2012-05-17 14:21:52.000000000 +0200
|
||
|
|
@@ -239,6 +239,9 @@ if test x$with_poppler != xno; then
|
||
|
|
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
|
||
|
|
fi
|
||
|
|
if test "x$have_pdf" = "xyes"; then
|
||
|
|
AC_DEFINE(HAVE_PDF, 1, [Define to 1 if you have PDF support])
|
||
|
|
--- gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc 2011-12-06 20:10:29.000000000 +0100
|
||
|
|
+++ gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc 2012-05-17 14:21:39.000000000 +0200
|
||
|
|
@@ -40,8 +40,11 @@ using namespace std;
|
||
|
|
#ifdef HAVE_PDF
|
||
|
|
static regex_t rxDate;
|
||
|
|
static gboolean rxDate_OK;
|
||
|
|
-
|
||
|
|
+#ifdef POPPLER_HAS_SET_ERROR_CALLBACK
|
||
|
|
+static void noErrorReporting(void *, ErrorCategory, int pos, char *msg)
|
||
|
|
+#else
|
||
|
|
static void noErrorReporting(int pos, char *msg, va_list args)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
@@ -52,8 +55,12 @@ void gcmd_tags_poppler_init()
|
||
|
|
#ifdef HAVE_PDF
|
||
|
|
rxDate_OK = regcomp (&rxDate, "^(D:)?([12][019][0-9][0-9]([01][0-9]([0-3][0-9]([012][0-9]([0-5][0-9]([0-5][0-9])?)?)?)?)?)", REG_EXTENDED)==0;
|
||
|
|
|
||
|
|
+#ifdef POPPLER_HAS_SET_ERROR_CALLBACK
|
||
|
|
+ setErrorCallback(noErrorReporting, NULL);
|
||
|
|
+#else
|
||
|
|
setErrorFunction(noErrorReporting);
|
||
|
|
#endif
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
|