[texlive-bin] 02/03: cherrypick upstream fixes
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-bin.
commit a3aa374c8e44a0366609a2706d8849a67529d7cb
Author: Norbert Preining <preining@debian.org>
Date: Mon Oct 31 16:15:45 2016 +0900
cherrypick upstream fixes
---
debian/changelog | 7 ++-
debian/patches/series | 4 ++
.../patches/upstream-svn42380-euptex-initstarttime | 24 +++++++++
.../patches/upstream-svn42381-eptex-initstarttime | 58 ++++++++++++++++++++++
debian/patches/upstream-svn42383-invalid-epoch | 42 ++++++++++++++++
.../upstream-svn42391-invalid-epoch-dvipdfmx | 37 ++++++++++++++
6 files changed, 171 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5092020..a62ffcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
texlive-bin (2016.20160513.41080-8~1) UNRELEASED; urgency=medium
* include jtex in the build
+ * cherrypick several upstream fixes:
+ - svn42380 use initstarttime in euptex
+ - svn42381 use initstarttime in eptex
+ - svn42383 use -1 for invalid epoch (dvips)
+ - svn42391 use -1 for invalid epoch (dvipdfmx)
- -- Norbert Preining <preining@debian.org> Thu, 20 Oct 2016 23:42:40 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 31 Oct 2016 16:15:28 +0900
texlive-bin (2016.20160513.41080-7) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 3e2ac85..b974f7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,7 @@ upstream-svn42041-eptex-fix
upstream-svn42110-tex4ht-xetex-compatibility
upstream-svn42167-mendex-fix
jtex-161020
+upstream-svn42380-euptex-initstarttime
+upstream-svn42381-eptex-initstarttime
+upstream-svn42383-invalid-epoch
+upstream-svn42391-invalid-epoch-dvipdfmx
diff --git a/debian/patches/upstream-svn42380-euptex-initstarttime b/debian/patches/upstream-svn42380-euptex-initstarttime
new file mode 100644
index 0000000..a8338f5
--- /dev/null
+++ b/debian/patches/upstream-svn42380-euptex-initstarttime
@@ -0,0 +1,24 @@
+diff --git a/texk/web2c/euptexdir/ChangeLog b/texk/web2c/euptexdir/ChangeLog
+index fb606a2..6d7a5e2 100644
+--- a/texk/web2c/euptexdir/ChangeLog
++++ b/texk/web2c/euptexdir/ChangeLog
+@@ -1,3 +1,7 @@
++2016-10-30 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
++
++ * euptex.defines: Use initstarttime() to improve CreationDate.
++
+ 2016-02-01 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * euptex.defines: Add a new function setinfileenc() for a new primitive
+diff --git a/texk/web2c/euptexdir/euptex.defines b/Build/source/texk/web2c/euptexdir/euptex.defines
+index 5b11961..7f10e36 100644
+--- a/texk/web2c/euptexdir/euptex.defines
++++ b/texk/web2c/euptexdir/euptex.defines
+@@ -50,6 +50,7 @@
+ @define procedure dumpkanji ();
+ @define procedure undumpkanji ();
+
++@define procedure initstarttime;
+ @define procedure getcreationdate;
+ @define procedure getfilemoddate();
+ @define procedure getfilesize();
diff --git a/debian/patches/upstream-svn42381-eptex-initstarttime b/debian/patches/upstream-svn42381-eptex-initstarttime
new file mode 100644
index 0000000..02b6308
--- /dev/null
+++ b/debian/patches/upstream-svn42381-eptex-initstarttime
@@ -0,0 +1,58 @@
+diff --git a/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
+index 4d46f7a..42374f4 100644
+--- a/texk/web2c/eptexdir/ChangeLog
++++ b/texk/web2c/eptexdir/ChangeLog
+@@ -1,3 +1,8 @@
++2016-10-30 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
++
++ * eptex.defines, eptex.ech, eptex_version.h, pdfutils.ch:
++ Use initstarttime() to improve CreationDate.
++
+ 2016-09-12 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * eptex.ech, pdfutils.ch: Realize better box in math mode.
+diff --git a/texk/web2c/eptexdir/eptex.defines b/Build/source/texk/web2c/eptexdir/eptex.defines
+index 1878238..8af65b6 100644
+--- a/texk/web2c/eptexdir/eptex.defines
++++ b/texk/web2c/eptexdir/eptex.defines
+@@ -39,6 +39,7 @@
+ @define function getintone ();
+ @define procedure setintone ();
+
++@define procedure initstarttime;
+ @define procedure getcreationdate;
+ @define procedure getfilemoddate();
+ @define procedure getfilesize();
+diff --git a/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech
+index 767915e..d0b6489 100644
+--- a/texk/web2c/eptexdir/eptex.ech
++++ b/texk/web2c/eptexdir/eptex.ech
+@@ -19,7 +19,7 @@
+ @y
+ @d eTeX_version_string=='-2.6' {current \eTeX\ version}
+ @#
+-@d epTeX_version_string=='-160201'
++@d epTeX_version_string=='-161030'
+ @z
+
+ @x e-pTeX: banner
+diff --git a/texk/web2c/eptexdir/eptex_version.h b/Build/source/texk/web2c/eptexdir/eptex_version.h
+index 1d2fcdb..4e61c00 100644
+--- a/texk/web2c/eptexdir/eptex_version.h
++++ b/texk/web2c/eptexdir/eptex_version.h
+@@ -1 +1 @@
+-#define EPTEX_VERSION "160201"
++#define EPTEX_VERSION "161030"
+diff --git a/texk/web2c/eptexdir/pdfutils.ch b/Build/source/texk/web2c/eptexdir/pdfutils.ch
+index 9640f01..97ccb6f 100644
+--- a/texk/web2c/eptexdir/pdfutils.ch
++++ b/texk/web2c/eptexdir/pdfutils.ch
+@@ -1061,5 +1061,8 @@ begin
+ flush_string;
+ end;
+
++@ @<Set initial values of key variables@>=
++ init_start_time;
++
+ @* \[54] System-dependent changes.
+ @z
diff --git a/debian/patches/upstream-svn42383-invalid-epoch b/debian/patches/upstream-svn42383-invalid-epoch
new file mode 100644
index 0000000..3a03aac
--- /dev/null
+++ b/debian/patches/upstream-svn42383-invalid-epoch
@@ -0,0 +1,42 @@
+---
+ texk/dvipsk/ChangeLog | 6 ++++++
+ texk/dvipsk/output.c | 8 ++------
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+--- texlive-bin.orig/texk/dvipsk/ChangeLog
++++ texlive-bin/texk/dvipsk/ChangeLog
+@@ -1,3 +1,9 @@
++2016-10-30 Karl Berry <karl@tug.org>
++
++ * output.c (INVALID_EPOCH_VALUE): define as (time_t) -1,
++ to avoid warning with huge unsigned value on 32-bit systems.
++ (open_output): don't duplicate writing of %%CreationDate.
++
+ 2016-05-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * output.c: Avoid to crash for too large a value of SOURCE_DATE_EPOCH
+--- texlive-bin.orig/texk/dvipsk/output.c
++++ texlive-bin/texk/dvipsk/output.c
+@@ -90,7 +90,7 @@
+ #define strtoll _strtoi64
+ #endif
+
+-#define INVALID_EPOCH_VALUE 0x7fffffffffffffffULL
++#define INVALID_EPOCH_VALUE ((time_t) -1)
+
+ static time_t
+ get_unique_time_if_given(void)
+@@ -1421,12 +1421,8 @@
+ jobtime = get_unique_time_if_given();
+ if (jobtime == INVALID_EPOCH_VALUE) {
+ jobtime = time(0);
+- fprintf(bitfile, "%%%%CreationDate: %s",
+- asctime(localtime(&jobtime)));
+- } else {
+- fprintf(bitfile, "%%%%CreationDate: %s",
+- asctime(gmtime(&jobtime)));
+ }
++ fprintf(bitfile, "%%%%CreationDate: %s", asctime(gmtime(&jobtime)));
+ #endif
+ if (! isepsf) {
+ /*
diff --git a/debian/patches/upstream-svn42391-invalid-epoch-dvipdfmx b/debian/patches/upstream-svn42391-invalid-epoch-dvipdfmx
new file mode 100644
index 0000000..037764c
--- /dev/null
+++ b/debian/patches/upstream-svn42391-invalid-epoch-dvipdfmx
@@ -0,0 +1,37 @@
+---
+ texk/dvipdfm-x/ChangeLog | 4 ++++
+ texk/dvipdfm-x/pdffont.c | 2 +-
+ texk/dvipdfm-x/pdfobj.h | 2 +-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+--- texlive-bin.orig/texk/dvipdfm-x/ChangeLog
++++ texlive-bin/texk/dvipdfm-x/ChangeLog
+@@ -1,3 +1,7 @@
++2016-10-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
++
++ * pdffont.c, pdfobj.h: Use (time_t)-1 for INVALID_EPOCH_VALUE.
++
+ 2016-05-10 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * cidtype2.c: Fix bugs in horizontal-vertical mixed scripts by
+--- texlive-bin.orig/texk/dvipdfm-x/pdffont.c
++++ texlive-bin/texk/dvipdfm-x/pdffont.c
+@@ -90,7 +90,7 @@
+
+ /* If an environment variable SOURCE_DATE_EPOCH is correctly defined like
+ * SOURCE_DATE_EPOCH=1456304492, then returns this value, to be used as the
+- * 'current time', otherwise returns INVALID_EPOCH_VALUE (= 0x7fffffffffffffffULL).
++ * 'current time', otherwise returns INVALID_EPOCH_VALUE (= (time_t)-1).
+ * In the case of Microsoft Visual Studio 2010, the value should be less
+ * than 32535291600.
+ */
+--- texlive-bin.orig/texk/dvipdfm-x/pdfobj.h
++++ texlive-bin/texk/dvipdfm-x/pdfobj.h
+@@ -199,6 +199,6 @@
+ extern pdf_obj *pdf_new_indirect (pdf_file *pf, unsigned label, unsigned short generation);
+
+ extern time_t get_unique_time_if_given(void);
+-#define INVALID_EPOCH_VALUE 0x7fffffffffffffffULL
++#define INVALID_EPOCH_VALUE ((time_t)-1)
+
+ #endif /* _PDFOBJ_H_ */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git
Reply to: