diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 7f1121c27..d2391d3de 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -11,3 +11,5 @@ SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3 SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739 SHA1 (patch-qt5_src_Makefile.in) = c3a47fde201d61a7b7674020f5c998173a61b216 +SHA1 (patch-zz-minix-a) = 9253493849a4edb65bdea71dd750c90440ff69a5 +SHA1 (patch-zz-minix-b) = 8ad006b6ff4b932c352cc131b8508df44bf53ffb diff --git a/print/poppler/patches/patch-zz-minix-a b/print/poppler/patches/patch-zz-minix-a new file mode 100644 index 000000000..81d0ae651 --- /dev/null +++ b/print/poppler/patches/patch-zz-minix-a @@ -0,0 +1,14 @@ +--- poppler/TextOutputDev.cc.orig Mon Oct 26 15:58:10 2015 ++++ poppler/TextOutputDev.cc Mon Oct 26 15:58:58 2015 +@@ -76,9 +76,9 @@ + #include "ICSupport.h" + #endif + +-#if defined(__DragonFly__) || defined(__NetBSD__) ++#if defined(__DragonFly__) || defined(__minix) || defined(__NetBSD__) + #include +-#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 501000000 && __NetBSD_Version__ < 599000000))) ++#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !defined(__minix) && !(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 diff --git a/print/poppler/patches/patch-zz-minix-b b/print/poppler/patches/patch-zz-minix-b new file mode 100644 index 000000000..f7fb17da9 --- /dev/null +++ b/print/poppler/patches/patch-zz-minix-b @@ -0,0 +1,13 @@ +--- poppler/CachedFile.h.orig Mon Oct 26 16:09:43 2015 ++++ poppler/CachedFile.h Mon Oct 26 16:10:27 2015 +@@ -23,6 +23,10 @@ + + #include + ++#if defined(__minix) ++#undef read ++#endif ++ + //------------------------------------------------------------------------ + + #define CachedFileChunkSize 8192 // This should be a multiple of cachedStreamBufSize