texlive[47042] Build/source/libs/poppler: improve the patch for

[commits+kakuto at tug.org]

Revision: 47042
          http://tug.org/svn/texlive?view=revision&revision=47042
Author:   kakuto
Date:     2018-03-20 22:34:40 +0100 (Tue, 20 Mar 2018)
Log Message:
-----------
improve the patch for windows, thanks to Luigi

Modified Paths:
--------------
    trunk/Build/source/libs/poppler/TLpatches/patch-05-w32
    trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc

Modified: trunk/Build/source/libs/poppler/TLpatches/patch-05-w32
===================================================================
--- trunk/Build/source/libs/poppler/TLpatches/patch-05-w32	2018-03-20 21:02:43 UTC (rev 47041)
+++ trunk/Build/source/libs/poppler/TLpatches/patch-05-w32	2018-03-20 21:34:40 UTC (rev 47042)
@@ -1,19 +1,18 @@
 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 05:50:42 2018
-@@ -65,6 +65,7 @@
- #define PATH_MAX 1024
- #endif
++++ poppler-src/goo/gfile.cc	Wed Mar 21 06:24:52 2018
+@@ -80,7 +80,14 @@
+ struct StatMtim
+ {
+   static const struct timespec& value(const Stat& stbuf) {
++#if defined(_WIN32)
++    static struct timespec t_spec;
++    t_spec.tv_sec=stbuf.st_mtime;
++    t_spec.tv_nsec=0;
++    return t_spec;
++#else
+     return stbuf.st_mtim;
++#endif
+   }
+ };
  
-+#if !defined(_WIN32)
- namespace {
- 
- template< typename... >
-@@ -99,6 +100,7 @@
- 
- }
- 
-+#endif /* !_WIN32 */
- //------------------------------------------------------------------------
- 
- 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-20 21:02:43 UTC (rev 47041)
+++ trunk/Build/source/libs/poppler/poppler-src/goo/gfile.cc	2018-03-20 21:34:40 UTC (rev 47042)
@@ -65,7 +65,6 @@
 #define PATH_MAX 1024
 #endif
 
-#if !defined(_WIN32)
 namespace {
 
 template< typename... >
@@ -81,7 +80,14 @@
 struct StatMtim
 {
   static const struct timespec& value(const Stat& stbuf) {
+#if defined(_WIN32)
+    static struct timespec t_spec;
+    t_spec.tv_sec=stbuf.st_mtime;
+    t_spec.tv_nsec=0;
+    return t_spec;
+#else
     return stbuf.st_mtim;
+#endif
   }
 };
 
@@ -100,7 +106,6 @@
 
 }
 
-#endif /* !_WIN32 */
 //------------------------------------------------------------------------
 
 GooString *getCurrentDir() {