texlive[47129] Build/source/libs/poppler: better patch for __NetBSD__

[commits+lscarso at tug.org]

Revision: 47129
          http://tug.org/svn/texlive?view=revision&revision=47129
Author:   lscarso
Date:     2018-03-26 11:45:17 +0200 (Mon, 26 Mar 2018)
Log Message:
-----------
better patch for __NetBSD__ (thanks to Marc Baudoin)

Modified Paths:
--------------
    trunk/Build/source/libs/poppler/TLpatches/patch-03-time
    trunk/Build/source/libs/poppler/poppler-src/goo/gfile.h

Modified: trunk/Build/source/libs/poppler/TLpatches/patch-03-time
===================================================================
--- trunk/Build/source/libs/poppler/TLpatches/patch-03-time	2018-03-26 09:35:06 UTC (rev 47128)
+++ trunk/Build/source/libs/poppler/TLpatches/patch-03-time	2018-03-26 09:45:17 UTC (rev 47129)
@@ -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)

Modified: trunk/Build/source/libs/poppler/poppler-src/goo/gfile.h
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/goo/gfile.h	2018-03-26 09:35:06 UTC (rev 47128)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/gfile.h	2018-03-26 09:45:17 UTC (rev 47129)
@@ -51,9 +51,10 @@
 #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)