diff options
| author | maya <maya@pkgsrc.org> | 2018-12-31 06:18:20 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2018-12-31 06:18:20 +0000 |
| commit | 0e0fc29e5f29fdc449a99f6c6f386f12c0a54af8 (patch) | |
| tree | 2dc0542c396cc6a97fcd6cbdfd5eafa03a76a8a0 /print | |
| parent | 656fc43df9b830a3c3e160981d1709e91a520e73 (diff) | |
| download | pkgsrc-0e0fc29e5f29fdc449a99f6c6f386f12c0a54af8.tar.gz | |
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.
Diffstat (limited to 'print')
| -rw-r--r-- | print/poppler/distinfo | 3 | ||||
| -rw-r--r-- | print/poppler/patches/patch-aq | 21 |
2 files changed, 1 insertions, 23 deletions
diff --git a/print/poppler/distinfo b/print/poppler/distinfo index d86e559298f..20db145c2e6 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.133 2018/12/10 10:28:08 wiz Exp $ +$NetBSD: distinfo,v 1.134 2018/12/31 06:18:20 maya Exp $ SHA1 (poppler-0.72.0.tar.xz) = 34d3035eef26bf54cf847925a5b69bd0bf75c672 RMD160 (poppler-0.72.0.tar.xz) = 73d6f98c1248a517db9b6244bd2cbdc89c67f5b5 SHA512 (poppler-0.72.0.tar.xz) = 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145 Size (poppler-0.72.0.tar.xz) = 1492912 bytes -SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa SHA1 (patch-poppler_CMap.cc) = d37745ea4cbeae76ad43c4ac74e942531f7b7dd8 diff --git a/print/poppler/patches/patch-aq b/print/poppler/patches/patch-aq deleted file mode 100644 index 02f6b8149f8..00000000000 --- a/print/poppler/patches/patch-aq +++ /dev/null @@ -1,21 +0,0 @@ -$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 <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);} -+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 - //------------------------------------------------------------------------ |