diff options
| author | bsiegert <bsiegert> | 2013-12-29 22:29:35 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2013-12-29 22:29:35 +0000 |
| commit | f8557471050c8c47d15c80ed5b2d675dc29c991e (patch) | |
| tree | 0ec220ba7ea6f25f8b443d60c9b10abdd02c134f /print/poppler | |
| parent | 0827320483da48dc795eeb1055a79f3da4914bd4 (diff) | |
| download | pkgsrc-f8557471050c8c47d15c80ed5b2d675dc29c991e.tar.gz | |
Remove obsolete MirBSD workaround, fix build.
Diffstat (limited to 'print/poppler')
| -rw-r--r-- | print/poppler/distinfo | 4 | ||||
| -rw-r--r-- | print/poppler/patches/patch-aq | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 2350ad9429f..ff9deeae768 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.86 2013/12/06 13:10:59 wiz Exp $ +$NetBSD: distinfo,v 1.87 2013/12/29 22:29:35 bsiegert Exp $ SHA1 (poppler-0.24.4.tar.xz) = 7938c92c61b63331f2af463db0d10048bf0d4712 RMD160 (poppler-0.24.4.tar.xz) = 2a71b7da5562e1ac655c9591812551f3fbfe6fe9 @@ -6,7 +6,7 @@ Size (poppler-0.24.4.tar.xz) = 1511248 bytes SHA1 (patch-aa) = f67de7b11651207d968972e5b27eb017cf59ceb7 SHA1 (patch-ab) = 758c541fa14c82cb44a247cbc37e1582b0167229 SHA1 (patch-ag) = de9ef3e2498d5c07a8f35f1d215e377953a5dad8 -SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63 +SHA1 (patch-aq) = b1e1cd6e234a68ebc352d76dbf89ed4e3cb7b3c0 SHA1 (patch-ar) = f72681a2148ec846a334774339836d468925b20c SHA1 (patch-as) = 9e2329c923c904074495076fd7cc594fced51a0d SHA1 (patch-configure) = a2488314e1da41c94bc78c327795e126515bdde5 diff --git a/print/poppler/patches/patch-aq b/print/poppler/patches/patch-aq index 3ab13015b4d..ecd4b0188cb 100644 --- a/print/poppler/patches/patch-aq +++ b/print/poppler/patches/patch-aq @@ -1,4 +1,4 @@ -$NetBSD: patch-aq,v 1.5 2011/09/20 19:11:54 bsiegert Exp $ +$NetBSD: patch-aq,v 1.6 2013/12/29 22:29:35 bsiegert Exp $ --- poppler/TextOutputDev.cc.orig Mon Jan 24 19:06:00 2011 +++ poppler/TextOutputDev.cc @@ -6,7 +6,7 @@ $NetBSD: patch-aq,v 1.5 2011/09/20 19:11:54 bsiegert Exp $ #include "ICSupport.h" #endif -+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__MirBSD__) ++#if defined(__DragonFly__) || defined(__NetBSD__) +#include <sys/param.h> +#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 501000000 && __NetBSD_Version__ < 599000000))) +static double fmax(double x, double y) { if (isnan(x)) return y; if (isnan(y)) return x; return (x > y ? x : y);} |