From 960abd7150a2302820e08a745d0e8fed3d53c005 Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Mon, 26 Mar 2018 12:23:04 +0000
Subject: [PATCH] (tags/1.07.0) better patch for __NetBSD__ (thanks to Marc
Baudoin)
---
source/libs/poppler/TLpatches/patch-03-time | 13 +++++++------
source/libs/poppler/poppler-src/goo/gfile.h | 5 +++--
source/texk/web2c/luatexdir/luatex_svnversion.h | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/source/libs/poppler/TLpatches/patch-03-time b/source/libs/poppler/TLpatches/patch-03-time
index 2246093f6..1b9339d1a 100644
--- a/source/libs/poppler/TLpatches/patch-03-time
+++ b/source/libs/poppler/TLpatches/patch-03-time
@@ -1,12 +1,13 @@
$ diff -u gfile.h.orig gfile.h
---- gfile.h.orig 2018-03-22 15:08:01.913911597 +0100
-+++ gfile.h 2018-03-22 15:00:59.106829862 +0100
-@@ -51,6 +51,8 @@
- #elif defined(ACORN)
+--- gfile.h.orig 2018-03-26 11:43:40.479917632 +0200
++++ gfile.h 2018-03-26 11:41:51.965590455 +0200
+@@ -52,6 +52,9 @@
#elif defined(MACOS)
# include <ctime.h>
-+#elif defined(__NetBSD__)
-+#include <time.h>
#else
++# if defined(__NetBSD__)
++# include <time.h>
++# endif
# include <unistd.h>
# include <sys/types.h>
+ # if defined(VMS)
diff --git a/source/libs/poppler/poppler-src/goo/gfile.h b/source/libs/poppler/poppler-src/goo/gfile.h
index b3117236e..e02de7208 100644
--- a/source/libs/poppler/poppler-src/goo/gfile.h
+++ b/source/libs/poppler/poppler-src/goo/gfile.h
@@ -51,9 +51,10 @@ extern "C" {
#elif defined(ACORN)
#elif defined(MACOS)
# include <ctime.h>
-#elif defined(__NetBSD__)
-#include <time.h>
#else
+# if defined(__NetBSD__)
+# include <time.h>
+# endif
# include <unistd.h>
# include <sys/types.h>
# if defined(VMS)
diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
index 57e51c382..151b8f063 100644
--- a/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 6675
+#define luatex_svn_revision 6678
--
GitLab