Gutenberg: update to 5.2.12

Adapted korlie's patches for the new release. Doesn't build for
x86_gcc2 any more. See build error at: http://sprunge.us/cSjQ

Marking as broken for x86_gcc2.
This commit is contained in:
Humdinger
2017-01-20 20:17:10 +01:00
parent b580b49fea
commit bca353cc61
2 changed files with 208 additions and 0 deletions

View File

@@ -0,0 +1,127 @@
From f9160c2bfdca75bafed242aaa7782f80a7e00693 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Fri, 20 Jan 2017 19:56:14 +0100
Subject: undef PAGESIZE on HAIKU
Update patch by Jerome Duval to new release.
diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
index ca3d25d..fa19adf 100644
--- a/src/testpattern/testpattern.c
+++ b/src/testpattern/testpattern.c
@@ -37,6 +37,9 @@
#include <stdio.h>
#include <math.h>
#include <string.h>
+#ifdef __HAIKU__
+#undef PAGESIZE
+#endif
#include "testpattern.h"
#include <gutenprint/gutenprint-intl.h>
#include <errno.h>
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
index 0c3b20b..d203cac 100644
--- a/src/testpattern/testpatternl.c
+++ b/src/testpattern/testpatternl.c
@@ -20,6 +20,9 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+#undef PAGESIZE
+#endif
/* end standard C headers. */
diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l
index a340ce6..e5e7e42 100644
--- a/src/testpattern/testpatternl.l
+++ b/src/testpattern/testpatternl.l
@@ -28,6 +28,9 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+#undef PAGESIZE
+#endif
#include "testpattern.h"
#pragma GCC diagnostic ignored "-Wredundant-decls"
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
index da90dcc..70173f2 100644
--- a/src/testpattern/testpatterny.c
+++ b/src/testpattern/testpatterny.c
@@ -74,6 +74,9 @@
#include <strings.h>
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+#undef PAGESIZE
+#endif
#include "testpattern.h"
extern int mylineno;
diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y
index 3b89160..fc3b1c0 100644
--- a/src/testpattern/testpatterny.y
+++ b/src/testpattern/testpatterny.y
@@ -29,6 +29,9 @@
#include <strings.h>
#include <stdio.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+#undef PAGESIZE
+#endif
#include "testpattern.h"
extern int mylineno;
--
2.7.0
From 6382c589b05b34566d3ec27cf95df7a93e07f198 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Fri, 20 Jan 2017 19:58:12 +0100
Subject: strings.h fixes
Update patch by Jerome Duval to new release.
diff --git a/src/main/curve.c b/src/main/curve.c
index d552cc7..4c8a594 100644
--- a/src/main/curve.c
+++ b/src/main/curve.c
@@ -31,6 +31,7 @@
#include <ieeefp.h>
#endif
#include <string.h>
+#include <strings.h>
#include <stdlib.h>
#include <limits.h>
#include <unistd.h>
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 5eebc49..c288749 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -23,6 +23,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include <strings.h>
#include <gutenprint/gutenprint.h>
#include "gutenprint-internal.h"
#include <gutenprint/gutenprint-intl-internal.h>
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index 6a4a85f..4ef4a4e 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -33,6 +33,7 @@
#include "gutenprint-internal.h"
#include <time.h>
#include <string.h>
+#include <strings.h>
#include <math.h>
#ifdef HAVE_LIMITS_H
#include <limits.h>
--
2.7.0