summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-07-29 15:02:34 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-31 06:59:59 +0100
commit5472bdc2f0119c538d39bfe1531690bccc18ede1 (patch)
treed000c7a0dd989546f0af200607affcf9cbdf39a5 /meta/recipes-extended
parentc291032022e760f61e218e2f468d79fe730c768f (diff)
downloadpoky-5472bdc2f0119c538d39bfe1531690bccc18ede1.tar.gz
texinfo: Update to 5.1
- COPYING was slightly reformated (whitespace changes only) - rebased patches - remove upstreamed patches - added pod2texi to texinfo package - get all man pages from man1 and man5 (From OE-Core rev: f192c444c2d88c49738bea4ff4c3af0cc72916de) Signed-off-by: Saul Wold <sgw@linux.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-4.13a/dont-depend-on-help2man.patch79
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch61
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch16
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-data_types.patch34
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-help-index-segfault.patch25
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-mosdo-crash.patch13
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/texinfo_fix_for_automake-1.12.patch24
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch37
-rw-r--r--meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch (renamed from meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch)0
-rw-r--r--meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch16
-rw-r--r--meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch16
-rw-r--r--meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch (renamed from meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.12-zlib.patch)110
-rw-r--r--meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch (renamed from meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-powerpc.patch)0
-rw-r--r--meta/recipes-extended/texinfo/texinfo-5.1/use_host_makedoc.patch17
-rw-r--r--meta/recipes-extended/texinfo/texinfo_5.1.bb (renamed from meta/recipes-extended/texinfo/texinfo_4.13a.bb)25
15 files changed, 121 insertions, 352 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/dont-depend-on-help2man.patch
deleted file mode 100644
index 13e0fc2da5..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/dont-depend-on-help2man.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1Upstream-Status: Inappropŕiate
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd texinfo-4.13/doc/Makefile.am texinfo-4.13/doc/Makefile.am
5--- texinfo-4.13/doc/Makefile.am 2008-09-18 21:31:56.000000000 +0300
6+++ texinfo-4.13/doc/Makefile.am 2013-02-08 03:13:40.943466946 +0200
7@@ -14,9 +14,6 @@
8 info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
9 DISTCLEANFILES = texinfo texinfo-* info*.info*
10
11-man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 \
12- info.5 texinfo.5
13-
14 # Use the programs built in our distribution, taking account of possible
15 # cross-compiling.
16 MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
17@@ -36,7 +33,7 @@
18 # Include our texinfo.tex, not Automake's.
19 EXTRA_DIST = epsf.tex texinfo.tex \
20 fdl.texi \
21- $(man_MANS) $(TXI_XLATE)
22+ $(TXI_XLATE)
23 $(refcard_files)
24
25 if INSTALL_WARNINGS
26@@ -77,38 +74,10 @@
27 case $$program in info|install-info) program=g$$program;; \
28 esac
29
30-# Update the manpage for a binary program; set up the variables,
31-# make sure the binary is up-to-date and then generate the man page.
32-man_rule_bin = echo "Updating man page $@" && \
33- $(man_rule_0) && \
34- echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) && \
35- (cd "$$dir" && $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) && \
36- echo $(HELP2MAN) --name=\""$$name"\" "$$dir/$$program" -o '$@' && \
37- $(HELP2MAN) --name="$$name" "$$dir/$$program" -o '$@'
38-
39-$(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
40- @name="read Info documents" && $(man_rule_bin)
41-$(srcdir)/infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
42- @name="compile customizations for Info" && $(man_rule_bin)
43-$(srcdir)/install-info.1: $(top_srcdir)/install-info/install-info.c $(common_mandeps)
44- @name="update info/dir entries" && $(man_rule_bin)
45-
46-# Here we need some postprocessing:
47-$(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
48- @name="translate Texinfo documents" && $(man_rule_bin)
49- mv $@ $@.tmp
50- sed '/^\.IP$$/N;/\nAlso/s/I//;/\nThe/s/I//' $@.tmp >$@
51- rm $@.tmp
52-
53-$(srcdir)/texindex.1: $(util_srcdir)/texindex.c $(common_mandeps)
54- @name="sort Texinfo index files" && $(man_rule_bin)
55-
56-
57 ## ---------- ##
58 ## texi2dvi. ##
59 ## ---------- ##
60
61-man_MANS += texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
62 util_srcdir = $(top_srcdir)/util
63
64 # Do not depend on the current user's settings.
65@@ -119,14 +88,5 @@
66 common_texi2dvi_deps = $(common_mandeps) \
67 $(util_srcdir)/texi2dvi $(util_srcdir)/texi2pdf
68
69-$(srcdir)/texi2dvi.1: $(common_texi2dvi_deps)
70- $(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to DVI" $(util_srcdir)/texi2dvi >$@
71-
72-$(srcdir)/texi2pdf.1: $(common_texi2dvi_deps)
73- $(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/texi2pdf >$@
74-
75-$(srcdir)/pdftexi2dvi.1: $(common_texi2dvi_deps)
76- $(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to PDF" $(util_srcdir)/pdftexi2dvi >$@
77-
78 # Do not create info files for distribution.
79 dist-info:
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch
deleted file mode 100644
index 6adeba5682..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1Bump gettext macro numbers as required by newer gettext built by OE.
2
3Upstream-Status: Pending
4
5Signed-off-by: Joshua Lock <josh@linux.intel.com>
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: texinfo-4.13/configure.ac
9===================================================================
10--- texinfo-4.13.orig/configure.ac
11+++ texinfo-4.13/configure.ac
12@@ -193,7 +193,7 @@ AM_CONDITIONAL(INSTALL_WARNINGS,
13
14 # i18n support. To update to a new version of gettext, run:
15 # gettextize -f -c
16-AM_GNU_GETTEXT_VERSION([0.17])
17+AM_GNU_GETTEXT_VERSION([0.18])
18 AM_GNU_GETTEXT([external])
19
20 # The test suite.
21Index: texinfo-4.13/po/Makefile.in.in
22===================================================================
23--- texinfo-4.13.orig/po/Makefile.in.in
24+++ texinfo-4.13/po/Makefile.in.in
25@@ -8,8 +8,8 @@
26 # Please note that the actual code of GNU gettext is covered by the GNU
27 # General Public License and is *not* in the public domain.
28 #
29-# Origin: gettext-0.17
30-GETTEXT_MACRO_VERSION = 0.17
31+# Origin: gettext-0.18
32+GETTEXT_MACRO_VERSION = 0.18
33
34 PACKAGE = @PACKAGE@
35 VERSION = @VERSION@
36Index: texinfo-4.13/gnulib/m4/gnulib-comp.m4
37===================================================================
38--- texinfo-4.13.orig/gnulib/m4/gnulib-comp.m4
39+++ texinfo-4.13/gnulib/m4/gnulib-comp.m4
40@@ -56,7 +56,7 @@ AC_DEFUN([gl_INIT],
41 gl_EXITFAIL
42 gl_GETOPT
43 dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
44- AM_GNU_GETTEXT_VERSION([0.17])
45+ AM_GNU_GETTEXT_VERSION([0.18])
46 AC_SUBST([LIBINTL])
47 AC_SUBST([LTLIBINTL])
48 gl_FUNC_GETTIMEOFDAY
49Index: texinfo-4.13/gnulib/m4/po.m4
50===================================================================
51--- texinfo-4.13.orig/gnulib/m4/po.m4
52+++ texinfo-4.13/gnulib/m4/po.m4
53@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
54
55 dnl Release version of the gettext macros. This is used to ensure that
56 dnl the gettext macros and po/Makefile.in.in are in sync.
57- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
58+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
59
60 dnl Perform the following tests also if --disable-nls has been given,
61 dnl because they are needed for "make dist" to work.
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch
deleted file mode 100644
index 629d329d7c..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1install-info uses symbols from zlib so must link against it.
2
3Upstream-Status: Pending
4
5Signed-off-by: Joshua Lock <josh@linux.intel.com>
6
7Index: texinfo-4.13/install-info/Makefile.am
8===================================================================
9--- texinfo-4.13.orig/install-info/Makefile.am
10+++ texinfo-4.13/install-info/Makefile.am
11@@ -28,4 +28,4 @@ AM_CPPFLAGS = \
12 -I$(top_srcdir)/gnulib/lib \
13 -I$(top_builddir)/gnulib/lib \
14 -DLOCALEDIR=\"$(localedir)\"
15-LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
16+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-data_types.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-data_types.patch
deleted file mode 100644
index 50fa4b6c69..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-data_types.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Pending
2
3diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
4--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200
5+++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200
6@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
7 const char *carried_over_ptr;
8 size_t carried_over_len, carried_over_count;
9 const char *cur_ptr = mbi_cur_ptr (iter);
10- int cur_len = mb_len (mbi_cur (iter));
11+ size_t cur_len = mb_len (mbi_cur (iter));
12 int replen;
13 int delim = 0;
14 int rc;
15@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
16 mbi_advance (iter))
17 {
18 const char *cur_ptr = mbi_cur_ptr (iter);
19- int cur_len = mb_len (mbi_cur (iter));
20+ size_t cur_len = mb_len (mbi_cur (iter));
21
22 if (cur_len == 1)
23 {
24@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
25 mbi_advance (iter))
26 {
27 const char *cur_ptr = mbi_cur_ptr (iter);
28- int cur_len = mb_len (mbi_cur (iter));
29- int replen;
30+ size_t cur_len = mb_len (mbi_cur (iter));
31+ size_t replen;
32
33 if (cur_ptr >= endp)
34 break;
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-help-index-segfault.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-help-index-segfault.patch
deleted file mode 100644
index aee21ffec1..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-help-index-segfault.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Pending
2
3diff -up texinfo-4.13/info/indices.c.orig texinfo-4.13/info/indices.c
4--- texinfo-4.13/info/indices.c.orig 2010-08-31 12:04:38.317462471 +0200
5+++ texinfo-4.13/info/indices.c 2010-08-31 12:11:49.322624552 +0200
6@@ -192,6 +192,7 @@ do_info_index_search (WINDOW *window, in
7 index for, build and remember an index now. */
8 fb = file_buffer_of_window (window);
9 if (!initial_index_filename ||
10+ !fb ||
11 (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
12 {
13 info_free_references (index_index);
14@@ -287,8 +288,9 @@ index_entry_exists (WINDOW *window, char
15 return 0;
16
17 fb = file_buffer_of_window (window);
18- if (!initial_index_filename
19- || (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
20+ if (!initial_index_filename ||
21+ !fb ||
22+ (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
23 {
24 info_free_references (index_index);
25 index_index = info_indices_of_file_buffer (fb);
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-mosdo-crash.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-mosdo-crash.patch
deleted file mode 100644
index 49b568fa1f..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-mosdo-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Pending
2
3--- texinfo-4.13/install-info/install-info.c.mosdo-crash 2009-09-02 20:18:44.000000000 -0400
4+++ texinfo-4.13/install-info/install-info.c 2009-09-02 20:19:53.000000000 -0400
5@@ -1765,7 +1765,7 @@
6 err = argz_add (&argz, &argz_len, opt);
7 free (opt); opt = NULL;
8
9- opt = xmalloc (strlen (regex) + sizeof ("--section="));
10+ opt = xmalloc (strlen (title) + sizeof ("--section="));
11 if (sprintf (opt, "--section=%s", title) == -1)
12 err = 1;
13 if (!err)
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo_fix_for_automake-1.12.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo_fix_for_automake-1.12.patch
deleted file mode 100644
index 11d34b1cf9..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Upstream-Status: pending
2
3automake 1.12 has deprecated support for lzma-compressed distribution archives
4this patch fixes following issue with automake 1.12
5
6| configure.ac:16: error: support for lzma-compressed distribution archives has been removed
7
8Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
92012/05/03
10
11
12Index: texinfo-4.13/configure.ac
13===================================================================
14--- texinfo-4.13.orig/configure.ac
15+++ texinfo-4.13/configure.ac
16@@ -13,7 +13,7 @@ AC_INIT([GNU Texinfo], [4.13], [bug-texi
17
18 dnl Must come before AM_INIT_AUTOMAKE.
19 AC_CONFIG_AUX_DIR([build-aux])
20-AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-lzma])
21+AM_INIT_AUTOMAKE([1.10.1 readme-alpha])
22
23 # Minimum Autoconf version required.
24 AC_PREREQ(2.59)
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch
deleted file mode 100644
index db41f1a47e..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1This patch requires that we also enable building of the
2texinfo-native recipe which will install the makedoc tool
3for the host machine.
4
5This patch simply uses the newly installed makedoc tool from
6sysroot.
7
8Upstream-Status: Inappropriate [OE-Specific]
9
10Signed-off-by: Saul Wold <sgw@linux.intel.com>
11
12Index: texinfo-4.13/info/Makefile.am
13===================================================================
14--- texinfo-4.13.orig/info/Makefile.am 2008-05-22 05:11:33.000000000 -0700
15+++ texinfo-4.13/info/Makefile.am 2011-12-10 12:55:53.604440118 -0800
16@@ -75,7 +75,7 @@
17 # more than once.
18 funs.h: makedoc$(EXEEXT) $(cmd_sources)
19 rm -f $(generated_sources)
20- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
21+ makedoc $(cmd_sources)
22
23 # The following hack is necessary to hint make before the automatic
24 # dependencies are built.
25Index: texinfo-4.13/doc/Makefile.am
26===================================================================
27--- texinfo-4.13.orig/doc/Makefile.am 2008-09-18 11:31:56.000000000 -0700
28+++ texinfo-4.13/doc/Makefile.am 2011-12-10 13:04:09.216457601 -0800
29@@ -19,7 +19,7 @@
30
31 # Use the programs built in our distribution, taking account of possible
32 # cross-compiling.
33-MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
34+MAKEINFO = makeinfo
35
36 # We'd also like to use something like this, but Automake calls
37 # "install-info" directly.
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch
index ab6f1658aa..ab6f1658aa 100644
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch
+++ b/meta/recipes-extended/texinfo/texinfo-5.1/disable-native-tools.patch
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
new file mode 100644
index 0000000000..75023287af
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-5.1/dont-depend-on-help2man.patch
@@ -0,0 +1,16 @@
1Upstream-Status: Inappropŕiate
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4Index: texinfo-5.1/doc/Makefile.am
5===================================================================
6--- texinfo-5.1.orig/doc/Makefile.am
7+++ texinfo-5.1/doc/Makefile.am
8@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard
9 # Include our texinfo.tex, not Automake's.
10 EXTRA_DIST = epsf.tex texinfo.tex \
11 fdl.texi \
12- $(man_MANS) $(TXI_XLATE) \
13+ $(TXI_XLATE) \
14 $(refcard_files)
15
16 if INSTALL_WARNINGS
diff --git a/meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch b/meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch
new file mode 100644
index 0000000000..0b6e9fd7ea
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-5.1/link-zip.patch
@@ -0,0 +1,16 @@
1install-info uses symbols from zlib so must link against it.
2
3Upstream-Status: Pending
4
5Signed-off-by: Joshua Lock <josh@linux.intel.com>
6
7Index: 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-4.13a/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch
index 05208311fc..bebcbdf8da 100644
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.12-zlib.patch
+++ b/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.12-zlib.patch
@@ -1,21 +1,23 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3diff -up texinfo-4.12/install-info/Makefile.in_old texinfo-4.12/install-info/Makefile.in 3Index: texinfo-5.1/install-info/Makefile.in
4--- texinfo-4.12/install-info/Makefile.in_old 2008-05-13 13:33:55.000000000 +0200 4===================================================================
5+++ texinfo-4.12/install-info/Makefile.in 2008-05-13 13:52:35.000000000 +0200 5--- texinfo-5.1.orig/install-info/Makefile.in
6@@ -114,7 +114,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 6+++ texinfo-5.1/install-info/Makefile.in
7@@ -171,7 +171,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
7 PROGRAMS = $(bin_PROGRAMS) 8 PROGRAMS = $(bin_PROGRAMS)
8 am_ginstall_info_OBJECTS = install-info.$(OBJEXT) 9 am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
9 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) 10 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
10-ginstall_info_LDADD = $(LDADD) 11-ginstall_info_LDADD = $(LDADD)
11+ginstall_info_LDADD = $(LDADD) -lz 12+ginstall_info_LDADD = $(LDADD) -lz
12 am__DEPENDENCIES_1 = 13 am__DEPENDENCIES_1 =
13 ginstall_info_DEPENDENCIES = ../lib/libtxi.a \ 14 ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
14 $(top_builddir)/gnulib/lib/libgnu.a $(am__DEPENDENCIES_1) 15 $(am__DEPENDENCIES_1)
15diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/install-info.c 16Index: texinfo-5.1/install-info/install-info.c
16--- texinfo-4.12/install-info/install-info.c_old 2008-05-13 13:52:44.000000000 +0200 17===================================================================
17+++ texinfo-4.12/install-info/install-info.c 2008-05-14 10:30:53.000000000 +0200 18--- texinfo-5.1.orig/install-info/install-info.c
18@@ -21,6 +21,7 @@ 19+++ texinfo-5.1/install-info/install-info.c
20@@ -22,6 +22,7 @@
19 #include <getopt.h> 21 #include <getopt.h>
20 #include <regex.h> 22 #include <regex.h>
21 #include <argz.h> 23 #include <argz.h>
@@ -23,16 +25,16 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
23 25
24 #define TAB_WIDTH 8 26 #define TAB_WIDTH 8
25 27
26@@ -638,7 +639,7 @@ The first time you invoke Info you start 28@@ -670,7 +671,7 @@ The first time you invoke Info you start
27 COMPRESSION_PROGRAM. The compression program is determined by the 29
28 magic number, not the filename. */ 30 MAGIC number, not the filename. */
29 31
30-FILE * 32-FILE *
31+void * 33+void *
32 open_possibly_compressed_file (char *filename, 34 open_possibly_compressed_file (char *filename,
33 void (*create_callback) (char *), 35 void (*create_callback) (char *),
34 char **opened_filename, char **compression_program, int *is_pipe) 36 char **opened_filename, char **compression_program, int *is_pipe)
35@@ -646,7 +647,7 @@ open_possibly_compressed_file (char *fil 37@@ -678,7 +679,7 @@ open_possibly_compressed_file (char *fil
36 char *local_opened_filename, *local_compression_program; 38 char *local_opened_filename, *local_compression_program;
37 int nread; 39 int nread;
38 char data[13]; 40 char data[13];
@@ -41,7 +43,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
41 43
42 /* We let them pass NULL if they don't want this info, but it's easier 44 /* We let them pass NULL if they don't want this info, but it's easier
43 to always determine it. */ 45 to always determine it. */
44@@ -654,22 +655,22 @@ open_possibly_compressed_file (char *fil 46@@ -686,48 +687,48 @@ open_possibly_compressed_file (char *fil
45 opened_filename = &local_opened_filename; 47 opened_filename = &local_opened_filename;
46 48
47 *opened_filename = filename; 49 *opened_filename = filename;
@@ -52,6 +54,14 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
52 *opened_filename = concat (filename, ".gz", ""); 54 *opened_filename = concat (filename, ".gz", "");
53- f = fopen (*opened_filename, FOPEN_RBIN); 55- f = fopen (*opened_filename, FOPEN_RBIN);
54+ f = gzopen (*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 }
55 if (!f) 65 if (!f)
56 { 66 {
57 free (*opened_filename); 67 free (*opened_filename);
@@ -61,39 +71,45 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
61 } 71 }
62 if (!f) 72 if (!f)
63 { 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 {
64 free (*opened_filename); 81 free (*opened_filename);
65 *opened_filename = concat (filename, ".lzma", ""); 82 *opened_filename = concat (filename, ".lzma", "");
66- f = fopen (*opened_filename, FOPEN_RBIN); 83- f = fopen (*opened_filename, FOPEN_RBIN);
67+ f = gzopen (*opened_filename, FOPEN_RBIN); 84+ f = gzopen (*opened_filename, FOPEN_RBIN);
68 } 85 }
69
70 #ifdef __MSDOS__ 86 #ifdef __MSDOS__
71@@ -677,13 +678,13 @@ open_possibly_compressed_file (char *fil 87 if (!f)
72 { 88 {
73 free (*opened_filename); 89 free (*opened_filename);
74 *opened_filename = concat (filename, ".igz", ""); 90 *opened_filename = concat (filename, ".igz", "");
75- f = fopen (*opened_filename, FOPEN_RBIN); 91- f = fopen (*opened_filename, FOPEN_RBIN);
76+ f = gzopen (*opened_filename, FOPEN_RBIN); 92+ f = gzopen (*opened_filename, FOPEN_RBIN);
77 } 93 }
78 if (!f) 94 if (!f)
79 { 95 {
80 free (*opened_filename); 96 free (*opened_filename);
81 *opened_filename = concat (filename, ".inz", ""); 97 *opened_filename = concat (filename, ".inz", "");
82- f = fopen (*opened_filename, FOPEN_RBIN); 98- f = fopen (*opened_filename, FOPEN_RBIN);
83+ f = gzopen (*opened_filename, FOPEN_RBIN); 99+ f = gzopen (*opened_filename, FOPEN_RBIN);
84 } 100 }
85 #endif 101 #endif /* __MSDOS__ */
86 if (!f) 102 if (!f)
87@@ -695,7 +696,7 @@ open_possibly_compressed_file (char *fil 103@@ -739,7 +740,7 @@ open_possibly_compressed_file (char *fil
88 /* And try opening it again. */ 104 /* And try opening it again. */
89 free (*opened_filename); 105 free (*opened_filename);
90 *opened_filename = filename; 106 *opened_filename = filename;
91- f = fopen (*opened_filename, FOPEN_RBIN); 107- f = fopen (*opened_filename, FOPEN_RBIN);
92+ f = gzopen (*opened_filename, FOPEN_RBIN); 108+ f = gzopen (*opened_filename, FOPEN_RBIN);
93 if (!f) 109 if (!f)
94 pfatal_with_name (filename); 110 pfatal_with_name (filename);
95 } 111 }
96@@ -706,12 +707,12 @@ open_possibly_compressed_file (char *fil 112@@ -749,12 +750,12 @@ open_possibly_compressed_file (char *fil
97 113
98 /* Read first few bytes of file rather than relying on the filename. 114 /* Read first few bytes of file rather than relying on the filename.
99 If the file is shorter than this it can't be usable anyway. */ 115 If the file is shorter than this it can't be usable anyway. */
@@ -106,10 +122,10 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
106 "install-info: No error for foo", which is confusing. */ 122 "install-info: No error for foo", which is confusing. */
107- if (nread == 0) 123- if (nread == 0)
108+ if (nread >= 0) 124+ if (nread >= 0)
109 fatal (_("%s: empty file"), *opened_filename, 0); 125 fatal (_("%s: empty file"), *opened_filename);
110 pfatal_with_name (*opened_filename); 126 pfatal_with_name (*opened_filename);
111 } 127 }
112@@ -758,20 +759,22 @@ open_possibly_compressed_file (char *fil 128@@ -821,20 +822,22 @@ open_possibly_compressed_file (char *fil
113 129
114 if (*compression_program) 130 if (*compression_program)
115 { /* It's compressed, so fclose the file and then open a pipe. */ 131 { /* It's compressed, so fclose the file and then open a pipe. */
@@ -137,7 +153,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
137 /* Since this is a text file, and we opened it in binary mode, 153 /* Since this is a text file, and we opened it in binary mode,
138 switch back to text mode. */ 154 switch back to text mode. */
139 f = freopen (*opened_filename, "r", f); 155 f = freopen (*opened_filename, "r", f);
140@@ -796,7 +799,7 @@ readfile (char *filename, int *sizep, 156@@ -859,7 +862,7 @@ readfile (char *filename, int *sizep,
141 char **compression_program) 157 char **compression_program)
142 { 158 {
143 char *real_name; 159 char *real_name;
@@ -146,7 +162,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
146 int pipe_p; 162 int pipe_p;
147 int filled = 0; 163 int filled = 0;
148 int data_size = 8192; 164 int data_size = 8192;
149@@ -810,7 +813,12 @@ readfile (char *filename, int *sizep, 165@@ -873,7 +876,12 @@ readfile (char *filename, int *sizep,
150 166
151 for (;;) 167 for (;;)
152 { 168 {
@@ -160,7 +176,7 @@ diff -up texinfo-4.12/install-info/install-info.c_old texinfo-4.12/install-info/
160 if (nread < 0) 176 if (nread < 0)
161 pfatal_with_name (real_name); 177 pfatal_with_name (real_name);
162 if (nread == 0) 178 if (nread == 0)
163@@ -832,7 +840,7 @@ readfile (char *filename, int *sizep, 179@@ -895,7 +903,7 @@ readfile (char *filename, int *sizep,
164 if (pipe_p) 180 if (pipe_p)
165 pclose (f); 181 pclose (f);
166 else 182 else
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-powerpc.patch b/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch
index 312430f5af..312430f5af 100644
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/texinfo-4.13a-powerpc.patch
+++ b/meta/recipes-extended/texinfo/texinfo-5.1/texinfo-4.13a-powerpc.patch
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
new file mode 100644
index 0000000000..5b7f32d9a9
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-5.1/use_host_makedoc.patch
@@ -0,0 +1,17 @@
1Upstream-Status: Inappropriate [cross build specific]
2
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Index: 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.
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_5.1.bb
index febb85a143..ad10e48a62 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_5.1.bb
@@ -5,8 +5,7 @@ GNU Project uses the Texinfo file format for most of its documentation."
5HOMEPAGE = "http://www.gnu.org/software/texinfo/" 5HOMEPAGE = "http://www.gnu.org/software/texinfo/"
6SECTION = "console/utils" 6SECTION = "console/utils"
7LICENSE = "GPLv3+" 7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010" 8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
9PR = "r6"
10 9
11DEPENDS = "zlib ncurses texinfo-native" 10DEPENDS = "zlib ncurses texinfo-native"
12DEPENDS_class-native = "zlib-native ncurses-native" 11DEPENDS_class-native = "zlib-native ncurses-native"
@@ -14,23 +13,19 @@ DEPENDS_class-native = "zlib-native ncurses-native"
14TARGET_PATCH = "file://use_host_makedoc.patch" 13TARGET_PATCH = "file://use_host_makedoc.patch"
15TARGET_PATCH_class-native = "" 14TARGET_PATCH_class-native = ""
16 15
17SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \ 16SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
18 file://texinfo-4.12-zlib.patch \ 17 file://texinfo-4.12-zlib.patch \
19 file://texinfo-4.13a-data_types.patch \
20 file://texinfo-4.13a-mosdo-crash.patch \
21 file://texinfo-4.13a-powerpc.patch \ 18 file://texinfo-4.13a-powerpc.patch \
22 file://texinfo-4.13a-help-index-segfault.patch \
23 file://disable-native-tools.patch \ 19 file://disable-native-tools.patch \
24 file://link-zip.patch \ 20 file://link-zip.patch \
25 file://gettext-macros.patch \
26 file://texinfo_fix_for_automake-1.12.patch \
27 file://dont-depend-on-help2man.patch \ 21 file://dont-depend-on-help2man.patch \
28 ${TARGET_PATCH}" 22 ${TARGET_PATCH} \
23 "
29 24
30SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb" 25SRC_URI[md5sum] = "54e250014fe698fb4832016158747c03"
31SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68" 26SRC_URI[sha256sum] = "50e8067f9758bb2bf175b69600082ac4a27c464cb4bcd48a578edd3127216600"
32 27
33S = "${WORKDIR}/texinfo-4.13" 28S = "${WORKDIR}/${BP}"
34tex_texinfo = "texmf/tex/texinfo" 29tex_texinfo = "texmf/tex/texinfo"
35 30
36inherit gettext autotools 31inherit gettext autotools
@@ -56,11 +51,9 @@ FILES_info-doc = "${infodir}/info.info ${infodir}/dir ${infodir}/info-*.info \
56 ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ 51 ${mandir}/man1/info.1* ${mandir}/man5/info.5* \
57 ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" 52 ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*"
58 53
59FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi" 54FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi"
60FILES_${PN}-doc = "${datadir}/texinfo ${infodir}/texinfo* \ 55FILES_${PN}-doc = "${datadir}/texinfo ${infodir}/texinfo* \
61 ${datadir}/${tex_texinfo} \ 56 ${datadir}/${tex_texinfo} \
62 ${mandir}/man1/makeinfo.1* ${mandir}/man5/texinfo.5* \ 57 ${mandir}/man1 ${mandir}/man5"
63 ${mandir}/man1/texindex.1* ${mandir}/man1/texi2dvi.1* \
64 ${mandir}/man1/texi2pdf.1* ${mandir}/man1/pdftexi2dvi.1*"
65 58
66BBCLASSEXTEND = "native" 59BBCLASSEXTEND = "native"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-30 21:42:10 +0000