From 72e024e0f133f4292d766f15d05b849de7632bee Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Sun, 1 Apr 2018 06:51:58 +0000
Subject: [PATCH] (trunks) Sync with TeX Live revision 47220.
---
source/libs/poppler/TLpatches/ChangeLog | 5 ++
source/libs/poppler/TLpatches/patch-03-time | 62 ++++++++++++++++---
source/libs/poppler/poppler-src/goo/gfile.cc | 5 +-
source/libs/poppler/poppler-src/goo/gfile.h | 6 +-
.../web2c/luatexdir/luasocket/src/usocket.h | 4 ++
.../texk/web2c/luatexdir/luatex_svnversion.h | 2 +-
6 files changed, 64 insertions(+), 20 deletions(-)
diff --git a/source/libs/poppler/TLpatches/ChangeLog b/source/libs/poppler/TLpatches/ChangeLog
index 0dc44506f..07ce34b73 100644
--- a/source/libs/poppler/TLpatches/ChangeLog
+++ b/source/libs/poppler/TLpatches/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-01 Mojca Miklavec <mojca.miklavec.lists@gmail.com>
+
+ * patch-03-time: Adapted.
+ * patch-04-ctime: Removed.
+
2018-03-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* patch-05-w32: Added to compile gfile.cc on Windows.
diff --git a/source/libs/poppler/TLpatches/patch-03-time b/source/libs/poppler/TLpatches/patch-03-time
index 1b9339d1a..ba6835a05 100644
--- a/source/libs/poppler/TLpatches/patch-03-time
+++ b/source/libs/poppler/TLpatches/patch-03-time
@@ -1,13 +1,55 @@
-$ diff -u gfile.h.orig gfile.h
---- 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>
+https://bugs.freedesktop.org/show_bug.cgi?id=105766
+
+diff -ur poppler-0.63.0/goo/gfile.cc poppler-src/goo/gfile.cc
+--- poppler-0.63.0/goo/gfile.cc
++++ poppler-src/goo/gfile.cc
+@@ -34,9 +34,7 @@
+
+ #include <config.h>
+
+-#ifdef _WIN32
+-# include <time.h>
+-#else
++#ifndef _WIN32
+ # if defined(MACOS)
+ # include <sys/stat.h>
+ # elif !defined(ACORN)
+@@ -44,7 +42,6 @@
+ # include <sys/stat.h>
+ # include <fcntl.h>
+ # endif
+-# include <time.h>
+ # include <limits.h>
+ # include <string.h>
+ # if !defined(VMS) && !defined(ACORN) && !defined(MACOS)
+diff -ur poppler-0.63.0/goo/gfile.h poppler-src/goo/gfile.h
+--- poppler-0.63.0/goo/gfile.h
++++ poppler-src/goo/gfile.h
+@@ -37,6 +37,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <time.h>
+ extern "C" {
+ #if defined(_WIN32)
+ # include <sys/stat.h>
+@@ -49,8 +50,6 @@
+ # include <windows.h>
+ # endif
+ #elif defined(ACORN)
+-#elif defined(MACOS)
+-# include <ctime.h>
#else
-+# if defined(__NetBSD__)
-+# include <time.h>
-+# endif
# include <unistd.h>
# include <sys/types.h>
- # if defined(VMS)
+diff -ur poppler-0.63.0/poppler/Form.h poppler-src/poppler/Form.h
+--- poppler-0.63.0/poppler/Form.h
++++ poppler-src/poppler/Form.h
+@@ -33,6 +33,7 @@
+
+ #include <set>
+ #include <vector>
++#include <ctime>
+
+ class GooString;
+ class Array;
diff --git a/source/libs/poppler/poppler-src/goo/gfile.cc b/source/libs/poppler/poppler-src/goo/gfile.cc
index 06014b3e5..0c425319b 100644
--- a/source/libs/poppler/poppler-src/goo/gfile.cc
+++ b/source/libs/poppler/poppler-src/goo/gfile.cc
@@ -34,9 +34,7 @@
#include <config.h>
-#ifdef _WIN32
-# include <time.h>
-#else
+#ifndef _WIN32
# if defined(MACOS)
# include <sys/stat.h>
# elif !defined(ACORN)
@@ -44,7 +42,6 @@
# include <sys/stat.h>
# include <fcntl.h>
# endif
-# include <time.h>
# include <limits.h>
# include <string.h>
# if !defined(VMS) && !defined(ACORN) && !defined(MACOS)
diff --git a/source/libs/poppler/poppler-src/goo/gfile.h b/source/libs/poppler/poppler-src/goo/gfile.h
index e02de7208..436947b27 100644
--- a/source/libs/poppler/poppler-src/goo/gfile.h
+++ b/source/libs/poppler/poppler-src/goo/gfile.h
@@ -37,6 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
+#include <time.h>
extern "C" {
#if defined(_WIN32)
# include <sys/stat.h>
@@ -49,12 +50,7 @@ extern "C" {
# include <windows.h>
# endif
#elif defined(ACORN)
-#elif defined(MACOS)
-# include <ctime.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/luasocket/src/usocket.h b/source/texk/web2c/luatexdir/luasocket/src/usocket.h
index 45f2f99f7..fccf35031 100644
--- a/source/texk/web2c/luatexdir/luasocket/src/usocket.h
+++ b/source/texk/web2c/luatexdir/luasocket/src/usocket.h
@@ -50,6 +50,10 @@
#endif /* IPV6_LEAVE_GROUP */
#endif /* !IPV6_DROP_MEMBERSHIP */
+#ifndef AI_NUMERICSERV
+#define AI_NUMERICSERV 0
+#endif
+
typedef int t_socket;
typedef t_socket *p_socket;
typedef struct sockaddr_storage t_sockaddr_storage;
diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
index c862e696a..770aabbeb 100644
--- a/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 6680
+#define luatex_svn_revision 6686
--
GitLab