diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/texinfo/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/texinfo/files')
-rw-r--r-- | sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch | 17 | ||||
-rw-r--r-- | sys-apps/texinfo/files/texinfo-4.13-docbook.patch | 66 | ||||
-rw-r--r-- | sys-apps/texinfo/files/texinfo-4.13-texi2dvi-regexp-range.patch | 23 | ||||
-rw-r--r-- | sys-apps/texinfo/files/texinfo-4.13-tinfo.patch | 24 | ||||
-rw-r--r-- | sys-apps/texinfo/files/texinfo-4.13-xz.patch | 130 |
5 files changed, 260 insertions, 0 deletions
diff --git a/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch b/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch new file mode 100644 index 000000000000..ad470faf0d47 --- /dev/null +++ b/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch @@ -0,0 +1,17 @@ +Fails in UTF-8 locales with grep-2.6 + +https://bugs.gentoo.org/322151 +https://savannah.gnu.org/bugs/index.php?31068 + +--- a/makeinfo/tests/accentenc ++++ b/makeinfo/tests/accentenc +@@ -1,7 +1,8 @@ + #!/bin/sh + # Test encoded accent info output. + +-unset TEXINFO_OUTPUT ++unset TEXINFO_OUTPUT LANG LANGUAGE ++LC_ALL=POSIX; export LC_ALL + : ${srcdir=.} + input=`basename $0`.txi + output=`basename $0`.info diff --git a/sys-apps/texinfo/files/texinfo-4.13-docbook.patch b/sys-apps/texinfo/files/texinfo-4.13-docbook.patch new file mode 100644 index 000000000000..0622b94f987b --- /dev/null +++ b/sys-apps/texinfo/files/texinfo-4.13-docbook.patch @@ -0,0 +1,66 @@ +--- texinfo-4.13.orig/makeinfo/cmds.c 2008-05-22 05:11:34.000000000 -0700 ++++ texinfo-4.13/makeinfo/cmds.c 2012-05-23 18:31:57.108264307 -0700 +@@ -1560,7 +1560,7 @@ cm_setfilename (void) + char *filename; + get_rest_of_line (1, &filename); + /* warning ("`@%s %s' encountered and ignored", command, filename); */ +- if (xml) ++ if (xml && !docbook) + add_word_args ("<setfilename>%s</setfilename>", filename); + free (filename); + } +--- texinfo-4.13.orig/makeinfo/node.c 2008-07-05 16:59:47.000000000 -0700 ++++ texinfo-4.13/makeinfo/node.c 2012-05-23 17:02:46.517345024 -0700 +@@ -1233,10 +1233,12 @@ cm_anchor (int arg) + } + else if (xml || docbook) + { ++ char *id = xml_id(anchor); + xml_insert_element_with_attribute (ANCHOR, START, + docbook ? "id=\"%s\"" : "name=\"%s\"", +- anchor); ++ id); + xml_insert_element (ANCHOR, END); ++ free(id); + } + + /* Save it in the tag table. */ +--- texinfo-4.13.orig/makeinfo/xml.c 2008-02-12 17:00:55.000000000 -0800 ++++ texinfo-4.13/makeinfo/xml.c 2012-05-23 17:20:13.698858895 -0700 +@@ -586,21 +586,27 @@ static int in_indexterm = 0; + char * + xml_id (char *id) + { +- char *tem = xmalloc (strlen (id) + 1); ++ /* Get an extra space to accomodate adding an i-prefix. */ ++ char *tem = xmalloc (strlen (id) + 2); + char *p = tem; +- strcpy (tem, id); ++ ++ /* First character cannot be a number, '-' or '.'. Just always add ++ an i if we're not starting with a alphanumeric character ++ already, to simplify the code. ++ */ ++ if (!isalpha(*id)) ++ { ++ *p++ = 'i'; ++ } ++ ++ strcpy (p, id); ++ + while (*p) + { +- if (strchr (":\" \t\f\r\n", *p)) ++ if (!isalnum (*p) && !strchr (":_.-", *p)) + *p = '-'; + p++; + } +- p = tem; +- +- /* First character cannot be a number. Clearly we should make this +- dependent on the actual numeral found. */ +- if (strchr ("0123456789", *p)) +- *p = 'i'; + + return tem; + } diff --git a/sys-apps/texinfo/files/texinfo-4.13-texi2dvi-regexp-range.patch b/sys-apps/texinfo/files/texinfo-4.13-texi2dvi-regexp-range.patch new file mode 100644 index 000000000000..01b0746defa5 --- /dev/null +++ b/sys-apps/texinfo/files/texinfo-4.13-texi2dvi-regexp-range.patch @@ -0,0 +1,23 @@ +Fix texi2dvi problem with egrep in some locales. +This patch is taken from the texinfo CVS repository, but stripped of +keyword substitutions to make it apply to a wider range of source code +revisions. + +Fix suggested by Martin von Gagern on 2010-03-29, committed by Karl Berry. + +References: +http://bugs.gentoo.org/311885 +http://thread.gmane.org/gmane.comp.tex.texinfo.bugs/5023 +http://cvs.savannah.gnu.org/viewvc/texinfo/util/texi2dvi?root=texinfo&r1=1.157&r2=1.158 + +--- util/texi2dvi 2010/02/09 18:37:08 1.157 ++++ util/texi2dvi 2010/03/30 23:13:37 1.158 +@@ -1848,7 +1848,7 @@ + + # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex), + # prepend `./' in order to avoid that the tools take it as an option. +- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \ ++ echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \ + || command_line_filename="./$command_line_filename" + + # See if the file exists. If it doesn't we're in trouble since, even diff --git a/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch b/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch new file mode 100644 index 000000000000..10a557a303dd --- /dev/null +++ b/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/457556 + +--- configure.ac ++++ configure.ac +@@ -130,7 +130,7 @@ + # rather ncurses. So we check for it. + TERMLIBS= + # Check for termlib before termcap because Solaris termcap needs libucb. +-TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" ++TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" + for termlib in ${TERMLIB_VARIANTS}; do + AC_CHECK_LIB(${termlib}, tgetent, + [TERMLIBS="${TERMLIBS} -l${termlib}"; break]) +--- configure ++++ configure +@@ -17477,7 +17477,7 @@ + # rather ncurses. So we check for it. + TERMLIBS= + # Check for termlib before termcap because Solaris termcap needs libucb. +-TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" ++TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" + for termlib in ${TERMLIB_VARIANTS}; do + as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5 diff --git a/sys-apps/texinfo/files/texinfo-4.13-xz.patch b/sys-apps/texinfo/files/texinfo-4.13-xz.patch new file mode 100644 index 000000000000..f5bb023be559 --- /dev/null +++ b/sys-apps/texinfo/files/texinfo-4.13-xz.patch @@ -0,0 +1,130 @@ +https://bugs.gentoo.org/269742 + +From bfae00d02b5fb3a2ce34c09d2dbf0ca2f96b154f Mon Sep 17 00:00:00 2001 +From: Karl Berry <karl@gnu.org> +Date: Sat, 14 Mar 2009 17:57:41 +0000 +Subject: [PATCH] support xz compression, http://tukaani.org/xz + +--- + ChangeLog | 6 ++++++ + NEWS | 4 ++++ + doc/info-stnd.texi | 34 +++++++++++++++++----------------- + info/filesys.c | 1 + + install-info/install-info.c | 29 +++++++++++++++++++++++++---- + 5 files changed, 53 insertions(+), 21 deletions(-) + +2009-03-14 Karl Berry <karl@gnu.org> + + * info/filesys.c (compress_suffixes): add .xz/unxz. + + * info/filesys.h (DEFAULT_INFOPATH): include PATH by default. + +diff --git a/doc/info-stnd.texi b/doc/info-stnd.texi +index 2bd67f3..c730cff 100644 +--- a/doc/info-stnd.texi ++++ b/doc/info-stnd.texi +@@ -202,21 +202,21 @@ directory. + @cindex Info files, compressed + In every directory Info tries, if @var{filename} is not found, Info + looks for it with a number of known extensions of Info files@footnote{ +-@file{.info}, @file{-info}, @file{/index}, and @file{.inf}.}. For every +-known extension, Info looks for a compressed file, if a regular file +-isn't found. Info supports files compressed with @code{gzip}, +-@code{bzip2}, @code{compress} and @code{yabba} programs; it calls +-@code{gunzip}, @code{bunzip2}, @code{uncompress} and @code{unyabba}, +-accordingly, to decompress such files. Compressed Info files are +-assumed to have @file{.z}, @file{.gz}, @file{.bz2}, @file{.Z}, or +-@file{.Y} extensions, possibly in addition to one of the known Info +-files extensions@footnote{The MS-DOS version allows for the Info +-extension, such as @code{.inf}, and the short compressed file +-extensions, such as @file{.z} and @file{.gz}, to be merged into a single +-extension, since DOS doesn't allow more than a single dot in the +-basename of a file. Thus, on MS-DOS, if Info looks for @file{bison}, +-file names like @file{bison.igz} and @file{bison.inz} will be found and +-decompressed by @code{gunzip}.}. ++@file{.info}, @file{-info}, @file{/index}, and @file{.inf}.}. For ++every known extension, Info looks for a compressed file, if a regular ++file isn't found. Info supports files compressed with @code{gzip}, ++@code{xz}, @code{bzip2}, @code{lzma}, @code{compress} and @code{yabba} ++programs, assumed to have @file{.z}, @file{.gz}, @file{.xz}, ++@file{.bz2}, @file{.lzma}, @file{.Z}, or @file{.Y} extensions, ++possibly after one of the known Info files extensions. ++ ++On MS-DOS, Info allows for the Info extension, such as @code{.inf}, ++and the short compressed file extensions, such as @file{.z} and ++@file{.gz}, to be merged into a single extension, since DOS doesn't ++allow more than a single dot in the basename of a file. Thus, on ++MS-DOS, if Info looks for @file{bison}, file names like ++@file{bison.igz} and @file{bison.inz} will be found and decompressed ++by @code{gunzip}. + + @item --help + @itemx -h +diff --git a/info/filesys.c b/info/filesys.c +index fdd18a8..5e795bc 100644 +--- a/info/filesys.c ++++ b/info/filesys.c +@@ -55,6 +55,7 @@ static char *info_suffixes[] = { + + static COMPRESSION_ALIST compress_suffixes[] = { + { ".gz", "gunzip" }, ++ { ".xz", "unxz" }, + { ".bz2", "bunzip2" }, + { ".z", "gunzip" }, + { ".lzma", "unlzma" }, +diff --git a/install-info/install-info.c b/install-info/install-info.c +index 24669b3..0f18ca4 100644 +--- a/install-info/install-info.c ++++ b/install-info/install-info.c +@@ -400,6 +400,11 @@ strip_info_suffix (char *fname) + len -= 3; + ret[len] = 0; + } ++ else if (len > 3 && FILENAME_CMP (ret + len - 3, ".xz") == 0) ++ { ++ len -= 3; ++ ret[len] = 0; ++ } + else if (len > 4 && FILENAME_CMP (ret + len - 4, ".bz2") == 0) + { + len -= 4; +@@ -659,6 +664,12 @@ open_possibly_compressed_file (char *filename, + { + *opened_filename = concat (filename, ".gz", ""); + f = fopen (*opened_filename, FOPEN_RBIN); ++ } ++ if (!f) ++ { ++ *opened_filename = concat (filename, ".xz", ""); ++ f = fopen (*opened_filename, FOPEN_RBIN); ++ } + if (!f) + { + free (*opened_filename); +@@ -702,7 +712,6 @@ open_possibly_compressed_file (char *filename, + else + pfatal_with_name (filename); + } +- } + + /* Read first few bytes of file rather than relying on the filename. + If the file is shorter than this it can't be usable anyway. */ +@@ -727,6 +736,15 @@ open_possibly_compressed_file (char *filename, + #else + *compression_program = "gzip"; + #endif ++ ++ else if (data[0] == '\xFD' && data[1] == '7' && data[2] == 'z' ++ && data[3] == 'X' && data[4] == 'Z' && data[5] == 0) ++#ifndef STRIP_DOT_EXE ++ *compression_program = "xz.exe"; ++#else ++ *compression_program = "xz"; ++#endif ++ + else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h') + #ifndef STRIP_DOT_EXE + *compression_program = "bzip2.exe"; +-- +1.7.4.rc2 + |