summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-08-06 14:41:35 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-11 09:28:51 -0700
commitbe79a1727f64c6a910baff01fc41f0bd0fb49114 (patch)
tree12d2cb368fa5f123d35a95bd619ca11f02580e16 /meta/recipes-extended
parenta7aab66e2006faa0346476fa8c9a0d9c1e6755a7 (diff)
downloadpoky-be79a1727f64c6a910baff01fc41f0bd0fb49114.tar.gz
texinfo: Upgrade 5.2 -> 6.0
* Remove texinfo-4.13a-powerpc.patch (already in upstream) * Rebase texinfo-4.12-zlib.patch, dont-depend-on-help2man.patch (From OE-Core rev: 156a62b25ce95a67ff7633080dc9bd4710dc4b79) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch47
-rw-r--r--meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch156
-rw-r--r--meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch14
-rw-r--r--meta/recipes-extended/texinfo/texinfo_6.0.bb (renamed from meta/recipes-extended/texinfo/texinfo_5.2.bb)5
4 files changed, 134 insertions, 88 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
index 876e0d0ad9..0ce47ecdb9 100644
--- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
+++ b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
@@ -1,10 +1,21 @@
1From 6f1f3912fcb900b3a3e6cbe3360306fade333497 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 6 Aug 2015 14:55:08 +0300
4Subject: [PATCH] dont-depend-on-help2man
5
1Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
2 7
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 8Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am 9---
5--- texinfo-5.1/doc/Makefile.am 2013-02-23 02:11:25.000000000 +0200 10 doc/Makefile.am | 2 +-
6+++ texinfo-5.1/doc/Makefile.am 2013-08-20 01:43:55.622376198 +0300 11 man/Makefile.am | 12 ++++++------
7@@ -40,7 +40,7 @@ 12 2 files changed, 7 insertions(+), 7 deletions(-)
13
14diff --git a/doc/Makefile.am b/doc/Makefile.am
15index 7198a6b..4bba550 100644
16--- a/doc/Makefile.am
17+++ b/doc/Makefile.am
18@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
8 # Include our texinfo.tex, not Automake's. 19 # Include our texinfo.tex, not Automake's.
9 EXTRA_DIST = epsf.tex texinfo.tex \ 20 EXTRA_DIST = epsf.tex texinfo.tex \
10 fdl.texi \ 21 fdl.texi \
@@ -13,37 +24,41 @@ diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am
13 $(refcard_files) 24 $(refcard_files)
14 25
15 if INSTALL_WARNINGS 26 if INSTALL_WARNINGS
16diff -Nurd texinfo-5.1/man/Makefile.am texinfo-5.1/man/Makefile.am 27diff --git a/man/Makefile.am b/man/Makefile.am
17--- texinfo-5.1/man/Makefile.am 2013-02-23 02:11:25.000000000 +0200 28index a08d603..bdfc9a4 100644
18+++ texinfo-5.1/man/Makefile.am 2013-08-20 01:53:40.542395884 +0300 29--- a/man/Makefile.am
30+++ b/man/Makefile.am
19@@ -13,24 +13,24 @@ 31@@ -13,24 +13,24 @@
20 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 32 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
21 33
22 # These are generated using help2man. 34 # These are generated using help2man.
23-man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 35-man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
24+#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 36+#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
25 37
26 # These require the build in info/, thus can't do if we failed to find a 38 # These require the build in info/, thus can't do if we failed to find a
27 # terminal library. 39 # terminal library.
28 if HAVE_TERMLIBS 40 if HAVE_TERMLIBS
29-man_MANS += info.1 infokey.1 41-man_MANS += info.1
30+#man_MANS += info.1 infokey.1 42+#man_MANS += info.1
31 endif 43 endif
32 44
33 # These are hand-written. 45 # These are hand-written.
34-man_MANS += info.5 texinfo.5 46-man_MANS += info.5 texinfo.5
35+#man_MANS += info.5 texinfo.5 47+#man_MANS += info.5 texinfo.5
36 48
37 # This is generated by pod2man, but let's just run it by hand. 49 # This is generated by pod2man, but let's just run it by hand.
38-man_MANS += pod2texi.1 50-man_MANS += pod2texi.1
39+#man_MANS += pod2texi.1 51+#man_MANS += pod2texi.1
40 52
41 # These are just .so's to the common program. 53 # These are just .so's to the common program.
42-man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1 54-man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
43+#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1 55+#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
44 56
45-EXTRA_DIST = $(man_MANS) ginfo.h2m 57-EXTRA_DIST = $(man_MANS) ginfo.h2m
46+EXTRA_DIST = ginfo.h2m 58+EXTRA_DIST = ginfo.h2m
47 59
48 # Maintainers should be able to regenerate. 60 # Maintainers should be able to regenerate.
49 MAINTAINERCLEANFILES = $(man_MANS) 61 MAINTAINERCLEANFILES = $(man_MANS)
62--
632.1.4
64
diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
index bebcbdf8da..41bd220bad 100644
--- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
+++ b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
@@ -1,10 +1,19 @@
1From 20e1d8a9481dc13dd1d4d168b90e0ed2ff097b98 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 6 Aug 2015 14:29:57 +0300
4Subject: [PATCH] texinfo-4.12-zlib
5
1Upstream-Status: Pending 6Upstream-Status: Pending
7---
8 install-info/Makefile.in | 2 +-
9 install-info/install-info.c | 67 +++++++++++++++++++++++++++------------------
10 2 files changed, 42 insertions(+), 27 deletions(-)
2 11
3Index: texinfo-5.1/install-info/Makefile.in 12diff --git a/install-info/Makefile.in b/install-info/Makefile.in
4=================================================================== 13index ad73abb..eaa2153 100644
5--- texinfo-5.1.orig/install-info/Makefile.in 14--- a/install-info/Makefile.in
6+++ texinfo-5.1/install-info/Makefile.in 15+++ b/install-info/Makefile.in
7@@ -171,7 +171,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" 16@@ -241,7 +241,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
8 PROGRAMS = $(bin_PROGRAMS) 17 PROGRAMS = $(bin_PROGRAMS)
9 am_ginstall_info_OBJECTS = install-info.$(OBJEXT) 18 am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
10 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) 19 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
@@ -13,10 +22,10 @@ Index: texinfo-5.1/install-info/Makefile.in
13 am__DEPENDENCIES_1 = 22 am__DEPENDENCIES_1 =
14 ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ 23 ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
15 $(am__DEPENDENCIES_1) 24 $(am__DEPENDENCIES_1)
16Index: texinfo-5.1/install-info/install-info.c 25diff --git a/install-info/install-info.c b/install-info/install-info.c
17=================================================================== 26index b454c15..4e39122 100644
18--- texinfo-5.1.orig/install-info/install-info.c 27--- a/install-info/install-info.c
19+++ texinfo-5.1/install-info/install-info.c 28+++ b/install-info/install-info.c
20@@ -22,6 +22,7 @@ 29@@ -22,6 +22,7 @@
21 #include <getopt.h> 30 #include <getopt.h>
22 #include <regex.h> 31 #include <regex.h>
@@ -25,16 +34,17 @@ Index: texinfo-5.1/install-info/install-info.c
25 34
26 #define TAB_WIDTH 8 35 #define TAB_WIDTH 8
27 36
28@@ -670,7 +671,7 @@ The first time you invoke Info you start 37@@ -684,15 +685,15 @@ The first time you invoke Info you start off looking at this node.\n\
29 38
30 MAGIC number, not the filename. */ 39 Return either stdin reading the file, or a non-stdin pipe reading
31 40 the output of the compression program. */
32-FILE * 41-FILE *
33+void * 42+void *
34 open_possibly_compressed_file (char *filename, 43 open_possibly_compressed_file (char *filename,
35 void (*create_callback) (char *), 44 void (*create_callback) (char *),
36 char **opened_filename, char **compression_program, int *is_pipe) 45- char **opened_filename, char **compression_program)
37@@ -678,7 +679,7 @@ open_possibly_compressed_file (char *fil 46+ char **opened_filename, char **compression_program, int *is_pipe)
47 {
38 char *local_opened_filename, *local_compression_program; 48 char *local_opened_filename, *local_compression_program;
39 int nread; 49 int nread;
40 char data[13]; 50 char data[13];
@@ -43,7 +53,7 @@ Index: texinfo-5.1/install-info/install-info.c
43 53
44 /* We let them pass NULL if they don't want this info, but it's easier 54 /* We let them pass NULL if they don't want this info, but it's easier
45 to always determine it. */ 55 to always determine it. */
46@@ -686,48 +687,48 @@ open_possibly_compressed_file (char *fil 56@@ -700,48 +701,48 @@ open_possibly_compressed_file (char *filename,
47 opened_filename = &local_opened_filename; 57 opened_filename = &local_opened_filename;
48 58
49 *opened_filename = filename; 59 *opened_filename = filename;
@@ -99,17 +109,17 @@ Index: texinfo-5.1/install-info/install-info.c
99+ f = gzopen (*opened_filename, FOPEN_RBIN); 109+ f = gzopen (*opened_filename, FOPEN_RBIN);
100 } 110 }
101 #endif /* __MSDOS__ */ 111 #endif /* __MSDOS__ */
102 if (!f) 112 if (!f)
103@@ -739,7 +740,7 @@ open_possibly_compressed_file (char *fil 113@@ -757,7 +758,7 @@ open_possibly_compressed_file (char *filename,
104 /* And try opening it again. */ 114 (*create_callback) (filename);
105 free (*opened_filename); 115
106 *opened_filename = filename; 116 /* And try opening it again. */
107- f = fopen (*opened_filename, FOPEN_RBIN); 117- f = fopen (*opened_filename, FOPEN_RBIN);
108+ f = gzopen (*opened_filename, FOPEN_RBIN); 118+ f = gzopen (*opened_filename, FOPEN_RBIN);
109 if (!f) 119 if (!f)
110 pfatal_with_name (filename); 120 return 0;
111 } 121 }
112@@ -749,12 +750,12 @@ open_possibly_compressed_file (char *fil 122@@ -767,12 +768,12 @@ open_possibly_compressed_file (char *filename,
113 123
114 /* Read first few bytes of file rather than relying on the filename. 124 /* 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. */ 125 If the file is shorter than this it can't be usable anyway. */
@@ -118,70 +128,106 @@ Index: texinfo-5.1/install-info/install-info.c
118+ nread = gzread (f, data, sizeof (data)); 128+ nread = gzread (f, data, sizeof (data));
119+ if (nread != sizeof (data)) 129+ if (nread != sizeof (data))
120 { 130 {
121 /* Empty files don't set errno, so we get something like 131 /* Empty files don't set errno. Calling code can check for
122 "install-info: No error for foo", which is confusing. */ 132 this, so make sure errno == 0 just in case it isn't already. */
123- if (nread == 0) 133- if (nread == 0)
124+ if (nread >= 0) 134+ if (nread >= 0)
125 fatal (_("%s: empty file"), *opened_filename); 135 errno = 0;
126 pfatal_with_name (*opened_filename); 136 return 0;
127 } 137 }
128@@ -821,20 +822,22 @@ open_possibly_compressed_file (char *fil 138@@ -838,35 +839,40 @@ open_possibly_compressed_file (char *filename,
139 *compression_program = NULL;
140
141 /* Seek back over the magic bytes. */
142- if (fseek (f, 0, 0) < 0)
143+ if (gzseek (f, 0, SEEK_SET) == -1)
144 return 0;
129 145
130 if (*compression_program) 146 if (*compression_program)
131 { /* It's compressed, so fclose the file and then open a pipe. */ 147 { /* It's compressed, so open a pipe. */
132+ FILE *p; 148+ FILE *p;
133 char *command = concat (*compression_program," -cd <", *opened_filename); 149 char *command = concat (*compression_program, " -d", "");
150
134- if (fclose (f) < 0) 151- if (fclose (f) < 0)
135+ if (gzclose (f) < 0) 152+ if (gzclose (f) < 0)
136 pfatal_with_name (*opened_filename); 153 return 0;
154- f = freopen (*opened_filename, FOPEN_RBIN, stdin);
155- if (!f)
156+ p = freopen (*opened_filename, FOPEN_RBIN, stdin);
157+ if (!p)
158 return 0;
137- f = popen (command, "r"); 159- f = popen (command, "r");
138- if (f) 160- if (!f)
139+ p = popen (command, "r"); 161+ p = popen (command, "r");
140+ if (p) 162+ if (!p)
141 *is_pipe = 1; 163 {
142 else 164 /* Used for error message in calling code. */
143 pfatal_with_name (command); 165 *opened_filename = command;
166 return 0;
167 }
168+ else
169+ *is_pipe = 1;
144+ return p; 170+ return p;
145 } 171 }
146 else 172 else
147 { /* It's a plain file, seek back over the magic bytes. */ 173 {
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 174-#if O_BINARY
152+#if 0 && O_BINARY 175+#if 0 && O_BINARY
153 /* Since this is a text file, and we opened it in binary mode, 176 /* Since this is a text file, and we opened it in binary mode,
154 switch back to text mode. */ 177 switch back to text mode. */
155 f = freopen (*opened_filename, "r", f); 178 f = freopen (*opened_filename, "r", f);
156@@ -859,7 +862,7 @@ readfile (char *filename, int *sizep, 179 if (! f)
180 return 0;
181 #endif
182+ *is_pipe = 0;
183 }
184
185 return f;
186@@ -885,7 +891,8 @@ readfile (char *filename, int *sizep,
187 void (*create_callback) (char *), char **opened_filename,
157 char **compression_program) 188 char **compression_program)
158 { 189 {
159 char *real_name;
160- FILE *f; 190- FILE *f;
161+ void *f; 191+ void *f;
162 int pipe_p; 192+ int pipe_p;
163 int filled = 0; 193 int filled = 0;
164 int data_size = 8192; 194 int data_size = 8192;
165@@ -873,7 +876,12 @@ readfile (char *filename, int *sizep, 195 char *data = xmalloc (data_size);
196@@ -893,14 +900,20 @@ readfile (char *filename, int *sizep,
197 /* If they passed the space for the file name to return, use it. */
198 f = open_possibly_compressed_file (filename, create_callback,
199 opened_filename,
200- compression_program);
201+ compression_program,
202+ &pipe_p);
203
204 if (!f)
205 return 0;
166 206
167 for (;;) 207 for (;;)
168 { 208 {
169- int nread = fread (data + filled, 1, data_size - filled, f); 209- int nread = fread (data + filled, 1, data_size - filled, f);
170+ int nread; 210+ int nread;
171+ 211+
172+ if (pipe_p) 212+ if (pipe_p)
173+ nread = fread (data + filled, 1, data_size - filled, f); 213+ nread = fread (data + filled, 1, data_size - filled, f);
174+ else 214+ else
175+ nread = gzread (f, data + filled, data_size - filled); 215+ nread = gzread (f, data + filled, data_size - filled);
176 if (nread < 0) 216 if (nread < 0)
177 pfatal_with_name (real_name); 217 return 0;
178 if (nread == 0) 218 if (nread == 0)
179@@ -895,7 +903,7 @@ readfile (char *filename, int *sizep, 219@@ -919,8 +932,10 @@ readfile (char *filename, int *sizep,
180 if (pipe_p) 220 /* We need to close the stream, since on some systems the pipe created
221 by popen is simulated by a temporary file which only gets removed
222 inside pclose. */
223- if (f != stdin)
224+ if (pipe_p)
181 pclose (f); 225 pclose (f);
182 else 226+ else
183- fclose (f);
184+ gzclose (f); 227+ gzclose (f);
185 228
186 *sizep = filled; 229 *sizep = filled;
187 return data; 230 return data;
231--
2322.1.4
233
diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch
deleted file mode 100644
index 312430f5af..0000000000
--- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Pending
2
3diff -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.2.bb b/meta/recipes-extended/texinfo/texinfo_6.0.bb
index aa644e1206..8fb715a11e 100644
--- a/meta/recipes-extended/texinfo/texinfo_5.2.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.0.bb
@@ -30,7 +30,6 @@ TARGET_PATCH_class-native = ""
30 30
31SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ 31SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
32 file://texinfo-4.12-zlib.patch \ 32 file://texinfo-4.12-zlib.patch \
33 file://texinfo-4.13a-powerpc.patch \
34 file://disable-native-tools.patch \ 33 file://disable-native-tools.patch \
35 file://link-zip.patch \ 34 file://link-zip.patch \
36 file://dont-depend-on-help2man.patch \ 35 file://dont-depend-on-help2man.patch \
@@ -38,8 +37,8 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
38 ${TARGET_PATCH} \ 37 ${TARGET_PATCH} \
39 " 38 "
40 39
41SRC_URI[md5sum] = "1b8f98b80a8e6c50422125e07522e8db" 40SRC_URI[md5sum] = "e1a2ef5dce5018b53f0f6eed45b247a7"
42SRC_URI[sha256sum] = "6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74" 41SRC_URI[sha256sum] = "83d3183290f34e7f958d209d0b20022c6fe9e921eb6fe94c27d988827d4878d2"
43 42
44tex_texinfo = "texmf/tex/texinfo" 43tex_texinfo = "texmf/tex/texinfo"
45 44