mirror of
https://github.com/Ponce/slackbuilds
synced 2024-10-13 08:43:42 +02:00
7c9af8a39a
Added a patch for the new poppler, and another for gcc-4.7.x Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
diff -Naur gnome-commander-20120801_2f83e80.orig/configure.in gnome-commander-20120801_2f83e80/configure.in
|
|
--- gnome-commander-20120801_2f83e80.orig/configure.in 2012-08-01 21:05:40.000000000 +0200
|
|
+++ gnome-commander-20120801_2f83e80/configure.in 2012-09-28 20:30:08.952474818 +0200
|
|
@@ -259,6 +259,9 @@
|
|
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])
|
|
diff -Naur gnome-commander-20120801_2f83e80.orig/src/tags/gnome-cmd-tags-poppler.cc gnome-commander-20120801_2f83e80/src/tags/gnome-cmd-tags-poppler.cc
|
|
--- gnome-commander-20120801_2f83e80.orig/src/tags/gnome-cmd-tags-poppler.cc 2012-08-01 21:05:40.000000000 +0200
|
|
+++ gnome-commander-20120801_2f83e80/src/tags/gnome-cmd-tags-poppler.cc 2012-09-28 20:32:21.602458163 +0200
|
|
@@ -41,7 +41,11 @@
|
|
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 +56,12 @@
|
|
#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
|
|
}
|
|
|
|
|