Sun Dec 23 03:23:48 2012 UTC ()
Apply patch from Noud de Brouwer in PR 47096 to fix build with current
poppler.
(dholland)
diff -r1.14 -r1.15 pkgsrc/sysutils/gnome-commander/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/gnome-commander/patches/patch-src_tags_gnome-cmd-tags-poppler.cc
--- pkgsrc/sysutils/gnome-commander/Attic/distinfo 2012/12/22 20:03:47 1.14
+++ pkgsrc/sysutils/gnome-commander/Attic/distinfo 2012/12/23 03:23:48 1.15
| @@ -1,7 +1,8 @@ | | | @@ -1,7 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.14 2012/12/22 20:03:47 joerg Exp $ | | 1 | $NetBSD: distinfo,v 1.15 2012/12/23 03:23:48 dholland Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (gnome-commander-1.2.8.15.tar.xz) = b70521c7487fa3dea5e7f8a444c6207441317a17 | | 3 | SHA1 (gnome-commander-1.2.8.15.tar.xz) = b70521c7487fa3dea5e7f8a444c6207441317a17 |
| 4 | RMD160 (gnome-commander-1.2.8.15.tar.xz) = 1a2710608da6b25ec27c6c1d719d5692c029507e | | 4 | RMD160 (gnome-commander-1.2.8.15.tar.xz) = 1a2710608da6b25ec27c6c1d719d5692c029507e |
| 5 | Size (gnome-commander-1.2.8.15.tar.xz) = 3637808 bytes | | 5 | Size (gnome-commander-1.2.8.15.tar.xz) = 3637808 bytes |
| 6 | SHA1 (patch-aa) = bdc924914e80b2dd9844f2c77555131fa299c351 | | 6 | SHA1 (patch-aa) = bdc924914e80b2dd9844f2c77555131fa299c351 |
| 7 | SHA1 (patch-src_dict.h) = 1dc8e8e0261c911bcaa8cde788d441d33057e269 | | 7 | SHA1 (patch-src_dict.h) = 49cf4e3e79c5e5505abe50efcf4d781e9aee9a46 |
| | | 8 | SHA1 (patch-src_tags_gnome-cmd-tags-poppler.cc) = ca80c8b449859821a002c1050bd42d73b1587cdf |
$NetBSD: patch-src_tags_gnome-cmd-tags-poppler.cc,v 1.1 2012/12/23 03:23:48 dholland Exp $
Fix build with recent poppler. From Noud de Brouwer in PR 47096.
--- src/tags/gnome-cmd-tags-poppler.cc~ 2011-12-06 19:10:29.000000000 +0000
+++ src/tags/gnome-cmd-tags-poppler.cc
@@ -41,7 +41,7 @@ using namespace std;
static regex_t rxDate;
static gboolean rxDate_OK;
-static void noErrorReporting(int pos, char *msg, va_list args)
+static void noErrorReporting(void *, ErrorCategory, int pos, char *msg)
{
}
#endif
@@ -52,7 +52,7 @@ 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;
- setErrorFunction(noErrorReporting);
+ setErrorCallback(noErrorReporting, NULL);
#endif
}