diff options
| author | obache <obache@pkgsrc.org> | 2010-07-15 12:24:19 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-07-15 12:24:19 +0000 |
| commit | 6b80e927ea7718dee0c536c632a39d69e24a1441 (patch) | |
| tree | 1562c1e7b4be3426084e12116a8d11d123234304 /print/poppler | |
| parent | 874e4a44ef0729453687f57c8e6395e2e209ffbd (diff) | |
| download | pkgsrc-6b80e927ea7718dee0c536c632a39d69e24a1441.tar.gz | |
Need to include sys/param.h. noticed by tnn@.
Diffstat (limited to 'print/poppler')
| -rw-r--r-- | print/poppler/distinfo | 4 | ||||
| -rw-r--r-- | print/poppler/patches/patch-aq | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 5e03fd6a3b2..78736ac2427 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.57 2010/07/15 09:01:53 obache Exp $ +$NetBSD: distinfo,v 1.58 2010/07/15 12:24:19 obache Exp $ SHA1 (poppler-0.14.1.tar.gz) = 28229f897451feba5682d74defe7d67361eeee11 RMD160 (poppler-0.14.1.tar.gz) = 7b8d084b05ccc374e9add9771b781a88948907a7 @@ -10,4 +10,4 @@ SHA1 (patch-ag) = 7ef9ccdb1a6719510c6941864b8c7db3cc0255f1 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74 SHA1 (patch-ap) = fc985510d4ebabe097e55bc4cbb0477267e95a7d -SHA1 (patch-aq) = da8d845bf07b057bda38aff85e7558fbeded5a8d +SHA1 (patch-aq) = 2a1f413d65147f9c3a64466db8b85ff8f9717954 diff --git a/print/poppler/patches/patch-aq b/print/poppler/patches/patch-aq index 1dd341c527f..fe91d68772e 100644 --- a/print/poppler/patches/patch-aq +++ b/print/poppler/patches/patch-aq @@ -1,15 +1,18 @@ -$NetBSD: patch-aq,v 1.2 2010/07/15 09:01:53 obache Exp $ +$NetBSD: patch-aq,v 1.3 2010/07/15 12:24:19 obache Exp $ --- poppler/TextOutputDev.cc.orig 2010-06-08 20:06:31.000000000 +0000 +++ poppler/TextOutputDev.cc -@@ -63,6 +63,11 @@ +@@ -63,6 +63,14 @@ #include "ICSupport.h" #endif ++#if defined(__DragonFly__) || defined(__NetBSD__) ++#include <sys/param.h> +#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && __NetBSD_Version__ >= 599002100) +static double fmax(double x, double y) { if (isnan(x)) return y; if (isnan(y)) return x; return (x > y ? x : y);} +static double fmin(double x, double y) { if (isnan(x)) return y; if (isnan(y)) return x; return (x < y ? x : y);} +#endif ++#endif + //------------------------------------------------------------------------ // parameters |