diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2011-09-20 19:11:54 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2011-09-20 19:11:54 +0000 |
| commit | f0ac01ade6330e65efe9a583f95aba50c298dc40 (patch) | |
| tree | ac0c5497c8ddfb0cf06955a51696f168eb38a273 /print | |
| parent | d2332acb004a22924b74a4290f6795667e741cfe (diff) | |
| download | pkgsrc-f0ac01ade6330e65efe9a583f95aba50c298dc40.tar.gz | |
MirBSD does not have fmin and fmax either, adapt patch-aq accordingly.
Diffstat (limited to 'print')
| -rw-r--r-- | print/poppler/distinfo | 4 | ||||
| -rw-r--r-- | print/poppler/patches/patch-aq | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 6d06b45d466..9f7718f965a 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.69 2011/07/11 10:05:22 drochner Exp $ +$NetBSD: distinfo,v 1.70 2011/09/20 19:11:54 bsiegert Exp $ SHA1 (poppler-0.16.7.tar.gz) = 26c735f863688f62b57d5159863fdad4272be89f RMD160 (poppler-0.16.7.tar.gz) = 279330e6feaf97a207f3396eab1af836d3d1f16c @@ -9,4 +9,4 @@ SHA1 (patch-ac) = c343775da48a1d86dea1451b74355d117e30f6c5 SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74 -SHA1 (patch-aq) = 01e115ca868e0bbd398bade92485d83edbe98d66 +SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63 diff --git a/print/poppler/patches/patch-aq b/print/poppler/patches/patch-aq index 97f7152add8..3ab13015b4d 100644 --- a/print/poppler/patches/patch-aq +++ b/print/poppler/patches/patch-aq @@ -1,12 +1,12 @@ -$NetBSD: patch-aq,v 1.4 2010/07/17 19:29:25 tron Exp $ +$NetBSD: patch-aq,v 1.5 2011/09/20 19:11:54 bsiegert Exp $ ---- poppler/TextOutputDev.cc.orig 2010-06-08 20:06:31.000000000 +0000 +--- poppler/TextOutputDev.cc.orig Mon Jan 24 19:06:00 2011 +++ poppler/TextOutputDev.cc -@@ -63,6 +63,14 @@ +@@ -64,6 +64,14 @@ #include "ICSupport.h" #endif -+#if defined(__DragonFly__) || defined(__NetBSD__) ++#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__MirBSD__) +#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);} |