diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-12-27 10:10:48 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 11:13:55 +0000 |
commit | 6a02acbc33fe5414db3908d283e1364fbb38b256 (patch) | |
tree | 0d95837536472bfa2f8cbc1703134d908dffbad8 /meta/recipes-extended/texinfo/texinfo-5.1 | |
parent | 663dad63a3a0807266e62c64525f4e66c5651308 (diff) | |
download | poky-6a02acbc33fe5414db3908d283e1364fbb38b256.tar.gz |
texinfo: Update to 5.2
Removed a backported patch
(From OE-Core rev: f85cf4b351e877b2679c85832d45ac398ab29b51)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/texinfo/texinfo-5.1')
7 files changed, 0 insertions, 377 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch deleted file mode 100644 index ab6f1658aa..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | We already DEPEND on the native texinfo being present before building so | ||
2 | there isn't any need to try and build the required native texinfo binaries | ||
3 | before cross-compiling. This simplifies the recipe somewhat! | ||
4 | |||
5 | Upstream-Status: Inappropriate oe specific | ||
6 | |||
7 | Signed-off-by: Joshua Lock <josh@linux.intel.com> | ||
8 | |||
9 | Index: texinfo-4.13/configure.ac | ||
10 | =================================================================== | ||
11 | --- texinfo-4.13.orig/configure.ac | ||
12 | +++ texinfo-4.13/configure.ac | ||
13 | @@ -100,29 +100,7 @@ AC_CANONICAL_BUILD | ||
14 | # $native_tools is also added to SUBDIRS in the main Makefile.am, | ||
15 | # so that make compiles the native tools first. | ||
16 | # | ||
17 | -if test "$cross_compiling" = no; then | ||
18 | - native_tools= | ||
19 | -else | ||
20 | - native_tools=tools | ||
21 | - test -d "$native_tools" || mkdir "$native_tools" | ||
22 | - confdir=`(cd "$srcdir";pwd)` | ||
23 | - # Make sure the secondary configure won't fail with | ||
24 | - # "error: source directory already configured". | ||
25 | - rm -f config.status | ||
26 | - AC_MSG_NOTICE([[Doing configure of native tools (${build}).]]) | ||
27 | - cd "$native_tools" || exit 1 | ||
28 | - # Run secondary configure in alternate environment or | ||
29 | - # it gets the wrong CC etc. | ||
30 | - # env -i gives this build host configure a clean environment; | ||
31 | - # consequently, we have to re-initialize $PATH. | ||
32 | - env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ | ||
33 | - PATH="$PATH" \ | ||
34 | - tools_only=1 \ | ||
35 | - ${confdir}/configure --build=${build} --host=${build} \ | ||
36 | - --disable-rpath --disable-nls | ||
37 | - cd .. || exit 1 | ||
38 | - AC_MSG_NOTICE([[Continuing with main configure (${host}).]]) | ||
39 | -fi | ||
40 | +native_tools= | ||
41 | AC_SUBST(native_tools) | ||
42 | AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) | ||
43 | |||
diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch deleted file mode 100644 index 6e216dac78..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | Upstream-Status: Inappropŕiate | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am | ||
5 | --- texinfo-5.1/doc/Makefile.am 2013-02-23 02:11:25.000000000 +0200 | ||
6 | +++ texinfo-5.1/doc/Makefile.am 2013-08-20 01:43:55.622376198 +0300 | ||
7 | @@ -40,7 +40,7 @@ | ||
8 | # Include our texinfo.tex, not Automake's. | ||
9 | EXTRA_DIST = epsf.tex texinfo.tex \ | ||
10 | fdl.texi \ | ||
11 | - $(man_MANS) $(TXI_XLATE) \ | ||
12 | + $(TXI_XLATE) \ | ||
13 | $(refcard_files) | ||
14 | |||
15 | if INSTALL_WARNINGS | ||
16 | diff -Nurd texinfo-5.1/man/Makefile.am texinfo-5.1/man/Makefile.am | ||
17 | --- texinfo-5.1/man/Makefile.am 2013-02-23 02:11:25.000000000 +0200 | ||
18 | +++ texinfo-5.1/man/Makefile.am 2013-08-20 01:53:40.542395884 +0300 | ||
19 | @@ -13,24 +13,24 @@ | ||
20 | # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
21 | |||
22 | # These are generated using help2man. | ||
23 | -man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 | ||
24 | +#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 | ||
25 | |||
26 | # These require the build in info/, thus can't do if we failed to find a | ||
27 | # terminal library. | ||
28 | if HAVE_TERMLIBS | ||
29 | -man_MANS += info.1 infokey.1 | ||
30 | +#man_MANS += info.1 infokey.1 | ||
31 | endif | ||
32 | |||
33 | # These are hand-written. | ||
34 | -man_MANS += info.5 texinfo.5 | ||
35 | +#man_MANS += info.5 texinfo.5 | ||
36 | |||
37 | # This is generated by pod2man, but let's just run it by hand. | ||
38 | -man_MANS += pod2texi.1 | ||
39 | +#man_MANS += pod2texi.1 | ||
40 | |||
41 | # These are just .so's to the common program. | ||
42 | -man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1 | ||
43 | +#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1 | ||
44 | |||
45 | -EXTRA_DIST = $(man_MANS) ginfo.h2m | ||
46 | +EXTRA_DIST = ginfo.h2m | ||
47 | |||
48 | # Maintainers should be able to regenerate. | ||
49 | MAINTAINERCLEANFILES = $(man_MANS) | ||
diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch b/meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch deleted file mode 100644 index ef69143bf3..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/enumerate_greater_than_ten.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 0e70072ce655a0d053bb7433083ced5e6eac74d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Thu, 15 Aug 2013 23:49:47 -0700 | ||
4 | Subject: [PATCH] handle correctly @enumerate specification greater than 10 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Revision: 5270 | ||
9 | http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5270 | ||
10 | Author: pertusus | ||
11 | Date: 2013-07-29 20:02:23 +0000 (Mon, 29 Jul 2013) | ||
12 | Log Message: | ||
13 | ----------- | ||
14 | * tp/Common.pm (enumerate_item_representation), Texinfo/Parser.pm: | ||
15 | handle correctly @enumerate specification greater than 10. Report | ||
16 | from Dmitry Shachnev. | ||
17 | |||
18 | --- | ||
19 | tp/Texinfo/Common.pm | 2 +- | ||
20 | tp/Texinfo/Parser.pm | 2 +- | ||
21 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm | ||
24 | index 8aee9f7..bdffeee 100644 | ||
25 | --- a/tp/Texinfo/Common.pm | ||
26 | +++ b/tp/Texinfo/Common.pm | ||
27 | @@ -1382,7 +1382,7 @@ sub enumerate_item_representation($$) | ||
28 | my $specification = shift; | ||
29 | my $number = shift; | ||
30 | |||
31 | - if ($specification =~ /^[0-9]$/) { | ||
32 | + if ($specification =~ /^[0-9]+$/) { | ||
33 | return $specification + $number -1; | ||
34 | } | ||
35 | |||
36 | diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm | ||
37 | index cf8fa72..8e845e9 100644 | ||
38 | --- a/tp/Texinfo/Parser.pm | ||
39 | +++ b/tp/Texinfo/Parser.pm | ||
40 | @@ -2973,7 +2973,7 @@ sub _end_line($$$) | ||
41 | $current->{'cmdname'}); | ||
42 | } | ||
43 | my $arg = $current->{'extra'}->{'block_command_line_contents'}->[0]->[0]; | ||
44 | - if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^[[:alnum:]]$/) { | ||
45 | + if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^(([[:digit:]]+)|([[:alpha:]]+))$/) { | ||
46 | $self->_command_error($current, $line_nr, | ||
47 | $self->__("bad argument to \@%s"), | ||
48 | $current->{'cmdname'}); | ||
49 | -- | ||
50 | 1.7.1 | ||
51 | |||
diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch b/meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch deleted file mode 100644 index 0b6e9fd7ea..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | install-info uses symbols from zlib so must link against it. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Joshua Lock <josh@linux.intel.com> | ||
6 | |||
7 | Index: texinfo-5.1/install-info/Makefile.am | ||
8 | =================================================================== | ||
9 | --- texinfo-5.1.orig/install-info/Makefile.am | ||
10 | +++ texinfo-5.1/install-info/Makefile.am | ||
11 | @@ -34,4 +34,4 @@ AM_CPPFLAGS = \ | ||
12 | -I$(top_srcdir)/gnulib/lib \ | ||
13 | -I$(top_builddir)/gnulib/lib \ | ||
14 | -DLOCALEDIR=\"$(localedir)\" | ||
15 | -LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) | ||
16 | +LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz | ||
diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch deleted file mode 100644 index bebcbdf8da..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch +++ /dev/null | |||
@@ -1,187 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: texinfo-5.1/install-info/Makefile.in | ||
4 | =================================================================== | ||
5 | --- texinfo-5.1.orig/install-info/Makefile.in | ||
6 | +++ texinfo-5.1/install-info/Makefile.in | ||
7 | @@ -171,7 +171,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" | ||
8 | PROGRAMS = $(bin_PROGRAMS) | ||
9 | am_ginstall_info_OBJECTS = install-info.$(OBJEXT) | ||
10 | ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) | ||
11 | -ginstall_info_LDADD = $(LDADD) | ||
12 | +ginstall_info_LDADD = $(LDADD) -lz | ||
13 | am__DEPENDENCIES_1 = | ||
14 | ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ | ||
15 | $(am__DEPENDENCIES_1) | ||
16 | Index: texinfo-5.1/install-info/install-info.c | ||
17 | =================================================================== | ||
18 | --- texinfo-5.1.orig/install-info/install-info.c | ||
19 | +++ texinfo-5.1/install-info/install-info.c | ||
20 | @@ -22,6 +22,7 @@ | ||
21 | #include <getopt.h> | ||
22 | #include <regex.h> | ||
23 | #include <argz.h> | ||
24 | +#include <zlib.h> | ||
25 | |||
26 | #define TAB_WIDTH 8 | ||
27 | |||
28 | @@ -670,7 +671,7 @@ The first time you invoke Info you start | ||
29 | |||
30 | MAGIC number, not the filename. */ | ||
31 | |||
32 | -FILE * | ||
33 | +void * | ||
34 | open_possibly_compressed_file (char *filename, | ||
35 | void (*create_callback) (char *), | ||
36 | char **opened_filename, char **compression_program, int *is_pipe) | ||
37 | @@ -678,7 +679,7 @@ open_possibly_compressed_file (char *fil | ||
38 | char *local_opened_filename, *local_compression_program; | ||
39 | int nread; | ||
40 | char data[13]; | ||
41 | - FILE *f; | ||
42 | + gzFile *f; | ||
43 | |||
44 | /* We let them pass NULL if they don't want this info, but it's easier | ||
45 | to always determine it. */ | ||
46 | @@ -686,48 +687,48 @@ open_possibly_compressed_file (char *fil | ||
47 | opened_filename = &local_opened_filename; | ||
48 | |||
49 | *opened_filename = filename; | ||
50 | - f = fopen (*opened_filename, FOPEN_RBIN); | ||
51 | + f = gzopen (*opened_filename, FOPEN_RBIN); | ||
52 | if (!f) | ||
53 | { | ||
54 | *opened_filename = concat (filename, ".gz", ""); | ||
55 | - f = fopen (*opened_filename, FOPEN_RBIN); | ||
56 | + f = gzopen (*opened_filename, FOPEN_RBIN); | ||
57 | } | ||
58 | if (!f) | ||
59 | { | ||
60 | free (*opened_filename); | ||
61 | *opened_filename = concat (filename, ".xz", ""); | ||
62 | - f = fopen (*opened_filename, FOPEN_RBIN); | ||
63 | + f = gzopen (*opened_filename, FOPEN_RBIN); | ||
64 | } | ||
65 | if (!f) | ||
66 | { | ||
67 | free (*opened_filename); | ||
68 | *opened_filename = concat (filename, ".bz2", ""); | ||
69 | - f = fopen (*opened_filename, FOPEN_RBIN); | ||
70 | + f = gzopen (*opened_filename, FOPEN_RBIN); | ||
71 | } | ||
72 | if (!f) | ||
73 | { | ||
74 | free (*opened_filename); | ||
75 | *opened_filename = concat (filename, ".lz", ""); | ||
76 | - f = fopen (*opened_filename, FOPEN_RBIN); | ||
77 | + f = gzopen (*opened_filename, FOPEN_RBIN); | ||
78 | } | ||
79 | if (!f) | ||
80 | { | ||
81 | free (*opened_filename); | ||
82 | *opened_filename = concat (filename, ".lzma", ""); | ||
83 | - f = fopen (*opened_filename, FOPEN_RBIN); | ||
84 | + f = gzopen (*opened_filename, FOPEN_RBIN); | ||
85 | } | ||
86 | #ifdef __MSDOS__ | ||
87 | if (!f) | ||
88 | { | ||
89 | free (*opened_filename); | ||
90 | *opened_filename = concat (filename, ".igz", ""); | ||
91 | - f = fopen (*opened_filename, FOPEN_RBIN); | ||
92 | + f = gzopen (*opened_filename, FOPEN_RBIN); | ||
93 | } | ||
94 | if (!f) | ||
95 | { | ||
96 | free (*opened_filename); | ||
97 | *opened_filename = concat (filename, ".inz", ""); | ||
98 | - f = fopen (*opened_filename, FOPEN_RBIN); | ||
99 | + f = gzopen (*opened_filename, FOPEN_RBIN); | ||
100 | } | ||
101 | #endif /* __MSDOS__ */ | ||
102 | if (!f) | ||
103 | @@ -739,7 +740,7 @@ open_possibly_compressed_file (char *fil | ||
104 | /* And try opening it again. */ | ||
105 | free (*opened_filename); | ||
106 | *opened_filename = filename; | ||
107 | - f = fopen (*opened_filename, FOPEN_RBIN); | ||
108 | + f = gzopen (*opened_filename, FOPEN_RBIN); | ||
109 | if (!f) | ||
110 | pfatal_with_name (filename); | ||
111 | } | ||
112 | @@ -749,12 +750,12 @@ open_possibly_compressed_file (char *fil | ||
113 | |||
114 | /* Read first few bytes of file rather than relying on the filename. | ||
115 | If the file is shorter than this it can't be usable anyway. */ | ||
116 | - nread = fread (data, sizeof (data), 1, f); | ||
117 | - if (nread != 1) | ||
118 | + nread = gzread (f, data, sizeof (data)); | ||
119 | + if (nread != sizeof (data)) | ||
120 | { | ||
121 | /* Empty files don't set errno, so we get something like | ||
122 | "install-info: No error for foo", which is confusing. */ | ||
123 | - if (nread == 0) | ||
124 | + if (nread >= 0) | ||
125 | fatal (_("%s: empty file"), *opened_filename); | ||
126 | pfatal_with_name (*opened_filename); | ||
127 | } | ||
128 | @@ -821,20 +822,22 @@ open_possibly_compressed_file (char *fil | ||
129 | |||
130 | if (*compression_program) | ||
131 | { /* It's compressed, so fclose the file and then open a pipe. */ | ||
132 | + FILE *p; | ||
133 | char *command = concat (*compression_program," -cd <", *opened_filename); | ||
134 | - if (fclose (f) < 0) | ||
135 | + if (gzclose (f) < 0) | ||
136 | pfatal_with_name (*opened_filename); | ||
137 | - f = popen (command, "r"); | ||
138 | - if (f) | ||
139 | + p = popen (command, "r"); | ||
140 | + if (p) | ||
141 | *is_pipe = 1; | ||
142 | else | ||
143 | pfatal_with_name (command); | ||
144 | + return p; | ||
145 | } | ||
146 | else | ||
147 | { /* It's a plain file, seek back over the magic bytes. */ | ||
148 | - if (fseek (f, 0, 0) < 0) | ||
149 | + if (gzseek (f, 0, SEEK_SET) < 0) | ||
150 | pfatal_with_name (*opened_filename); | ||
151 | -#if O_BINARY | ||
152 | +#if 0 && O_BINARY | ||
153 | /* Since this is a text file, and we opened it in binary mode, | ||
154 | switch back to text mode. */ | ||
155 | f = freopen (*opened_filename, "r", f); | ||
156 | @@ -859,7 +862,7 @@ readfile (char *filename, int *sizep, | ||
157 | char **compression_program) | ||
158 | { | ||
159 | char *real_name; | ||
160 | - FILE *f; | ||
161 | + void *f; | ||
162 | int pipe_p; | ||
163 | int filled = 0; | ||
164 | int data_size = 8192; | ||
165 | @@ -873,7 +876,12 @@ readfile (char *filename, int *sizep, | ||
166 | |||
167 | for (;;) | ||
168 | { | ||
169 | - int nread = fread (data + filled, 1, data_size - filled, f); | ||
170 | + int nread; | ||
171 | + | ||
172 | + if (pipe_p) | ||
173 | + nread = fread (data + filled, 1, data_size - filled, f); | ||
174 | + else | ||
175 | + nread = gzread (f, data + filled, data_size - filled); | ||
176 | if (nread < 0) | ||
177 | pfatal_with_name (real_name); | ||
178 | if (nread == 0) | ||
179 | @@ -895,7 +903,7 @@ readfile (char *filename, int *sizep, | ||
180 | if (pipe_p) | ||
181 | pclose (f); | ||
182 | else | ||
183 | - fclose (f); | ||
184 | + gzclose (f); | ||
185 | |||
186 | *sizep = filled; | ||
187 | return data; | ||
diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch b/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch deleted file mode 100644 index 312430f5af..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | diff -up texinfo-4.13/install-info/install-info.c.patch texinfo-4.13/install-info/install-info.c | ||
4 | --- texinfo-4.13/install-info/install-info.c.patch 2010-01-11 14:46:32.000000000 +0100 | ||
5 | +++ texinfo-4.13/install-info/install-info.c 2010-01-11 14:48:47.162152695 +0100 | ||
6 | @@ -772,7 +772,7 @@ open_possibly_compressed_file (char *fil | ||
7 | } | ||
8 | else | ||
9 | { /* It's a plain file, seek back over the magic bytes. */ | ||
10 | - if (gzseek (f, 0, SEEK_SET) < 0) | ||
11 | + if (gzseek (f, 0, SEEK_SET) == -1) | ||
12 | pfatal_with_name (*opened_filename); | ||
13 | #if 0 && O_BINARY | ||
14 | /* Since this is a text file, and we opened it in binary mode, | ||
diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/use_host_makedoc.patch b/meta/recipes-extended/texinfo/texinfo-5.1/use_host_makedoc.patch deleted file mode 100644 index 5b7f32d9a9..0000000000 --- a/meta/recipes-extended/texinfo/texinfo-5.1/use_host_makedoc.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [cross build specific] | ||
2 | |||
3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
4 | |||
5 | Index: texinfo-5.1/info/Makefile.am | ||
6 | =================================================================== | ||
7 | --- texinfo-5.1.orig/info/Makefile.am | ||
8 | +++ texinfo-5.1/info/Makefile.am | ||
9 | @@ -76,7 +76,7 @@ cmd_sources = $(srcdir)/session.c $(srcd | ||
10 | # more than once. | ||
11 | funs.h: makedoc$(EXEEXT) $(cmd_sources) | ||
12 | rm -f $(generated_sources) | ||
13 | - $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) | ||
14 | + makedoc $(cmd_sources) | ||
15 | |||
16 | # The following hack is necessary to hint make before the automatic | ||
17 | # dependencies are built. | ||