texlive[47061] Build/source: aligned gfile.cc with the current

[commits+lscarso at tug.org]

Revision: 47061
          http://tug.org/svn/texlive?view=revision&revision=47061
Author:   lscarso
Date:     2018-03-21 14:07:01 +0100 (Wed, 21 Mar 2018)
Log Message:
-----------
aligned gfile.cc with the current poppler (committ 46543272dbe7655821e1c794ca3cc22e8cb4cef9)

Modified Paths:
--------------
    trunk/Build/source/libs/poppler/TLpatches/patch-05-w32
    trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc
    trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h

Modified: trunk/Build/source/libs/poppler/TLpatches/patch-05-w32
===================================================================
--- trunk/Build/source/libs/poppler/TLpatches/patch-05-w32	2018-03-21 10:26:49 UTC (rev 47060)
+++ trunk/Build/source/libs/poppler/TLpatches/patch-05-w32	2018-03-21 13:07:01 UTC (rev 47061)
@@ -1,18 +1,22 @@
-diff -ur poppler-0.63.0/goo/gfile.cc poppler-src/goo/gfile.cc
---- poppler-0.63.0/goo/gfile.cc	Mon Mar 19 03:23:49 2018
-+++ poppler-src/goo/gfile.cc	Wed Mar 21 06:47:42 2018
-@@ -80,7 +80,14 @@
- struct StatMtim
- {
-   static const struct timespec& value(const Stat& stbuf) {
-+#ifdef  HAVE_STRUCT_STAT_ST_MTIM
-     return stbuf.st_mtim;
-+#else
-+    static struct timespec t ;
-+    t.tv_sec=stbuf.st_mtime;
-+    t.tv_nsec=0;
-+    return t;
+$ diff -u gfile.cc.orig gfile.cc 
+--- gfile.cc.orig	2018-03-21 13:21:12.635648536 +0100
++++ gfile.cc	2018-03-21 12:16:05.000000000 +0100
+@@ -65,6 +65,8 @@
+ #define PATH_MAX 1024
+ #endif
+ 
++#ifndef _WIN32
++
+ namespace {
+ 
+ template< typename... >
+@@ -99,6 +101,8 @@
+ 
+ }
+ 
 +#endif
-   }
- };
++
+ //------------------------------------------------------------------------
  
+ GooString *getCurrentDir() {
+

Modified: trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc
===================================================================
--- trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc	2018-03-21 10:26:49 UTC (rev 47060)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc	2018-03-21 13:07:01 UTC (rev 47061)
@@ -65,6 +65,8 @@
 #define PATH_MAX 1024
 #endif
 
+#ifndef _WIN32
+
 namespace {
 
 template< typename... >
@@ -80,14 +82,7 @@
 struct StatMtim
 {
   static const struct timespec& value(const Stat& stbuf) {
-#ifdef  HAVE_STRUCT_STAT_ST_MTIM
     return stbuf.st_mtim;
-#else
-    static struct timespec t ;
-    t.tv_sec=stbuf.st_mtime;
-    t.tv_nsec=0;
-    return t;
-#endif
   }
 };
 
@@ -106,6 +101,8 @@
 
 }
 
+#endif
+
 //------------------------------------------------------------------------
 
 GooString *getCurrentDir() {

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2018-03-21 10:26:49 UTC (rev 47060)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2018-03-21 13:07:01 UTC (rev 47061)
@@ -1 +1 @@
-#define luatex_svn_revision 6667
+#define luatex_svn_revision 6669