print/poppler

This commit is contained in:
Lionel Sambuc 2015-10-26 16:13:32 +00:00 committed by Lionel Sambuc
parent 5bf3ad8da8
commit 13d2a76466
3 changed files with 29 additions and 0 deletions

View File

@ -10,3 +10,5 @@ SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa
SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3
SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739
SHA1 (patch-qt5_src_Makefile.in) = 8bd1456b2cfc61ea25bbc1ae6fa10e2c9c482828
SHA1 (patch-zz-minix-a) = 9253493849a4edb65bdea71dd750c90440ff69a5
SHA1 (patch-zz-minix-b) = 8ad006b6ff4b932c352cc131b8508df44bf53ffb

View File

@ -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 <sys/param.h>
-#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

View File

@ -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 <vector>
+#if defined(__minix)
+#undef read
+#endif
+
//------------------------------------------------------------------------
#define CachedFileChunkSize 8192 // This should be a multiple of cachedStreamBufSize