| [f3547a3] | 1 | Submitted By: Jim Gifford <jim at cross-lfs dot org>
|
|---|
| 2 | Date: 2009-02-21
|
|---|
| 3 | Initial Package Version: 4.13a
|
|---|
| 4 | Upstream Status: Unknown
|
|---|
| 5 | Origin: Jim Gifford
|
|---|
| 6 | Description: For using xz compression
|
|---|
| 7 |
|
|---|
| 8 | diff -Naur texinfo-4.13.orig/doc/texinfo.txi texinfo-4.13/doc/texinfo.txi
|
|---|
| 9 | --- texinfo-4.13.orig/doc/texinfo.txi 2008-09-18 11:31:57.000000000 -0700
|
|---|
| 10 | +++ texinfo-4.13/doc/texinfo.txi 2009-02-22 19:41:37.874296689 -0800
|
|---|
| 11 | @@ -16488,6 +16488,7 @@
|
|---|
| 12 |
|
|---|
| 13 | @cindex Compressed dir files, reading
|
|---|
| 14 | @cindex Bzipped dir files, reading
|
|---|
| 15 | +@cindex XZ-compressed dir files, reading
|
|---|
| 16 | @cindex LZMA-compressed dir files, reading
|
|---|
| 17 | @cindex Dir files, compressed
|
|---|
| 18 | If any input file is compressed with @code{gzip} (@pxref{Top,,,gzip,
|
|---|
| 19 | @@ -16495,8 +16496,8 @@
|
|---|
| 20 | for reading. And if @var{dir-file} is compressed, @code{install-info}
|
|---|
| 21 | also automatically leaves it compressed after writing any changes.
|
|---|
| 22 | If @var{dir-file} itself does not exist, @code{install-info} tries to
|
|---|
| 23 | -open @file{@var{dir-file}.gz}, @file{@var{dir-file}.bz2}, and
|
|---|
| 24 | -@file{@var{dir-file}.lzma}, in that order.
|
|---|
| 25 | +open @file{@var{dir-file}.gz}, @file{@var{dir-file}.bz2},
|
|---|
| 26 | +@file{@var{dir-file}.xz} and @file{@var{dir-file}.lzma}, in that order.
|
|---|
| 27 |
|
|---|
| 28 | Options:
|
|---|
| 29 |
|
|---|
| 30 | diff -Naur texinfo-4.13.orig/info/filesys.c texinfo-4.13/info/filesys.c
|
|---|
| 31 | --- texinfo-4.13.orig/info/filesys.c 2008-06-12 05:39:20.000000000 -0700
|
|---|
| 32 | +++ texinfo-4.13/info/filesys.c 2009-02-22 19:41:37.874296689 -0800
|
|---|
| 33 | @@ -55,6 +55,7 @@
|
|---|
| 34 | static COMPRESSION_ALIST compress_suffixes[] = {
|
|---|
| 35 | { ".gz", "gunzip" },
|
|---|
| 36 | { ".bz2", "bunzip2" },
|
|---|
| 37 | + { ".xz", "unxz" },
|
|---|
| 38 | { ".lzma", "unlzma" },
|
|---|
| 39 | { ".z", "gunzip" },
|
|---|
| 40 | { ".Z", "uncompress" },
|
|---|
| 41 | diff -Naur texinfo-4.13.orig/install-info/install-info.c texinfo-4.13/install-info/install-info.c
|
|---|
| 42 | --- texinfo-4.13.orig/install-info/install-info.c 2008-05-22 05:11:33.000000000 -0700
|
|---|
| 43 | +++ texinfo-4.13/install-info/install-info.c 2009-02-22 19:41:37.874296689 -0800
|
|---|
| 44 | @@ -739,15 +739,20 @@
|
|---|
| 45 | #else
|
|---|
| 46 | *compression_program = "bzip";
|
|---|
| 47 | #endif
|
|---|
| 48 | + else if (data[0] == '\xFD' && data[1] == '7' && data[2] == 'z'
|
|---|
| 49 | + && data[3] == 'X' && data[4] == 'Z' && data[5] == 0x00)
|
|---|
| 50 | +#ifndef STRIP_DOT_EXE
|
|---|
| 51 | + *compression_program = "xz.exe";
|
|---|
| 52 | +#else
|
|---|
| 53 | + *compression_program = "xz";
|
|---|
| 54 | +#endif
|
|---|
| 55 | /* We (try to) match against old lzma format (which lacks proper
|
|---|
| 56 | - header, two first matches), as well as the new format (last match). */
|
|---|
| 57 | + header, two first matches). */
|
|---|
| 58 | else if ((data[9] == 0x00 && data[10] == 0x00 && data[11] == 0x00
|
|---|
| 59 | && data[12] == 0x00)
|
|---|
| 60 | || (data[5] == '\xFF' && data[6] == '\xFF' && data[7] == '\xFF'
|
|---|
| 61 | && data[8] == '\xFF' && data[9] == '\xFF' && data[10] == '\xFF'
|
|---|
| 62 | - && data[11] == '\xFF' && data[12] == '\xFF')
|
|---|
| 63 | - || (data[0] == '\xFF' && data[1] == 'L' && data[2] == 'Z'
|
|---|
| 64 | - && data[3] == 'M' && data[4] == 'A' && data[5] == 0x00))
|
|---|
| 65 | + && data[11] == '\xFF' && data[12] == '\xFF'))
|
|---|
| 66 | #ifndef STRIP_DOT_EXE
|
|---|
| 67 | *compression_program = "lzma.exe";
|
|---|
| 68 | #else
|
|---|
