diff options
| author | dholland <dholland> | 2012-12-23 03:23:48 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2012-12-23 03:23:48 +0000 |
| commit | ae782632a9bbf9d1f9a81e99adcc9e466705ad38 (patch) | |
| tree | 414b1f5f9dc37c335caffdbdafbd67797df4ed41 /sysutils/gnome-commander | |
| parent | 679b32b33168c9fbadaf2d5723b33442708a6834 (diff) | |
| download | pkgsrc-ae782632a9bbf9d1f9a81e99adcc9e466705ad38.tar.gz | |
Apply patch from Noud de Brouwer in PR 47096 to fix build with current
poppler.
Diffstat (limited to 'sysutils/gnome-commander')
| -rw-r--r-- | sysutils/gnome-commander/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/gnome-commander/patches/patch-src_tags_gnome-cmd-tags-poppler.cc | 24 |
2 files changed, 27 insertions, 2 deletions
diff --git a/sysutils/gnome-commander/distinfo b/sysutils/gnome-commander/distinfo index 45270e60f9f..291720d9e56 100644 --- a/sysutils/gnome-commander/distinfo +++ b/sysutils/gnome-commander/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.14 2012/12/22 20:03:47 joerg Exp $ +$NetBSD: distinfo,v 1.15 2012/12/23 03:23:48 dholland Exp $ SHA1 (gnome-commander-1.2.8.15.tar.xz) = b70521c7487fa3dea5e7f8a444c6207441317a17 RMD160 (gnome-commander-1.2.8.15.tar.xz) = 1a2710608da6b25ec27c6c1d719d5692c029507e Size (gnome-commander-1.2.8.15.tar.xz) = 3637808 bytes SHA1 (patch-aa) = bdc924914e80b2dd9844f2c77555131fa299c351 -SHA1 (patch-src_dict.h) = 1dc8e8e0261c911bcaa8cde788d441d33057e269 +SHA1 (patch-src_dict.h) = 49cf4e3e79c5e5505abe50efcf4d781e9aee9a46 +SHA1 (patch-src_tags_gnome-cmd-tags-poppler.cc) = ca80c8b449859821a002c1050bd42d73b1587cdf diff --git a/sysutils/gnome-commander/patches/patch-src_tags_gnome-cmd-tags-poppler.cc b/sysutils/gnome-commander/patches/patch-src_tags_gnome-cmd-tags-poppler.cc new file mode 100644 index 00000000000..e7f921e2c88 --- /dev/null +++ b/sysutils/gnome-commander/patches/patch-src_tags_gnome-cmd-tags-poppler.cc @@ -0,0 +1,24 @@ +$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 + } + |