Archives
Archives
| From: | "Alexis Ballier (aballier)" <aballier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo commit in src/patchsets/texlive/2011/texlive-core: 130_all_zlib126.patch series |
| Date: | Mon, 13 Feb 2012 11:36:22 |
| Message-Id: | 20120213113612.D30762004B@flycatcher.gentoo.org |
| 1 | aballier 12/02/13 11:36:12 |
| 2 | |
| 3 | Modified: series |
| 4 | Added: 130_all_zlib126.patch |
| 5 | Log: |
| 6 | fix xetex with zlib 1.2.6, bug #401763 |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.5 src/patchsets/texlive/2011/texlive-core/series |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/series?rev=1.5&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/series?rev=1.5&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/series?r1=1.4&r2=1.5 |
| 14 | |
| 15 | Index: series |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2011/texlive-core/series,v |
| 18 | retrieving revision 1.4 |
| 19 | retrieving revision 1.5 |
| 20 | diff -u -r1.4 -r1.5 |
| 21 | --- series 2 Nov 2011 19:53:11 -0000 1.4 |
| 22 | +++ series 13 Feb 2012 11:36:12 -0000 1.5 |
| 23 | @@ -2,3 +2,4 @@ |
| 24 | 040_all_texmfdirs.patch |
| 25 | 080_all_a2ping_invocation.patch |
| 26 | 120_all_noasmpic.patch |
| 27 | +130_all_zlib126.patch |
| 28 | |
| 29 | |
| 30 | |
| 31 | 1.1 src/patchsets/texlive/2011/texlive-core/130_all_zlib126.patch |
| 32 | |
| 33 | file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/130_all_zlib126.patch?rev=1.1&view=markup |
| 34 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2011/texlive-core/130_all_zlib126.patch?rev=1.1&content-type=text/plain |
| 35 | |
| 36 | Index: 130_all_zlib126.patch |
| 37 | =================================================================== |
| 38 | http://sourceforge.net/tracker/?func=detail&aid=3484935&group_id=194926&atid=951385 |
| 39 | Date: 2012-02-10 16:22:57 PST |
| 40 | Sender: drkp |
| 41 | |
| 42 | We also ran into this issue with MacPorts: |
| 43 | http://trac.macports.org/ticket/33164 |
| 44 | |
| 45 | The problem is that zlib 1.2.6 fixed the behavior of gzeof() to match that |
| 46 | of feof(), but xetex relies on the old behavior when checking if a format |
| 47 | file is valid. Accordingly, it rejects all formats as invalid. |
| 48 | |
| 49 | This patch removes the offending check; it makes xetex work fine with zlib |
| 50 | 1.2.6: |
| 51 | http://svn.macports.org/repository/macports/trunk/dports/tex/texlive-bin/files/patch-texk_web2c_xetexdir_xetex.ch.diff |
| 52 | |
| 53 | https://bugs.gentoo.org/show_bug.cgi?id=401763 |
| 54 | |
| 55 | Index: texlive-20110705-source/texk/web2c/xetexdir/xetex.ch |
| 56 | =================================================================== |
| 57 | --- texlive-20110705-source.orig/texk/web2c/xetexdir/xetex.ch |
| 58 | +++ texlive-20110705-source/texk/web2c/xetexdir/xetex.ch |
| 59 | @@ -6944,7 +6944,6 @@ if (x<>69069)or feof(fmt_file) then goto |
| 60 | @y |
| 61 | undump_int(x); |
| 62 | if (x<>69069) then goto bad_fmt; |
| 63 | -if not w_eof(fmt_file) then goto bad_fmt |
| 64 | @z |
| 65 | |
| 66 | @x |