head 1.8; access; symbols pkgsrc-2018Q4:1.7.0.38 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.36 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.34 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.32 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.30 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.28 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.24 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.22 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.20 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.18 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.16 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.14 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.12 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.10 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.8 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.6 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.4 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.2 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.6.0.6 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.4 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.2 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.5.0.18 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.16 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.14 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.12 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.10 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.8 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.6 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.2 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.4.0.8 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.6 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.4 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.2 pkgsrc-2010Q3-base:1.4; locks; strict; comment @# @; 1.8 date 2018.12.31.06.18.20; author maya; state dead; branches; next 1.7; commitid iWXTINUxNjQAQU5B; 1.7 date 2014.07.22.12.13.28; author wiz; state Exp; branches; next 1.6; commitid hH8720UwM7i5ZmJx; 1.6 date 2013.12.29.22.29.35; author bsiegert; state Exp; branches; next 1.5; commitid viI3OszYMlqZY4jx; 1.5 date 2011.09.20.19.11.54; author bsiegert; state Exp; branches; next 1.4; 1.4 date 2010.07.17.19.29.25; author tron; state Exp; branches; next 1.3; 1.3 date 2010.07.15.12.24.19; author obache; state Exp; branches; next 1.2; 1.2 date 2010.07.15.09.01.53; author obache; state Exp; branches; next 1.1; 1.1 date 2010.07.15.04.33.49; author obache; state Exp; branches; next ; desc @@ 1.8 log @poppler: remove workaround for old netbsd and dragonflybsd. With C++14 being required to build this, you have to have most of C99 to build this package. So not having fmax/fmin isn't possible. @ text @$NetBSD: patch-aq,v 1.7 2014/07/22 12:13:28 wiz Exp $ Add workaround for lack of fmax/fmin on NetBSD<6 and DragonFly before 200204. --- poppler/TextOutputDev.cc.orig Mon Jan 24 19:06:00 2011 +++ poppler/TextOutputDev.cc @@@@ -64,6 +64,14 @@@@ #include "ICSupport.h" #endif +#if defined(__DragonFly__) || defined(__NetBSD__) +#include +#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);} +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 //------------------------------------------------------------------------ @ 1.7 log @Update to 0.26.2: Release 0.26.2 core: * Make sure we have an xref before using. KDE Bug #335413 build system: * autoconf: Fix typo in configure.ac utils: * pdftohtml: exit with 0 with -v and -h @ text @d1 1 a1 1 $NetBSD: patch-aq,v 1.6 2013/12/29 22:29:35 bsiegert Exp $ @ 1.6 log @Remove obsolete MirBSD workaround, fix build. @ text @d1 3 a3 1 $NetBSD: patch-aq,v 1.5 2011/09/20 19:11:54 bsiegert Exp $ @ 1.5 log @MirBSD does not have fmin and fmax either, adapt patch-aq accordingly. @ text @d1 1 a1 1 $NetBSD$ d9 1 a9 1 +#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__MirBSD__) @ 1.4 log @Improve horrible version check to unbreak build under NetBSD 5.1* which provides both fmin(3) and fmax(3). The build is still broke under NetBSD 5.0_STABLE built from sources after 2010-03-12. A possible fix for this case is to upgrade to NetBSD 5.1*. @ text @d1 1 a1 1 $NetBSD: patch-aq,v 1.3 2010/07/15 12:24:19 obache Exp $ d3 1 a3 1 --- poppler/TextOutputDev.cc.orig 2010-06-08 20:06:31.000000000 +0000 d5 1 a5 1 @@@@ -63,6 +63,14 @@@@ d9 1 a9 1 +#if defined(__DragonFly__) || defined(__NetBSD__) @ 1.3 log @Need to include sys/param.h. noticed by tnn@@. @ text @d1 1 a1 1 $NetBSD: patch-aq,v 1.2 2010/07/15 09:01:53 obache Exp $ d11 1 a11 1 +#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && __NetBSD_Version__ >= 599002100) @ 1.2 log @Fixes macro names for NetBSD. noticed by wiz@@. @ text @d1 1 a1 1 $NetBSD: patch-aq,v 1.1 2010/07/15 04:33:49 obache Exp $ d5 1 a5 1 @@@@ -63,6 +63,11 @@@@ d9 2 d15 1 @ 1.1 log @Add workaround for lack of fmax/fmin on NetBSD<6. @ text @d1 1 a1 1 $NetBSD$ d9 1 a9 1 +#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD) && __NetBSD_Version >= 599002100) @