From 9cc1acc237d09b2406fd70244d9345ce33be6c66 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Thu, 15 Jul 2010 04:33:49 +0000
Subject: Add workaround for lack of fmax/fmin on NetBSD<6.

---
 print/poppler/distinfo         |  3 ++-
 print/poppler/patches/patch-aq | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 print/poppler/patches/patch-aq

(limited to 'print')

diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 4a301e19d0a..cf5bc9e757b 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2010/07/14 17:04:22 drochner Exp $
+$NetBSD: distinfo,v 1.56 2010/07/15 04:33:49 obache Exp $
 
 SHA1 (poppler-0.14.1.tar.gz) = 28229f897451feba5682d74defe7d67361eeee11
 RMD160 (poppler-0.14.1.tar.gz) = 7b8d084b05ccc374e9add9771b781a88948907a7
@@ -10,3 +10,4 @@ SHA1 (patch-ag) = 7ef9ccdb1a6719510c6941864b8c7db3cc0255f1
 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53
 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74
 SHA1 (patch-ap) = fc985510d4ebabe097e55bc4cbb0477267e95a7d
+SHA1 (patch-aq) = e5dd7a45a2775c62b02d5d5b2fbf03a1f029fa8d
diff --git a/print/poppler/patches/patch-aq b/print/poppler/patches/patch-aq
new file mode 100644
index 00000000000..d94476665ae
--- /dev/null
+++ b/print/poppler/patches/patch-aq
@@ -0,0 +1,16 @@
+$NetBSD: patch-aq,v 1.1 2010/07/15 04:33:49 obache Exp $
+
+--- poppler/TextOutputDev.cc.orig	2010-06-08 20:06:31.000000000 +0000
++++ poppler/TextOutputDev.cc
+@@ -63,6 +63,11 @@
+ #include "ICSupport.h"
+ #endif
+ 
++#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
++
+ //------------------------------------------------------------------------
+ // parameters
+ //------------------------------------------------------------------------
-- 
cgit v1.2.3