From aeaf0341853a573588be2ada1949278159377a3d Mon Sep 17 00:00:00 2001 From: Mojca Miklavec Date: Sun, 1 Apr 2018 00:40:06 +0000 Subject: poppler-src/goo/gfile: Adapt patches for time.h The patch for missing time.h only worked for NetBSD, but the same problem is present on other platforms like OpenBSD. Sanitize the patch and merge with another one. https://bugs.freedesktop.org/show_bug.cgi?id=105766 git-svn-id: svn://tug.org/texlive/trunk@47209 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/poppler/TLpatches/ChangeLog | 5 ++ Build/source/libs/poppler/TLpatches/patch-03-time | 62 ++++++++++++++++++---- Build/source/libs/poppler/TLpatches/patch-04-ctime | 14 ----- Build/source/libs/poppler/poppler-src/goo/gfile.cc | 5 +- Build/source/libs/poppler/poppler-src/goo/gfile.h | 6 +-- 5 files changed, 59 insertions(+), 33 deletions(-) delete mode 100644 Build/source/libs/poppler/TLpatches/patch-04-ctime (limited to 'Build') diff --git a/Build/source/libs/poppler/TLpatches/ChangeLog b/Build/source/libs/poppler/TLpatches/ChangeLog index 0dc44506fc2..07ce34b738b 100644 --- a/Build/source/libs/poppler/TLpatches/ChangeLog +++ b/Build/source/libs/poppler/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2018-04-01 Mojca Miklavec + + * patch-03-time: Adapted. + * patch-04-ctime: Removed. + 2018-03-20 Akira Kakuto * patch-05-w32: Added to compile gfile.cc on Windows. diff --git a/Build/source/libs/poppler/TLpatches/patch-03-time b/Build/source/libs/poppler/TLpatches/patch-03-time index 1b9339d1a3d..ba6835a0587 100644 --- a/Build/source/libs/poppler/TLpatches/patch-03-time +++ b/Build/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 +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 + +-#ifdef _WIN32 +-# include +-#else ++#ifndef _WIN32 + # if defined(MACOS) + # include + # elif !defined(ACORN) +@@ -44,7 +42,6 @@ + # include + # include + # endif +-# include + # include + # include + # 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 + #include + #include ++#include + extern "C" { + #if defined(_WIN32) + # include +@@ -49,8 +50,6 @@ + # include + # endif + #elif defined(ACORN) +-#elif defined(MACOS) +-# include #else -+# if defined(__NetBSD__) -+# include -+# endif # include # include - # 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 + #include ++#include + + class GooString; + class Array; diff --git a/Build/source/libs/poppler/TLpatches/patch-04-ctime b/Build/source/libs/poppler/TLpatches/patch-04-ctime deleted file mode 100644 index 3c4a349569f..00000000000 --- a/Build/source/libs/poppler/TLpatches/patch-04-ctime +++ /dev/null @@ -1,14 +0,0 @@ - To make time_t work on FreeBSD 11.1, per Mojca. - http://tug.org/pipermail/tlbuild/2018q1/003931.html - -diff -ur poppler-0.63.0/poppler/Form.h poppler-src/poppler/Form.h ---- poppler-0.63.0/poppler/Form.h Mon Mar 19 03:23:49 2018 -+++ poppler-src/poppler/Form.h Mon Mar 19 06:18:51 2018 -@@ -33,6 +33,7 @@ - - #include - #include -+#include - - class GooString; - class Array; diff --git a/Build/source/libs/poppler/poppler-src/goo/gfile.cc b/Build/source/libs/poppler/poppler-src/goo/gfile.cc index 06014b3e5a8..0c425319b6f 100644 --- a/Build/source/libs/poppler/poppler-src/goo/gfile.cc +++ b/Build/source/libs/poppler/poppler-src/goo/gfile.cc @@ -34,9 +34,7 @@ #include -#ifdef _WIN32 -# include -#else +#ifndef _WIN32 # if defined(MACOS) # include # elif !defined(ACORN) @@ -44,7 +42,6 @@ # include # include # endif -# include # include # include # if !defined(VMS) && !defined(ACORN) && !defined(MACOS) diff --git a/Build/source/libs/poppler/poppler-src/goo/gfile.h b/Build/source/libs/poppler/poppler-src/goo/gfile.h index e02de720808..436947b273f 100644 --- a/Build/source/libs/poppler/poppler-src/goo/gfile.h +++ b/Build/source/libs/poppler/poppler-src/goo/gfile.h @@ -37,6 +37,7 @@ #include #include #include +#include extern "C" { #if defined(_WIN32) # include @@ -49,12 +50,7 @@ extern "C" { # include # endif #elif defined(ACORN) -#elif defined(MACOS) -# include #else -# if defined(__NetBSD__) -# include -# endif # include # include # if defined(VMS) -- cgit v1.2.3