[Reproducible-commits] [texlive-bin] 06/12: update patches
Mattia Rizzolo
mattia at debian.org
Fri May 13 16:13:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to annotated tag debian/2015.20160213.39691-1
in repository texlive-bin.
commit 31816e7ed9f219d2353872a851c5bf8e82865537
Author: Norbert Preining <preining at debian.org>
Date: Fri Feb 12 22:12:38 2016 +0900
update patches
---
debian/patches/60_unneeded_linking | 2 +-
debian/patches/ac-ctie | 8 +--
debian/patches/fix-manpages | 44 +++++--------
debian/patches/libpng-arm64-neon-fix | 10 +--
debian/patches/series | 7 ---
debian/patches/upstream-svn37801-xobjcect-typo | 24 -------
debian/patches/upstream-svn38047-dvipdfmx-fix | 51 ---------------
debian/patches/upstream-svn38053-dvipdfmx-fix | 36 -----------
debian/patches/upstream-svn38059-dvipdfmx-fix | 30 ---------
debian/patches/upstream-svn38068-dvipdfmx-fix | 16 -----
debian/patches/upstream-svn38091-fix-pltotf-output | 73 ----------------------
11 files changed, 25 insertions(+), 276 deletions(-)
diff --git a/debian/patches/60_unneeded_linking b/debian/patches/60_unneeded_linking
index 7bacbb0..8178aff 100644
--- a/debian/patches/60_unneeded_linking
+++ b/debian/patches/60_unneeded_linking
@@ -4,7 +4,7 @@
--- texlive-bin.orig/texk/web2c/am/texmf.am
+++ texlive-bin/texk/web2c/am/texmf.am
-@@ -137,7 +137,7 @@
+@@ -157,7 +157,7 @@
# All the x_... and X_... variables will be empty if we aren't supporting X.
# Follow the library order used in X11R6 itself:
# -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
diff --git a/debian/patches/ac-ctie b/debian/patches/ac-ctie
index 6fdb204..bbf5ba3 100644
--- a/debian/patches/ac-ctie
+++ b/debian/patches/ac-ctie
@@ -7,7 +7,7 @@
--- texlive-bin.orig/texk/web2c/configure.ac
+++ texlive-bin/texk/web2c/configure.ac
-@@ -351,6 +351,7 @@
+@@ -346,6 +346,7 @@
KPSE_CROSS_PATH_PROG([CTANGLEBOOT], [ctangle], [./ctangleboot])
KPSE_CROSS_PATH_PROG([CTANGLE], [ctangle], [./ctangle])
KPSE_CROSS_PATH_PROG([TIE], [tie], [./tie])
@@ -17,10 +17,10 @@
--- texlive-bin.orig/texk/web2c/Makefile.am
+++ texlive-bin/texk/web2c/Makefile.am
-@@ -138,6 +138,12 @@
- tie_silent_ = $(tie_silent_ at AM_DEFAULT_V@)
- tie_silent_0 = @echo " TIE " $@; $(SHELL) ./silent-sh $@ #
+@@ -140,6 +140,12 @@
tie_silent_1 =
+ tie_c = $(tie) -c $@
+ tie_m = $(tie) -m $@
+#
+ctie = $(buildenv) $(CTIE)
+ctie_silent = $(ctie_silent_ at AM_V@)
diff --git a/debian/patches/fix-manpages b/debian/patches/fix-manpages
index 10bdc78..1d9bd37 100644
--- a/debian/patches/fix-manpages
+++ b/debian/patches/fix-manpages
@@ -2,36 +2,22 @@
texk/detex/detex-2.8/detex.man | 2
texk/mendexk/mendex.1 | 2
texk/web2c/man/mf.man | 26 +++++-----
- texk/web2c/man/tex.man | 4 -
texk/web2c/synctexdir/man5/synctex.5 | 6 +-
texk/xdvik/xdvi.1.in | 88 +++++++++++++++++------------------
- 6 files changed, 64 insertions(+), 64 deletions(-)
+ 5 files changed, 62 insertions(+), 62 deletions(-)
---- texlive-bin.orig/texk/web2c/man/tex.man
-+++ texlive-bin/texk/web2c/man/tex.man
-@@ -6,8 +6,8 @@
- .if n .ds TX TeX
- .if n .ds MF Metafont
- .if t .ds MF M\s-2ETAFONT\s0
--.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
--.el .ds OX TeX for nroff
-+.ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP
-+.el .ds OX TeX
- .\" the same but obliqued
- .\" BX definition must follow TX so BX can use TX
- .if t .ds BX \fRB\s-2IB\s0\fP\*(TX
--- texlive-bin.orig/texk/web2c/man/mf.man
+++ texlive-bin/texk/web2c/man/mf.man
@@ -2,7 +2,7 @@
.\"=====================================================================
.if n .ds MF Metafont
- .if t .ds MF M\s-2ETAFONT\s0
+ .if t .ds MF Metafont
-.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if t .ds TX \fRT\h'-0.1667m'\v'0.20v'E\v'-0.20v'\h'-0.125m'X\fP
.if n .ds TX TeX
- .ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP for troff
- .el .ds OX TeX for nroff
-@@ -11,7 +11,7 @@
+ .ie t .ds OX \fIT\v'+0.25m'E\v'-0.25m'X\fP
+ .el .ds OX TeX
+@@ -10,7 +10,7 @@
.if t .ds BX \fRB\s-2IB\s0\fP\*(TX
.if n .ds BX BibTeX
.\" LX definition must follow TX so LX can use TX
@@ -40,7 +26,7 @@
.if n .ds LX LaTeX
.if n .ds WB Web
.if t .ds WB W\s-2EB\s0
-@@ -55,7 +55,7 @@
+@@ -54,7 +54,7 @@
it will use the
.I plain
base. When called under any other name, \*(MF will use that name as
@@ -49,7 +35,7 @@
.B mf
the
.I mf
-@@ -91,7 +91,7 @@
+@@ -90,7 +90,7 @@
.IR mode .
(Or you can just say
.I mf
@@ -58,7 +44,7 @@
control sequences, such as
.I batchmode
(for silent operation) can also appear.
-@@ -116,7 +116,7 @@
+@@ -115,7 +115,7 @@
the name of an actual device or, most commonly, the name
.I localfont
(see below) must
@@ -67,7 +53,7 @@
site, \*(MF will default to
.I proof
mode which produces
-@@ -166,7 +166,7 @@
+@@ -165,7 +165,7 @@
can be
studied in an appendix to the
.IR "\*(MF\^book" ;
@@ -76,7 +62,7 @@
altered except when it is officially upgraded.
Each
.I mode_def
-@@ -369,14 +369,14 @@
+@@ -368,14 +368,14 @@
Search path for
.I input
and
@@ -93,7 +79,7 @@
and DISPLAY is set, the Metafont window support for X is used.
(DISPLAY must be set to a valid X server specification, as usual.)
If neither MFTERM nor DISPLAY is set, TERM is used to guess the window
-@@ -435,24 +435,24 @@
+@@ -434,24 +434,24 @@
.\"=====================================================================
.SH BUGS
On January 4, 1986 the ``final'' bug in \*(MF was discovered
@@ -122,7 +108,7 @@
.I Computer Modern Typefaces
(Volume E of
.IR "Computers and Typesetting" ),
-@@ -477,7 +477,7 @@
+@@ -476,7 +476,7 @@
.BR tftopl (1).
.\"=====================================================================
.SH AUTHORS
@@ -525,9 +511,9 @@
.if t .ds LX L\v'-.22m'a\v'.22m'T\h'-.1667m'\v'.22m'E\h'-.125m'\v'-.22m'X
-.TH MENDEX L
+.TH MENDEX 1
- .SH ̾��
- mendex \- ���������ġ���
- .SH ����ˡ
+ .SH 名称
+ mendex \- 索引整形ツール
+ .SH 使用法
--- texlive-bin.orig/texk/detex/detex-2.8/detex.man
+++ texlive-bin/texk/detex/detex-2.8/detex.man
@@ -1,4 +1,4 @@
diff --git a/debian/patches/libpng-arm64-neon-fix b/debian/patches/libpng-arm64-neon-fix
index 3deeaa3..16cf88a 100644
--- a/debian/patches/libpng-arm64-neon-fix
+++ b/debian/patches/libpng-arm64-neon-fix
@@ -5,13 +5,13 @@ Author: Wookey <wookey at debian.org>
Last-Update: 2014-09-30
---
- libs/libpng/libpng-1.6.17/pngpriv.h | 2 +-
+ libs/libpng/libpng-src/pngpriv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- texlive-bin.orig/libs/libpng/libpng-1.6.17/pngpriv.h
-+++ texlive-bin/libs/libpng/libpng-1.6.17/pngpriv.h
-@@ -122,7 +122,7 @@
- * check both variants.
+--- texlive-bin.orig/libs/libpng/libpng-src/pngpriv.h
++++ texlive-bin/libs/libpng/libpng-src/pngpriv.h
+@@ -126,7 +126,7 @@
+ * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS.
*/
# if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
- defined(PNG_ALIGNED_MEMORY_SUPPORTED)
diff --git a/debian/patches/series b/debian/patches/series
index ef048f1..3b468f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,12 +10,5 @@ libpng-arm64-neon-fix
mktexlsr-use-mktemp
dvihp-use-mktemp
remove-libdir-from-kpathsea-pkgconfig
-# from here on upstream patches
-upstream-svn37801-xobjcect-typo
-upstream-svn38047-dvipdfmx-fix
-upstream-svn38053-dvipdfmx-fix
-upstream-svn38059-dvipdfmx-fix
-upstream-svn38068-dvipdfmx-fix
-upstream-svn38091-fix-pltotf-output
fix-format-gcc-errors
fix-mktexlsr-bashims
diff --git a/debian/patches/upstream-svn37801-xobjcect-typo b/debian/patches/upstream-svn37801-xobjcect-typo
deleted file mode 100644
index 7b61705..0000000
--- a/debian/patches/upstream-svn37801-xobjcect-typo
+++ /dev/null
@@ -1,24 +0,0 @@
----
- texk/dvipdfm-x/pngimage.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- texlive-bin.orig/texk/dvipdfm-x/pngimage.c
-+++ texlive-bin/texk/dvipdfm-x/pngimage.c
-@@ -972,7 +972,7 @@
- smask = pdf_new_stream(STREAM_COMPRESS);
- dict = pdf_stream_dict(smask);
- smask_data_ptr = (png_bytep) NEW(width*height, png_byte);
-- pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("XObjcect"));
-+ pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("XObject"));
- pdf_add_dict(dict, pdf_new_name("Subtype"), pdf_new_name("Image"));
- pdf_add_dict(dict, pdf_new_name("Width"), pdf_new_number(width));
- pdf_add_dict(dict, pdf_new_name("Height"), pdf_new_number(height));
-@@ -1016,7 +1016,7 @@
-
- smask = pdf_new_stream(STREAM_COMPRESS);
- dict = pdf_stream_dict(smask);
-- pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("XObjcect"));
-+ pdf_add_dict(dict, pdf_new_name("Type"), pdf_new_name("XObject"));
- pdf_add_dict(dict, pdf_new_name("Subtype"), pdf_new_name("Image"));
- pdf_add_dict(dict, pdf_new_name("Width"), pdf_new_number(width));
- pdf_add_dict(dict, pdf_new_name("Height"), pdf_new_number(height));
diff --git a/debian/patches/upstream-svn38047-dvipdfmx-fix b/debian/patches/upstream-svn38047-dvipdfmx-fix
deleted file mode 100644
index 9572ea8..0000000
--- a/debian/patches/upstream-svn38047-dvipdfmx-fix
+++ /dev/null
@@ -1,51 +0,0 @@
----
- texk/dvipdfm-x/dvi.c | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
-
---- texlive-bin.orig/texk/dvipdfm-x/dvi.c
-+++ texlive-bin/texk/dvipdfm-x/dvi.c
-@@ -921,6 +921,34 @@
-
- #ifdef XETEX
- static int
-+is_notdef_notzero (char *path)
-+{
-+ FILE *f;
-+ char buf[2014];
-+ char cmd[512];
-+ char *p;
-+ int ret = 0;
-+
-+ strcpy (cmd, "t1disasm ");
-+ strcat (cmd, path);
-+ f = popen (cmd, "r");
-+ if (f) {
-+ while ((fgets (buf, 2000, f))) {
-+ p = strstr (buf, "CharStrings");
-+ if (p) {
-+ fgets (buf, 2000, f);
-+ if (strncmp (buf, "/.notdef", 8) != 0)
-+ ret = 1;
-+ break;
-+ }
-+ }
-+ fclose(f);
-+ }
-+
-+ return ret;
-+}
-+
-+static int
- dvi_locate_native_font (const char *filename, uint32_t index,
- spt_t ptsize, int layout_dir, int extend, int slant, int embolden)
- {
-@@ -1001,6 +1029,9 @@
- loaded_fonts[cur_id].numGlyphs = cffont->num_glyphs;
-
- DPXFCLOSE(fp);
-+ if (loaded_fonts[cur_id].cff_is_standard_encoding) {
-+ loaded_fonts[cur_id].cff_is_standard_encoding = is_notdef_notzero (path);
-+ }
- } else {
- if (is_dfont)
- sfont = dfont_open(fp, index);
diff --git a/debian/patches/upstream-svn38053-dvipdfmx-fix b/debian/patches/upstream-svn38053-dvipdfmx-fix
deleted file mode 100644
index cba500a..0000000
--- a/debian/patches/upstream-svn38053-dvipdfmx-fix
+++ /dev/null
@@ -1,36 +0,0 @@
----
- texk/dvipdfm-x/dvi.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
---- texlive-bin.orig/texk/dvipdfm-x/dvi.c
-+++ texlive-bin/texk/dvipdfm-x/dvi.c
-@@ -924,19 +924,23 @@
- is_notdef_notzero (char *path)
- {
- FILE *f;
-- char buf[2014];
-- char cmd[512];
-+ char buf[2048];
-+ char *cmd;
- char *p;
- int ret = 0;
-
-- strcpy (cmd, "t1disasm ");
-- strcat (cmd, path);
-+ p = kpse_var_value("SELFAUTOLOC");
-+ if (p == NULL)
-+ return ret;
-+ cmd = concat3 (p, "/t1disasm ", path);
-+ free (p);
- f = popen (cmd, "r");
-+ free (cmd);
- if (f) {
-- while ((fgets (buf, 2000, f))) {
-+ while ((fgets (buf, 2047, f))) {
- p = strstr (buf, "CharStrings");
- if (p) {
-- fgets (buf, 2000, f);
-+ fgets (buf, 2047, f);
- if (strncmp (buf, "/.notdef", 8) != 0)
- ret = 1;
- break;
diff --git a/debian/patches/upstream-svn38059-dvipdfmx-fix b/debian/patches/upstream-svn38059-dvipdfmx-fix
deleted file mode 100644
index 41e6953..0000000
--- a/debian/patches/upstream-svn38059-dvipdfmx-fix
+++ /dev/null
@@ -1,30 +0,0 @@
----
- texk/dvipdfm-x/dvi.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
---- texlive-bin.orig/texk/dvipdfm-x/dvi.c
-+++ texlive-bin/texk/dvipdfm-x/dvi.c
-@@ -932,7 +932,11 @@
- p = kpse_var_value("SELFAUTOLOC");
- if (p == NULL)
- return ret;
-+#if defined(_WIN32)
-+ cmd = concatn ("\"", p, "/t1disasm.exe\" \"", path, "\"", NULL);
-+#else
- cmd = concat3 (p, "/t1disasm ", path);
-+#endif
- free (p);
- f = popen (cmd, "r");
- free (cmd);
-@@ -941,7 +945,10 @@
- p = strstr (buf, "CharStrings");
- if (p) {
- fgets (buf, 2047, f);
-- if (strncmp (buf, "/.notdef", 8) != 0)
-+ p = buf;
-+ while (*p == ' ' || *p == '\t')
-+ p++;
-+ if (strncmp (p, "/.notdef", 8) != 0)
- ret = 1;
- break;
- }
diff --git a/debian/patches/upstream-svn38068-dvipdfmx-fix b/debian/patches/upstream-svn38068-dvipdfmx-fix
deleted file mode 100644
index 956cd6c..0000000
--- a/debian/patches/upstream-svn38068-dvipdfmx-fix
+++ /dev/null
@@ -1,16 +0,0 @@
----
- texk/dvipdfm-x/dvi.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- texlive-bin.orig/texk/dvipdfm-x/dvi.c
-+++ texlive-bin/texk/dvipdfm-x/dvi.c
-@@ -1026,7 +1026,8 @@
- ERROR("Failed to read Type 1 font \"%s\".", filename);
-
- loaded_fonts[cur_id].cffont = cffont;
-- loaded_fonts[cur_id].cff_is_standard_encoding = enc_vec[0] == NULL;
-+ loaded_fonts[cur_id].cff_is_standard_encoding =
-+ (enc_vec[0] == NULL || !strcmp (enc_vec[0], ".notdef"));
-
- if (cff_dict_known(cffont->topdict, "FontBBox")) {
- loaded_fonts[cur_id].ascent = cff_dict_get(cffont->topdict, "FontBBox", 3);
diff --git a/debian/patches/upstream-svn38091-fix-pltotf-output b/debian/patches/upstream-svn38091-fix-pltotf-output
deleted file mode 100644
index ce0e177..0000000
--- a/debian/patches/upstream-svn38091-fix-pltotf-output
+++ /dev/null
@@ -1,73 +0,0 @@
-Upstream svn 38091
-fix messed up output of vptovf and pltotf etc
----
- texk/web2c/ChangeLog | 5 +++++
- texk/web2c/omegaware/ChangeLog | 5 +++++
- texk/web2c/omegaware/opl2ofm.ch | 1 +
- texk/web2c/omegaware/ovp2ovf.ch | 1 +
- texk/web2c/pltotf.ch | 1 +
- texk/web2c/vptovf.ch | 1 +
- 6 files changed, 14 insertions(+)
-
---- texlive-bin.orig/texk/web2c/ChangeLog
-+++ texlive-bin/texk/web2c/ChangeLog
-@@ -1,3 +1,8 @@
-+2015-08-10 Peter Breitenlohner <peb at mppmu.mpg.de>
-+
-+ * pltotf.ch, vptovf.ch: Send also real numbers to stderr,
-+ completing the change from 2015-01-09 (report from Norbert).
-+
- 2015-05-21 Karl Berry <karl at tug.org>
-
- * TL'15.
---- texlive-bin.orig/texk/web2c/omegaware/ChangeLog
-+++ texlive-bin/texk/web2c/omegaware/ChangeLog
-@@ -1,3 +1,8 @@
-+2015-08-10 Peter Breitenlohner <peb at mppmu.mpg.de>
-+
-+ * opl2ofm.ch, ovp2ovf.ch: Send also real numbers to stderr,
-+ completing the change from 2015-01-11.
-+
- 2015-01-18 Peter Breitenlohner <peb at mppmu.mpg.de>
-
- * odvicopy.ch: Drop intcast().
---- texlive-bin.orig/texk/web2c/omegaware/opl2ofm.ch
-+++ texlive-bin/texk/web2c/omegaware/opl2ofm.ch
-@@ -39,6 +39,7 @@
- @y
- @d print(#)==write(stderr,#)
- @d print_ln(#)==write_ln(stderr,#)
-+ at d print_real(#)==fprint_real(stderr,#)
- @z
-
- @x [still 2] No banner unless verbose.
---- texlive-bin.orig/texk/web2c/omegaware/ovp2ovf.ch
-+++ texlive-bin/texk/web2c/omegaware/ovp2ovf.ch
-@@ -28,6 +28,7 @@
- @y
- @d print(#)==write(stderr,#)
- @d print_ln(#)==write_ln(stderr,#)
-+ at d print_real(#)==fprint_real(stderr,#)
- @z
-
- @x [2] Print the banner later.
---- texlive-bin.orig/texk/web2c/pltotf.ch
-+++ texlive-bin/texk/web2c/pltotf.ch
-@@ -32,6 +32,7 @@
- @y
- @d print(#)==write(stderr,#)
- @d print_ln(#)==write_ln(stderr,#)
-+ at d print_real(#)==fprint_real(stderr,#)
- @z
-
- @x [still 2] No banner unless verbose.
---- texlive-bin.orig/texk/web2c/vptovf.ch
-+++ texlive-bin/texk/web2c/vptovf.ch
-@@ -21,6 +21,7 @@
- @y
- @d print(#)==write(stderr,#)
- @d print_ln(#)==write_ln(stderr,#)
-+ at d print_real(#)==fprint_real(stderr,#)
- @z
-
- @x [2] Print the banner later.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git
More information about the Reproducible-commits
mailing list