From 8653d4bdcfce14131db9a1937fe504e8dd61a8be Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sat, 29 Oct 2011 17:12:17 -0200 Subject: office/texlive: Updated with new patches + enabled xindy. Signed-off-by: Niels Horn --- office/texlive/README | 2 + .../01-off-by-one-fix-for-enctex-xetex.patch | 30 ++++ .../branch2011/02-synctex-coordinate-fix.patch | 70 +++++++++ .../branch2011/03-create-README.branch2011.patch | 39 +++++ .../04-line_number_fix_from_r24155.patch | 165 +++++++++++++++++++++ .../branch2011/05-update_README.branch2011.patch | 35 +++++ .../06-buffer_overrun_fix_from_r24337.patch | 17 +++ .../07-fix_memory_corruption_from_r23592.patch | 49 ++++++ .../branch2011/08-e-ptex_fixes_from_r23688.patch | 61 ++++++++ .../texlive/branch2011/09-update_branch_log.patch | 38 +++++ .../10-luatex_array_fix_from_r24353.patch | 35 +++++ .../texlive/branch2011/11-update_branch_log.patch | 22 +++ office/texlive/branch2011/README | 4 + .../off-by-one-fix-for-enctex-xetex.patch | 30 ---- .../branch2011/synctex-coordinate-fix.patch | 70 --------- office/texlive/texlive.SlackBuild | 19 ++- 16 files changed, 581 insertions(+), 105 deletions(-) create mode 100644 office/texlive/branch2011/01-off-by-one-fix-for-enctex-xetex.patch create mode 100644 office/texlive/branch2011/02-synctex-coordinate-fix.patch create mode 100644 office/texlive/branch2011/03-create-README.branch2011.patch create mode 100644 office/texlive/branch2011/04-line_number_fix_from_r24155.patch create mode 100644 office/texlive/branch2011/05-update_README.branch2011.patch create mode 100644 office/texlive/branch2011/06-buffer_overrun_fix_from_r24337.patch create mode 100644 office/texlive/branch2011/07-fix_memory_corruption_from_r23592.patch create mode 100644 office/texlive/branch2011/08-e-ptex_fixes_from_r23688.patch create mode 100644 office/texlive/branch2011/09-update_branch_log.patch create mode 100644 office/texlive/branch2011/10-luatex_array_fix_from_r24353.patch create mode 100644 office/texlive/branch2011/11-update_branch_log.patch delete mode 100644 office/texlive/branch2011/off-by-one-fix-for-enctex-xetex.patch delete mode 100644 office/texlive/branch2011/synctex-coordinate-fix.patch (limited to 'office') diff --git a/office/texlive/README b/office/texlive/README index 68a7b54bf3..c02eefdb6d 100644 --- a/office/texlive/README +++ b/office/texlive/README @@ -12,3 +12,5 @@ alternate location for TMP and OUTPUT if you have small /tmp partition. Note that this package is intended to completely replace (and then some) the tetex packages in Slackware, so you'll need to remove tetex and tetex-doc before installing TeXLive. + +This requires libsigsegv. diff --git a/office/texlive/branch2011/01-off-by-one-fix-for-enctex-xetex.patch b/office/texlive/branch2011/01-off-by-one-fix-for-enctex-xetex.patch new file mode 100644 index 0000000000..e629dd3962 --- /dev/null +++ b/office/texlive/branch2011/01-off-by-one-fix-for-enctex-xetex.patch @@ -0,0 +1,30 @@ +r23740 | karl | 2011-08-29 00:14:50 +0000 (Mon, 29 Aug 2011) | 1 line + +branch2011: import off-by-one fix for enctex/xetex initialization (original r23187, see also email http://tug.org/pipermail/tldistro/2011q3/000120.html) + +Index: Build/source/texk/web2c/xetexdir/xetex.ch +=================================================================== +--- Build/source/texk/web2c/xetexdir/xetex.ch (revision 23739) ++++ Build/source/texk/web2c/xetexdir/xetex.ch (revision 23740) +@@ -328,7 +328,7 @@ + {Initialize enc\TeX\ data.} + for i:=0 to 255 do mubyte_read[i]:=null; + for i:=0 to 255 do mubyte_write[i]:=0; +-for i:=0 to 128 do mubyte_cswrite[i]:=null; ++for i:=0 to 127 do mubyte_cswrite[i]:=null; + mubyte_keep := 0; mubyte_start := false; + write_noexpanding := false; cs_converting := false; + special_printing := false; message_printing := false; +Index: Build/source/texk/web2c/enctex.ch +=================================================================== +--- Build/source/texk/web2c/enctex.ch (revision 23739) ++++ Build/source/texk/web2c/enctex.ch (revision 23740) +@@ -42,7 +42,7 @@ + {Initialize enc\TeX\ data.} + for i:=0 to 255 do mubyte_read[i]:=null; + for i:=0 to 255 do mubyte_write[i]:=0; +-for i:=0 to 128 do mubyte_cswrite[i]:=null; ++for i:=0 to 127 do mubyte_cswrite[i]:=null; + mubyte_keep := 0; mubyte_start := false; + write_noexpanding := false; cs_converting := false; + special_printing := false; message_printing := false; diff --git a/office/texlive/branch2011/02-synctex-coordinate-fix.patch b/office/texlive/branch2011/02-synctex-coordinate-fix.patch new file mode 100644 index 0000000000..873175896a --- /dev/null +++ b/office/texlive/branch2011/02-synctex-coordinate-fix.patch @@ -0,0 +1,70 @@ +r23716 | karl | 2011-08-26 23:29:30 +0000 (Fri, 26 Aug 2011) | 1 line + +branch2011: import synctex coordinate fix from trunk r23644 + +Index: Build/source/texk/web2c/synctexdir/synctex-luatex.h +=================================================================== +--- Build/source/texk/web2c/synctexdir/synctex-luatex.h (revision 23715) ++++ Build/source/texk/web2c/synctexdir/synctex-luatex.h (revision 23716) +@@ -1,6 +1,6 @@ + /* synctex-luatex.h + +- Copyright (c) 2010 Taco Hoekwater ++ Copyright (c) 2010, 2011 Taco Hoekwater + + This file is part of LuaTeX. + +@@ -50,9 +50,12 @@ + #define SYNCTEX_HEIGHT(NODE) height(NODE) + #define SYNCTEX_VALUE int_par(synctex_code) + +-#define SYNCTEX_CURV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v) +-#define SYNCTEX_CURH static_pdf->posstruct->pos.h ++#define SYNCTEX_CURVV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v) ++#define SYNCTEX_CURHH static_pdf->posstruct->pos.h + ++#define SYNCTEX_CURV (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURVV:SYNCTEX_CURVV-4736287) ++#define SYNCTEX_CURH (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURHH:SYNCTEX_CURHH-4736287) ++ + #define SYNCTEX_GET_JOB_NAME() makecstring(job_name) + #define SYNCTEX_GET_LOG_NAME() get_full_log_name() + +Index: Build/source/texk/web2c/synctexdir/ChangeLog +=================================================================== +--- Build/source/texk/web2c/synctexdir/ChangeLog (revision 23715) ++++ Build/source/texk/web2c/synctexdir/ChangeLog (revision 23716) +@@ -1,3 +1,8 @@ ++2011-08-22 Akira Kakuto ++ ++ * synctex-luatex.h, synctex-xetex.h: Define SYNCTEX_CURH and ++ SYNCTEX_CURH to yield correct coordinates in dvi and pdf mode. ++ + 2011-06-11 Akira Kakuto + + * synctex_parser_utils.c: fix a typo. +Index: Build/source/texk/web2c/synctexdir/synctex-xetex.h +=================================================================== +--- Build/source/texk/web2c/synctexdir/synctex-xetex.h (revision 23715) ++++ Build/source/texk/web2c/synctexdir/synctex-xetex.h (revision 23716) +@@ -1,9 +1,9 @@ + /* +-Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr ++Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr + + This file is part of the SyncTeX package. + +-Latest Revision: Wed Jul 1 11:16:29 UTC 2009 ++Latest Revision: Wed Aug 22 07:20:29 UTC 2011 + + License: + -------- +@@ -57,6 +57,9 @@ + # define SYNCTEX_OFFSET_IS_PDF (nopdfoutput==0) + # define SYNCTEX_OUTPUT (nopdfoutput!=0?"xdv":"pdf") + ++#define SYNCTEX_CURH ((nopdfoutput==0)?(curh+4736287):curh) ++#define SYNCTEX_CURV ((nopdfoutput==0)?(curv+4736287):curv) ++ + /* WARNING: + The definition below must be in sync with their eponym declarations in synctex-xetex.ch1 + */ diff --git a/office/texlive/branch2011/03-create-README.branch2011.patch b/office/texlive/branch2011/03-create-README.branch2011.patch new file mode 100644 index 0000000000..03fc88049a --- /dev/null +++ b/office/texlive/branch2011/03-create-README.branch2011.patch @@ -0,0 +1,39 @@ +r23991 | karl | 2011-09-17 15:17:33 +0000 (Sat, 17 Sep 2011) | 1 line + +branch2011: README.branch2011 file to record branch commits + +Index: Build/source/README.branch2011 +=================================================================== +--- Build/source/README.branch2011 (revision 0) ++++ Build/source/README.branch2011 (revision 23991) +@@ -0,0 +1,22 @@ ++$Id$ ++Public domain. Originally written 2011 by Karl Berry. ++ ++This file records commits made to the bug-fix branch (only). ++ ++------------------------------------------------------------------------ ++r23716 | karl | 2011-08-27 01:29:30 +0200 (Sat, 27 Aug 2011) | 1 line ++Changed paths: ++ M /branches/branch2011/Build/source/texk/web2c/synctexdir/ChangeLog ++ M /branches/branch2011/Build/source/texk/web2c/synctexdir/synctex-luatex.h ++ M /branches/branch2011/Build/source/texk/web2c/synctexdir/synctex-xetex.h ++ ++branch2011: import synctex coordinate fix from trunk r23644 ++ ++------------------------------------------------------------------------ ++r23740 | karl | 2011-08-29 02:14:50 +0200 (Mon, 29 Aug 2011) | 1 line ++Changed paths: ++ M /branches/branch2011/Build/source/texk/web2c/enctex.ch ++ M /branches/branch2011/Build/source/texk/web2c/xetexdir/xetex.ch ++ ++branch2011: import off-by-one fix for enctex/xetex initialization (original r23187, see also email http://tug.org/pipermail/tldistro/2011q3/000120.html) ++------------------------------------------------------------------------ + +Property changes on: Build/source/README.branch2011 +___________________________________________________________________ +Added: svn:keywords + + Date Author Id +Added: svn:eol-style + + native + diff --git a/office/texlive/branch2011/04-line_number_fix_from_r24155.patch b/office/texlive/branch2011/04-line_number_fix_from_r24155.patch new file mode 100644 index 0000000000..3fd54b505e --- /dev/null +++ b/office/texlive/branch2011/04-line_number_fix_from_r24155.patch @@ -0,0 +1,165 @@ +r24159 | karl | 2011-09-30 23:23:37 +0000 (Fri, 30 Sep 2011) | 1 line + +branch2011: import line number fix from trunk r24155 + +Index: Build/source/texk/web2c/luatexdir/tex/inputstack.w +=================================================================== +--- Build/source/texk/web2c/luatexdir/tex/inputstack.w (revision 24158) ++++ Build/source/texk/web2c/luatexdir/tex/inputstack.w (revision 24159) +@@ -307,12 +307,13 @@ + print_int(iname - 1); + print_char('>'); + }; +- } else if (iindex != in_open) { /* input from a pseudo file */ +- tprint_nl("l."); +- print_int(line_stack[iindex + 1]); + } else { + tprint_nl("l."); +- print_int(line); ++ if (iindex == in_open) { ++ print_int(line); ++ } else { /* input from a pseudo file */ ++ print_int(line_stack[iindex + 1]); ++ } + } + print_char(' '); + PSEUDO_PRINT_THE_LINE(); +Index: Build/source/texk/web2c/luatexdir/tex/printing.w +=================================================================== +--- Build/source/texk/web2c/luatexdir/tex/printing.w (revision 24158) ++++ Build/source/texk/web2c/luatexdir/tex/printing.w (revision 24159) +@@ -946,7 +946,7 @@ + if (level == in_open) + print_int(line); + else +- print_int(line_stack[iindex + 1 - (in_open - level)]); ++ print_int(line_stack[level + 1]); + tprint(": "); + } + } +Index: Build/source/texk/web2c/tex.ch +=================================================================== +--- Build/source/texk/web2c/tex.ch (revision 24158) ++++ Build/source/texk/web2c/tex.ch (revision 24159) +@@ -4532,7 +4532,7 @@ + else begin + print_nl (""); print (full_source_filename_stack[level]); print (":"); + if level=in_open then print_int (line) +- else print_int (line_stack[index+1-(in_open-level)]); ++ else print_int (line_stack[level+1]); + print (": "); + end; + end; +Index: Build/source/texk/web2c/tests/wprob.tex +=================================================================== +--- Build/source/texk/web2c/tests/wprob.tex (revision 0) ++++ Build/source/texk/web2c/tests/wprob.tex (revision 24159) +@@ -0,0 +1,15 @@ ++\catcode`\%=14 ++ ++\catcode`\{=1 ++\catcode`\}=2 ++\catcode`\#=6 ++ ++\def\err#1{% ++ \errmessage{Could not open file #1}% ++} ++\scantokens{ ++ \err{NoSuchFile.eps} ++} % The message above should be >>./wprob.tex:12: Could not open...<< ++\end ++ ++ + +Property changes on: Build/source/texk/web2c/tests/wprob.tex +___________________________________________________________________ +Added: svn:eol-style + + native + +Index: Build/source/texk/web2c/etexdir/wprob.test +=================================================================== +--- Build/source/texk/web2c/etexdir/wprob.test (revision 0) ++++ Build/source/texk/web2c/etexdir/wprob.test (revision 24159) +@@ -0,0 +1,14 @@ ++#! /bin/sh ++ ++# Copyright (C) 2011 Peter Breitenlohner ++# You may freely use, modify and/or distribute this file. ++ ++rm -rf wprob.* ++cp $srcdir/tests/wprob.tex . ++ ++TEXMFCNF=$srcdir/../kpathsea \ ++ ./etex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex ++ ++grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \ ++ wprob.log || exit 1 ++ +Index: Build/source/texk/web2c/etexdir/etex.ch +=================================================================== +--- Build/source/texk/web2c/etexdir/etex.ch (revision 24158) ++++ Build/source/texk/web2c/etexdir/etex.ch (revision 24159) +@@ -871,10 +871,9 @@ + @x [22] m.313 l.6809 - e-TeX scan_tokens + else begin print_nl("l."); print_int(line); + @y +-else if index<>in_open then {input from a pseudo file} +- begin print_nl("l."); print_int(line_stack[index+1]); +- end +-else begin print_nl("l."); print_int(line); ++else begin print_nl("l."); ++ if index=in_open then print_int(line) ++ else print_int(line_stack[index+1]); {input from a pseudo file} + @z + %--------------------------------------- + @x [22] m.314 l.6831 - e-TeX basic +Index: Build/source/texk/web2c/alephdir/eobase.ch +=================================================================== +--- Build/source/texk/web2c/alephdir/eobase.ch (revision 24158) ++++ Build/source/texk/web2c/alephdir/eobase.ch (revision 24159) +@@ -805,10 +805,9 @@ + @x [22] m.313 l.6794 - e-TeX scan_tokens + else begin print_nl("l."); print_int(line); + @y +-else if index<>in_open then {input from a pseudo file} +- begin print_nl("l."); print_int(line_stack[index+1]); +- end +-else begin print_nl("l."); print_int(line); ++else begin print_nl("l."); ++ if index=in_open then print_int(line) ++ else print_int(line_stack[index+1]); {input from a pseudo file} + @z + %--------------------------------------- + @x [22] m.314 l.6814 - e-TeX basic +Index: Build/source/texk/web2c/alephdir/com16bit.ch +=================================================================== +--- Build/source/texk/web2c/alephdir/com16bit.ch (revision 24158) ++++ Build/source/texk/web2c/alephdir/com16bit.ch (revision 24159) +@@ -2784,7 +2784,7 @@ + else begin + print_nl (""); print (full_source_filename_stack[level]); print (":"); + if level=in_open then print_int (line) +- else print_int (line_stack[index+1-(in_open-level)]); ++ else print_int (line_stack[level+1]); + print (": "); + end; + end; +Index: Build/source/texk/web2c/pdftexdir/wprob.test +=================================================================== +--- Build/source/texk/web2c/pdftexdir/wprob.test (revision 0) ++++ Build/source/texk/web2c/pdftexdir/wprob.test (revision 24159) +@@ -0,0 +1,14 @@ ++#! /bin/sh ++ ++# Copyright (C) 2011 Peter Breitenlohner ++# You may freely use, modify and/or distribute this file. ++ ++rm -rf wprob.* ++cp $srcdir/tests/wprob.tex . ++ ++TEXMFCNF=$srcdir/../kpathsea \ ++ ./pdftex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex ++ ++grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \ ++ wprob.log || exit 1 ++ diff --git a/office/texlive/branch2011/05-update_README.branch2011.patch b/office/texlive/branch2011/05-update_README.branch2011.patch new file mode 100644 index 0000000000..e061114360 --- /dev/null +++ b/office/texlive/branch2011/05-update_README.branch2011.patch @@ -0,0 +1,35 @@ +r24160 | karl | 2011-09-30 23:24:53 +0000 (Fri, 30 Sep 2011) | 1 line + +update README.branch2011 + +Index: Build/source/README.branch2011 +=================================================================== +--- Build/source/README.branch2011 (revision 24159) ++++ Build/source/README.branch2011 (revision 24160) +@@ -4,6 +4,21 @@ + This file records commits made to the bug-fix branch (only). + + ------------------------------------------------------------------------ ++r24159 | karl | 2011-10-01 01:23:37 +0200 (Sat, 01 Oct 2011) | 1 line ++Changed paths: ++ M /branches/branch2011/Build/source/texk/web2c/alephdir/com16bit.ch ++ M /branches/branch2011/Build/source/texk/web2c/alephdir/eobase.ch ++ M /branches/branch2011/Build/source/texk/web2c/etexdir/etex.ch ++ A /branches/branch2011/Build/source/texk/web2c/etexdir/wprob.test ++ M /branches/branch2011/Build/source/texk/web2c/luatexdir/tex/inputstack.w ++ M /branches/branch2011/Build/source/texk/web2c/luatexdir/tex/printing.w ++ A /branches/branch2011/Build/source/texk/web2c/pdftexdir/wprob.test ++ A /branches/branch2011/Build/source/texk/web2c/tests/wprob.tex ++ M /branches/branch2011/Build/source/texk/web2c/tex.ch ++ ++branch2011: import line number fix from trunk r24155 ++ ++------------------------------------------------------------------------ + r23716 | karl | 2011-08-27 01:29:30 +0200 (Sat, 27 Aug 2011) | 1 line + Changed paths: + M /branches/branch2011/Build/source/texk/web2c/synctexdir/ChangeLog +@@ -19,4 +34,3 @@ + M /branches/branch2011/Build/source/texk/web2c/xetexdir/xetex.ch + + branch2011: import off-by-one fix for enctex/xetex initialization (original r23187, see also email http://tug.org/pipermail/tldistro/2011q3/000120.html) +------------------------------------------------------------------------- diff --git a/office/texlive/branch2011/06-buffer_overrun_fix_from_r24337.patch b/office/texlive/branch2011/06-buffer_overrun_fix_from_r24337.patch new file mode 100644 index 0000000000..e54389c0a1 --- /dev/null +++ b/office/texlive/branch2011/06-buffer_overrun_fix_from_r24337.patch @@ -0,0 +1,17 @@ +r24346 | karl | 2011-10-20 23:50:28 +0000 (Thu, 20 Oct 2011) | 1 line + +branch2011: import buffer overrun fix from trunk r24337 + +Index: Build/source/texk/dvipsk/dospecial.c +=================================================================== +--- Build/source/texk/dvipsk/dospecial.c (revision 24345) ++++ Build/source/texk/dvipsk/dospecial.c (revision 24346) +@@ -112,7 +112,7 @@ + fgetboundingbox(char *f, float *llx_p, float *lly_p, float *urx_p, float *ury_p) + { + FILE *fp; +- char buf[BUFSIZ]; ++ char buf[BUFSIZ+1]; + + fp = search(figpath, f, READ); + if (fp == 0) diff --git a/office/texlive/branch2011/07-fix_memory_corruption_from_r23592.patch b/office/texlive/branch2011/07-fix_memory_corruption_from_r23592.patch new file mode 100644 index 0000000000..e466312c28 --- /dev/null +++ b/office/texlive/branch2011/07-fix_memory_corruption_from_r23592.patch @@ -0,0 +1,49 @@ +r24347 | karl | 2011-10-20 23:54:25 +0000 (Thu, 20 Oct 2011) | 1 line + +branch2011: import memory corruption, part of r23592, per Hironori Kitagawa, 19 Oct 2011 07:44:35 + +Index: Build/source/texk/web2c/ptexdir/ptex-base.ch +=================================================================== +--- Build/source/texk/web2c/ptexdir/ptex-base.ch (revision 24346) ++++ Build/source/texk/web2c/ptexdir/ptex-base.ch (revision 24347) +@@ -5855,6 +5855,9 @@ + var @!jc:KANJI_code; {temporary register for KANJI} + @!sp,@!mp,@!ep:pointer; + begin@/ ++if f=null_font then ++ begin get_jfm_pos:=kchar_type(null_font)(0); return; ++ end; + jc:=toDVI(kcode); + sp:=1; { start position } + ep:=font_num_ext[f]-1; { end position } +@@ -6684,11 +6687,13 @@ + goto main_loop_j+3; + @# + main_loop_j+1: space_factor:=1000; +- fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l; +- link(tail):=main_p; tail:=main_p; last_jchr:=tail; +- fast_get_avail(main_p); info(main_p):=KANJI(cur_chr); +- link(tail):=main_p; tail:=main_p; +- cx:=cur_chr; @; ++ if main_f<>null_font then ++ begin fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l; ++ link(tail):=main_p; tail:=main_p; last_jchr:=tail; ++ fast_get_avail(main_p); info(main_p):=KANJI(cur_chr); ++ link(tail):=main_p; tail:=main_p; ++ cx:=cur_chr; @; ++ end; + ins_kp:=false; + again_2: + get_next; +@@ -6724,7 +6729,10 @@ + @# + main_loop_j+3: + if ins_kp=true then @; +- @; ++ if main_f<>null_font then ++ begin @; ++ end ++ else inhibit_glue_flag:=false; + if ins_kp=false then begin { Kanji -> Kanji } + goto main_loop_j+1; + end else if ins_kp=true then begin { Kanji -> Ascii } diff --git a/office/texlive/branch2011/08-e-ptex_fixes_from_r23688.patch b/office/texlive/branch2011/08-e-ptex_fixes_from_r23688.patch new file mode 100644 index 0000000000..36e4dd2d3c --- /dev/null +++ b/office/texlive/branch2011/08-e-ptex_fixes_from_r23688.patch @@ -0,0 +1,61 @@ +r24348 | karl | 2011-10-20 23:59:55 +0000 (Thu, 20 Oct 2011) | 1 line + +branch2011: import e-ptex fixes from trunk r23688 + +Index: Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0 +=================================================================== +--- Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0 (revision 24347) ++++ Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0 (revision 24348) +@@ -1,4 +1,4 @@ +-Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr ++Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr + + This file is part of the SyncTeX package. + +@@ -82,21 +82,11 @@ + link(prev_p):=p; + @z + +-@x etex.ch l.4126 +- if is_char_node(p) then r:=get_avail +- else case type(p) of ++@x etex.ch l.4186 + hlist_node,vlist_node: begin r:=get_node(box_node_size); +- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words} +- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|} +- end; + @y +- if is_char_node(p) then r:=get_avail +- else case type(p) of + hlist_node,vlist_node: begin r:=get_node(box_node_size); + @; +- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words} +- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|} +- end; + @z + + @x synctex-e-mem.ch0 l.100 +Index: Build/source/texk/web2c/eptexdir/eptex.ech +=================================================================== +--- Build/source/texk/web2c/eptexdir/eptex.ech (revision 24347) ++++ Build/source/texk/web2c/eptexdir/eptex.ech (revision 24348) +@@ -283,6 +283,19 @@ + othercases goto next_p + @z + ++@x e-pTeX: just_copy ++ hlist_node,vlist_node: begin r:=get_node(box_node_size); ++@y ++ dir_node, ++ hlist_node,vlist_node: begin r:=get_node(box_node_size); ++@z ++@x e-pTeX: just_copy ++ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|} ++@y ++ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|} ++ add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r)); ++@z ++ + @x e-pTeX: ifcsname l.28620 + buffer[m]:=info(p) mod @'400; incr(m); p:=link(p); + @y diff --git a/office/texlive/branch2011/09-update_branch_log.patch b/office/texlive/branch2011/09-update_branch_log.patch new file mode 100644 index 0000000000..a80c42dcfd --- /dev/null +++ b/office/texlive/branch2011/09-update_branch_log.patch @@ -0,0 +1,38 @@ +r24349 | karl | 2011-10-21 00:04:02 +0000 (Fri, 21 Oct 2011) | 1 line + +update branch log + +Index: Build/source/README.branch2011 +=================================================================== +--- Build/source/README.branch2011 (revision 24348) ++++ Build/source/README.branch2011 (revision 24349) +@@ -2,8 +2,29 @@ + Public domain. Originally written 2011 by Karl Berry. + + This file records commits made to the bug-fix branch (only). ++------------------------------------------------------------------------ ++r24348 | karl | 2011-10-21 01:59:55 +0200 (Fri, 21 Oct 2011) | 1 line ++Changed paths: ++ M /branches/branch2011/Build/source/texk/web2c/eptexdir/eptex.ech ++ M /branches/branch2011/Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0 + ++branch2011: import e-ptex fixes from trunk r23688 ++ + ------------------------------------------------------------------------ ++r24347 | karl | 2011-10-21 01:54:25 +0200 (Fri, 21 Oct 2011) | 1 line ++Changed paths: ++ M /branches/branch2011/Build/source/texk/web2c/ptexdir/ptex-base.ch ++ ++branch2011: import memory corruption, part of r23592, per Hironori Kitagawa, 19 Oct 2011 07:44:35 ++ ++------------------------------------------------------------------------ ++r24346 | karl | 2011-10-21 01:50:28 +0200 (Fri, 21 Oct 2011) | 1 line ++Changed paths: ++ M /branches/branch2011/Build/source/texk/dvipsk/dospecial.c ++ ++branch2011: import buffer overrun fix from trunk r24337 ++ ++------------------------------------------------------------------------ + r24159 | karl | 2011-10-01 01:23:37 +0200 (Sat, 01 Oct 2011) | 1 line + Changed paths: + M /branches/branch2011/Build/source/texk/web2c/alephdir/com16bit.ch diff --git a/office/texlive/branch2011/10-luatex_array_fix_from_r24353.patch b/office/texlive/branch2011/10-luatex_array_fix_from_r24353.patch new file mode 100644 index 0000000000..d2fadb9d10 --- /dev/null +++ b/office/texlive/branch2011/10-luatex_array_fix_from_r24353.patch @@ -0,0 +1,35 @@ +r24363 | karl | 2011-10-22 23:08:32 +0000 (Sat, 22 Oct 2011) | 1 line + +branch2011: import luatex array fix from trunk r24353 + +Index: Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c +=================================================================== +--- Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c (revision 24362) ++++ Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c (revision 24363) +@@ -385,7 +385,7 @@ + wrapper->top = io; + } + +-static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp) { ++static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp, const size_t bsize) { + _IO *io = wrapper->top, *iop; + int wasstopped; + +@@ -396,7 +396,7 @@ + free(io); + if ( wasstopped ) { + wrapper->top = iop; +- if ( sp<(int)(sizeof(stack)/sizeof(stack[0])) ) { ++ if ( sp<(int)bsize ) { + stack[sp].type = ps_bool; + stack[sp++].u.tf = true; + } +@@ -1609,7 +1609,7 @@ + } + break; + case pt_stop: +- sp = ioescapestopped(wrapper,stack,sp); ++ sp = ioescapestopped(wrapper,stack,sp,sizeof(stack)/sizeof(stack[0])); + break; + case pt_load: + if ( sp>=1 && stack[sp-1].type==ps_lit ) { diff --git a/office/texlive/branch2011/11-update_branch_log.patch b/office/texlive/branch2011/11-update_branch_log.patch new file mode 100644 index 0000000000..48fa9dc489 --- /dev/null +++ b/office/texlive/branch2011/11-update_branch_log.patch @@ -0,0 +1,22 @@ +r24364 | karl | 2011-10-22 23:09:20 +0000 (Sat, 22 Oct 2011) | 1 line + +update branch log + +Index: Build/source/README.branch2011 +=================================================================== +--- Build/source/README.branch2011 (revision 24363) ++++ Build/source/README.branch2011 (revision 24364) +@@ -3,6 +3,13 @@ + + This file records commits made to the bug-fix branch (only). + ------------------------------------------------------------------------ ++r24363 | karl | 2011-10-23 01:08:32 +0200 (Sun, 23 Oct 2011) | 1 line ++Changed paths: ++ M /branches/branch2011/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c ++ ++branch2011: import luatex array fix from trunk r24353 ++ ++------------------------------------------------------------------------ + r24348 | karl | 2011-10-21 01:59:55 +0200 (Fri, 21 Oct 2011) | 1 line + Changed paths: + M /branches/branch2011/Build/source/texk/web2c/eptexdir/eptex.ech diff --git a/office/texlive/branch2011/README b/office/texlive/branch2011/README index 810c29a236..8ba12fddea 100644 --- a/office/texlive/branch2011/README +++ b/office/texlive/branch2011/README @@ -3,3 +3,7 @@ TeXLive 2011 Thanks to Karl Berry and the other TeXLive contributors for agreeing to maintain this and for linking it at http://tug.org/texlive/distro.html + +From an svn checkout, something like this will generate patches: + svn diff diff -r from#####:to##### > patchname + diff --git a/office/texlive/branch2011/off-by-one-fix-for-enctex-xetex.patch b/office/texlive/branch2011/off-by-one-fix-for-enctex-xetex.patch deleted file mode 100644 index e629dd3962..0000000000 --- a/office/texlive/branch2011/off-by-one-fix-for-enctex-xetex.patch +++ /dev/null @@ -1,30 +0,0 @@ -r23740 | karl | 2011-08-29 00:14:50 +0000 (Mon, 29 Aug 2011) | 1 line - -branch2011: import off-by-one fix for enctex/xetex initialization (original r23187, see also email http://tug.org/pipermail/tldistro/2011q3/000120.html) - -Index: Build/source/texk/web2c/xetexdir/xetex.ch -=================================================================== ---- Build/source/texk/web2c/xetexdir/xetex.ch (revision 23739) -+++ Build/source/texk/web2c/xetexdir/xetex.ch (revision 23740) -@@ -328,7 +328,7 @@ - {Initialize enc\TeX\ data.} - for i:=0 to 255 do mubyte_read[i]:=null; - for i:=0 to 255 do mubyte_write[i]:=0; --for i:=0 to 128 do mubyte_cswrite[i]:=null; -+for i:=0 to 127 do mubyte_cswrite[i]:=null; - mubyte_keep := 0; mubyte_start := false; - write_noexpanding := false; cs_converting := false; - special_printing := false; message_printing := false; -Index: Build/source/texk/web2c/enctex.ch -=================================================================== ---- Build/source/texk/web2c/enctex.ch (revision 23739) -+++ Build/source/texk/web2c/enctex.ch (revision 23740) -@@ -42,7 +42,7 @@ - {Initialize enc\TeX\ data.} - for i:=0 to 255 do mubyte_read[i]:=null; - for i:=0 to 255 do mubyte_write[i]:=0; --for i:=0 to 128 do mubyte_cswrite[i]:=null; -+for i:=0 to 127 do mubyte_cswrite[i]:=null; - mubyte_keep := 0; mubyte_start := false; - write_noexpanding := false; cs_converting := false; - special_printing := false; message_printing := false; diff --git a/office/texlive/branch2011/synctex-coordinate-fix.patch b/office/texlive/branch2011/synctex-coordinate-fix.patch deleted file mode 100644 index 873175896a..0000000000 --- a/office/texlive/branch2011/synctex-coordinate-fix.patch +++ /dev/null @@ -1,70 +0,0 @@ -r23716 | karl | 2011-08-26 23:29:30 +0000 (Fri, 26 Aug 2011) | 1 line - -branch2011: import synctex coordinate fix from trunk r23644 - -Index: Build/source/texk/web2c/synctexdir/synctex-luatex.h -=================================================================== ---- Build/source/texk/web2c/synctexdir/synctex-luatex.h (revision 23715) -+++ Build/source/texk/web2c/synctexdir/synctex-luatex.h (revision 23716) -@@ -1,6 +1,6 @@ - /* synctex-luatex.h - -- Copyright (c) 2010 Taco Hoekwater -+ Copyright (c) 2010, 2011 Taco Hoekwater - - This file is part of LuaTeX. - -@@ -50,9 +50,12 @@ - #define SYNCTEX_HEIGHT(NODE) height(NODE) - #define SYNCTEX_VALUE int_par(synctex_code) - --#define SYNCTEX_CURV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v) --#define SYNCTEX_CURH static_pdf->posstruct->pos.h -+#define SYNCTEX_CURVV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v) -+#define SYNCTEX_CURHH static_pdf->posstruct->pos.h - -+#define SYNCTEX_CURV (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURVV:SYNCTEX_CURVV-4736287) -+#define SYNCTEX_CURH (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURHH:SYNCTEX_CURHH-4736287) -+ - #define SYNCTEX_GET_JOB_NAME() makecstring(job_name) - #define SYNCTEX_GET_LOG_NAME() get_full_log_name() - -Index: Build/source/texk/web2c/synctexdir/ChangeLog -=================================================================== ---- Build/source/texk/web2c/synctexdir/ChangeLog (revision 23715) -+++ Build/source/texk/web2c/synctexdir/ChangeLog (revision 23716) -@@ -1,3 +1,8 @@ -+2011-08-22 Akira Kakuto -+ -+ * synctex-luatex.h, synctex-xetex.h: Define SYNCTEX_CURH and -+ SYNCTEX_CURH to yield correct coordinates in dvi and pdf mode. -+ - 2011-06-11 Akira Kakuto - - * synctex_parser_utils.c: fix a typo. -Index: Build/source/texk/web2c/synctexdir/synctex-xetex.h -=================================================================== ---- Build/source/texk/web2c/synctexdir/synctex-xetex.h (revision 23715) -+++ Build/source/texk/web2c/synctexdir/synctex-xetex.h (revision 23716) -@@ -1,9 +1,9 @@ - /* --Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr -+Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr - - This file is part of the SyncTeX package. - --Latest Revision: Wed Jul 1 11:16:29 UTC 2009 -+Latest Revision: Wed Aug 22 07:20:29 UTC 2011 - - License: - -------- -@@ -57,6 +57,9 @@ - # define SYNCTEX_OFFSET_IS_PDF (nopdfoutput==0) - # define SYNCTEX_OUTPUT (nopdfoutput!=0?"xdv":"pdf") - -+#define SYNCTEX_CURH ((nopdfoutput==0)?(curh+4736287):curh) -+#define SYNCTEX_CURV ((nopdfoutput==0)?(curv+4736287):curv) -+ - /* WARNING: - The definition below must be in sync with their eponym declarations in synctex-xetex.ch1 - */ diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild index 73f13598a7..abd351312b 100644 --- a/office/texlive/texlive.SlackBuild +++ b/office/texlive/texlive.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=texlive VERSION=20110705 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} SOURCE_VERS=$VERSION @@ -82,8 +82,17 @@ find . \ # Thanks to Karl Berry and the other TeXLive devs for agreeing to the extra # work required to maintain a -stable branch of each release # http://tug.org/svn/texlive/branches/branch2011 -patch -p2 < $CWD/branch2011/off-by-one-fix-for-enctex-xetex.patch -patch -p2 < $CWD/branch2011/synctex-coordinate-fix.patch +patch -p2 < $CWD/branch2011/01-off-by-one-fix-for-enctex-xetex.patch +patch -p2 < $CWD/branch2011/02-synctex-coordinate-fix.patch +patch -p2 < $CWD/branch2011/03-create-README.branch2011.patch +patch -p2 < $CWD/branch2011/04-line_number_fix_from_r24155.patch +patch -p2 < $CWD/branch2011/05-update_README.branch2011.patch +patch -p2 < $CWD/branch2011/06-buffer_overrun_fix_from_r24337.patch +patch -p2 < $CWD/branch2011/07-fix_memory_corruption_from_r23592.patch +patch -p2 < $CWD/branch2011/08-e-ptex_fixes_from_r23688.patch +patch -p2 < $CWD/branch2011/09-update_branch_log.patch +patch -p2 < $CWD/branch2011/10-luatex_array_fix_from_r24353.patch +patch -p2 < $CWD/branch2011/11-update_branch_log.patch # Thanks to Peter Berntsen for the problem report and fix patch -p1 < $CWD/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff @@ -95,7 +104,6 @@ patch -p1 < $CWD/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff # that are automatically created will be correct... # Building with --without-etex as it is something for eclipse -# Building with --disable-xindy as it requires shared libsigsegv # Building with "--without-system-xpdf" because poppler API changes too often TL_BUILD_ENV="CFLAGS=\"$SLKCFLAGS\" CXXFLAGS=\"$SLKCFLAGS\"" \ @@ -106,8 +114,9 @@ TL_CONFIGURE_ARGS="\ --disable-static \ --with-x \ --without-etex \ - --disable-xindy \ --without-system-xpdf \ + --enable-xindy \ + --with-clisp-runtime=system \ --with-system-ncurses \ --with-system-zlib \ --with-system-libpng \ -- cgit v1.2.3