[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[texlive-bin] 03/07: update patches, prepare for release



This is an automated email from the git hooks/post-receive script.

preining pushed a commit to branch experimental
in repository texlive-bin.

commit 44543a4ba2db0ca2dddea181a789fc6ddc208fc3
Author: Norbert Preining <preining@debian.org>
Date:   Sat May 7 08:42:56 2016 +0900

    update patches, prepare for release
---
 debian/changelog                           |  11 ++--
 debian/patches/fix-format-gcc-errors       |   2 +-
 debian/patches/source-date-epoch-extension | 102 +----------------------------
 3 files changed, 10 insertions(+), 105 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67cfb47..f235863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-texlive-bin (2016.20160503.40849-1) UNRELEASED; urgency=medium
+texlive-bin (2016.20160507.40923-1) unstable; urgency=medium
 
   * break against old texlive (Closes: #820716)
   * install a desktop file for xdvi (Thanks Pino Toscano, upupstream)
-  * Imported Upstream version 2016.20160503.40849
-  * SOURCE_DATE_EPOCH extensions 
-    (thanks to Alexis Bienvenüe <pado@passoire.fr>)
+  * Imported Upstream version 2016.20160507.40923
+    support for suppressing time stamps via SOURCE_DATE_EPOCH (Closes: #792202)
+  * Add support for SOURCE_DATE_EPOCH also to luatex
+  * Update patches
 
- -- Norbert Preining <preining@debian.org>  Tue, 03 May 2016 16:54:09 +0900
+ -- Norbert Preining <preining@debian.org>  Sat, 07 May 2016 08:43:56 +0900
 
 texlive-bin (2016.20160409.40358-1) experimental; urgency=medium
 
diff --git a/debian/patches/fix-format-gcc-errors b/debian/patches/fix-format-gcc-errors
index 3fa9042..cb96de7 100644
--- a/debian/patches/fix-format-gcc-errors
+++ b/debian/patches/fix-format-gcc-errors
@@ -23,7 +23,7 @@
  }
 --- texlive-bin.orig/utils/devnag/src/devnag.c
 +++ texlive-bin/utils/devnag/src/devnag.c
-@@ -2400,7 +2400,7 @@
+@@ -2408,7 +2408,7 @@
  void err_ill(const char *str) {
     fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
  	  str, linenumber);
diff --git a/debian/patches/source-date-epoch-extension b/debian/patches/source-date-epoch-extension
index a4efe9e..7f91fe3 100644
--- a/debian/patches/source-date-epoch-extension
+++ b/debian/patches/source-date-epoch-extension
@@ -1,105 +1,9 @@
-Extending SOURCE_DATE_EPOCH support
-patch by Alexis Bienvenüe <pado@passoire.fr> with small adjustments
 use SOURCE_DATE_EPOCH for luatex, too
-if in addition SOURCE_DATE_EPOCH_FIXUP_TEX_PRIMITIVES is set,
-the \today primitive is also fixed.
 ---
- texk/web2c/lib/texmfmp.c          |   60 ++++++++++++++++++++++++--------------
- texk/web2c/luatexdir/luatex.c     |   12 ++++++-
- texk/web2c/luatexdir/pdf/pdfgen.w |   20 ++++++++++--
- 3 files changed, 64 insertions(+), 28 deletions(-)
+ texk/web2c/luatexdir/luatex.c     |   12 ++++++++++--
+ texk/web2c/luatexdir/pdf/pdfgen.w |   20 ++++++++++++++++----
+ 2 files changed, 26 insertions(+), 6 deletions(-)
 
---- texlive-bin.orig/texk/web2c/lib/texmfmp.c
-+++ texlive-bin/texk/web2c/lib/texmfmp.c
-@@ -2200,6 +2200,30 @@
- }
- #endif /* not WIN32 */
- 
-+static boolean start_time_set = false;
-+static time_t start_time = 0;
-+
-+void init_start_time() {
-+    char *source_date_epoch;
-+    unsigned long long epoch;
-+    char *endptr;
-+    if (!start_time_set) {
-+        start_time_set = true;
-+        source_date_epoch = getenv("SOURCE_DATE_EPOCH");
-+        if (source_date_epoch) {
-+            errno = 0;
-+            epoch = strtoull(source_date_epoch, &endptr, 10);
-+            if (epoch < 0 || *endptr != '\0' || errno != 0) {
-+              FATAL1 ("invalid value for environment variable $SOURCE_DATE_EPOCH: %s",
-+                      source_date_epoch);
-+            }
-+            start_time = epoch;
-+        } else {
-+            start_time = time((time_t *) NULL);
-+        }
-+    }
-+}
-+
- /* Besides getting the date and time here, we also set up the interrupt
-    handler, for no particularly good reason.  It's just that since the
-    `fix_date_and_time' routine is called early on (section 1337 in TeX,
-@@ -2210,8 +2234,14 @@
- get_date_and_time (integer *minutes,  integer *day,
-                    integer *month,  integer *year)
- {
--  time_t myclock = time ((time_t *) 0);
--  struct tm *tmptr = localtime (&myclock);
-+  struct tm *tmptr;
-+  if(getenv("SOURCE_DATE_EPOCH_FIXUP_TEX_PRIMITIVES")) {
-+    init_start_time();
-+    tmptr = gmtime (&start_time);
-+  } else {
-+    time_t myclock = time ((time_t *) 0);
-+    tmptr = localtime (&myclock);
-+  }
- 
-   *minutes = tmptr->tm_hour * 60 + tmptr->tm_min;
-   *day = tmptr->tm_mday;
-@@ -2930,8 +2960,7 @@
- #endif /* not pdfTeX */
- 
- #if !defined(XeTeX)
--static boolean start_time_set = false;
--static time_t start_time = 0;
-+
- #define TIME_STR_SIZE 30
- char start_time_str[TIME_STR_SIZE];
- static char time_str[TIME_STR_SIZE];
-@@ -2996,25 +3025,12 @@
- 
- void initstarttime(void)
- {
--    char *source_date_epoch;
--    int64_t epoch;
--    char *endptr;
-     if (!start_time_set) {
--        start_time_set = true;
--        source_date_epoch = getenv("SOURCE_DATE_EPOCH");
--        if (source_date_epoch) {
--            errno = 0;
--            epoch = strtoll(source_date_epoch, &endptr, 10);
--            if (epoch < 0 || *endptr != '\0' || errno != 0) {
--       FATAL1 ("invalid value for environment variable $SOURCE_DATE_EPOCH: %s",
--                source_date_epoch);
--            }
--            start_time = epoch;
--            makepdftime(start_time, start_time_str, /* utc= */true);
--        }
--        else {
--            start_time = time((time_t *) NULL);
--            makepdftime(start_time, start_time_str, /* utc= */false);
-+        init_start_time ();
-+        if (getenv ("SOURCE_DATE_EPOCH")) {
-+            makepdftime (start_time, start_time_str, /* utc= */true);
-+        } else {
-+            makepdftime (start_time, start_time_str,  /* utc= */false);
-         }
-     }
- }
 --- texlive-bin.orig/texk/web2c/luatexdir/luatex.c
 +++ texlive-bin/texk/web2c/luatexdir/luatex.c
 @@ -858,8 +858,16 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git


Reply to: