[OE-core] [PATCH 1/5] texinfo: Upgrade 5.2 -> 6.0
Jussi Kukkonen
jussi.kukkonen at intel.com
Mon Aug 10 12:08:20 UTC 2015
* Remove texinfo-4.13a-powerpc.patch (already in upstream)
* Rebase texinfo-4.12-zlib.patch, dont-depend-on-help2man.patch
Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
---
.../texinfo/texinfo/dont-depend-on-help2man.patch | 47 ++++---
.../texinfo/texinfo/texinfo-4.12-zlib.patch | 156 +++++++++++++--------
.../texinfo/texinfo/texinfo-4.13a-powerpc.patch | 14 --
.../texinfo/{texinfo_5.2.bb => texinfo_6.0.bb} | 5 +-
4 files changed, 134 insertions(+), 88 deletions(-)
delete mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch
rename meta/recipes-extended/texinfo/{texinfo_5.2.bb => texinfo_6.0.bb} (93%)
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 876e0d0..0ce47ec 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 @@
+From 6f1f3912fcb900b3a3e6cbe3360306fade333497 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen at intel.com>
+Date: Thu, 6 Aug 2015 14:55:08 +0300
+Subject: [PATCH] dont-depend-on-help2man
+
Upstream-Status: Inappropriate
Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
-diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am
---- texinfo-5.1/doc/Makefile.am 2013-02-23 02:11:25.000000000 +0200
-+++ texinfo-5.1/doc/Makefile.am 2013-08-20 01:43:55.622376198 +0300
-@@ -40,7 +40,7 @@
+---
+ doc/Makefile.am | 2 +-
+ man/Makefile.am | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 7198a6b..4bba550 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
# Include our texinfo.tex, not Automake's.
EXTRA_DIST = epsf.tex texinfo.tex \
fdl.texi \
@@ -13,37 +24,41 @@ diff -Nurd texinfo-5.1/doc/Makefile.am texinfo-5.1/doc/Makefile.am
$(refcard_files)
if INSTALL_WARNINGS
-diff -Nurd texinfo-5.1/man/Makefile.am texinfo-5.1/man/Makefile.am
---- texinfo-5.1/man/Makefile.am 2013-02-23 02:11:25.000000000 +0200
-+++ texinfo-5.1/man/Makefile.am 2013-08-20 01:53:40.542395884 +0300
+diff --git a/man/Makefile.am b/man/Makefile.am
+index a08d603..bdfc9a4 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
@@ -13,24 +13,24 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
+
# These are generated using help2man.
-man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
+#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1
-
+
# These require the build in info/, thus can't do if we failed to find a
# terminal library.
if HAVE_TERMLIBS
--man_MANS += info.1 infokey.1
-+#man_MANS += info.1 infokey.1
+-man_MANS += info.1
++#man_MANS += info.1
endif
-
+
# These are hand-written.
-man_MANS += info.5 texinfo.5
+#man_MANS += info.5 texinfo.5
-
+
# This is generated by pod2man, but let's just run it by hand.
-man_MANS += pod2texi.1
+#man_MANS += pod2texi.1
-
+
# These are just .so's to the common program.
-man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
+#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
-
+
-EXTRA_DIST = $(man_MANS) ginfo.h2m
+EXTRA_DIST = ginfo.h2m
-
+
# Maintainers should be able to regenerate.
MAINTAINERCLEANFILES = $(man_MANS)
+--
+2.1.4
+
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 bebcbdf..41bd220 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 @@
+From 20e1d8a9481dc13dd1d4d168b90e0ed2ff097b98 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen at intel.com>
+Date: Thu, 6 Aug 2015 14:29:57 +0300
+Subject: [PATCH] texinfo-4.12-zlib
+
Upstream-Status: Pending
+---
+ install-info/Makefile.in | 2 +-
+ install-info/install-info.c | 67 +++++++++++++++++++++++++++------------------
+ 2 files changed, 42 insertions(+), 27 deletions(-)
-Index: texinfo-5.1/install-info/Makefile.in
-===================================================================
---- texinfo-5.1.orig/install-info/Makefile.in
-+++ texinfo-5.1/install-info/Makefile.in
-@@ -171,7 +171,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+diff --git a/install-info/Makefile.in b/install-info/Makefile.in
+index ad73abb..eaa2153 100644
+--- a/install-info/Makefile.in
++++ b/install-info/Makefile.in
+@@ -241,7 +241,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
@@ -13,10 +22,10 @@ Index: texinfo-5.1/install-info/Makefile.in
am__DEPENDENCIES_1 =
ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
$(am__DEPENDENCIES_1)
-Index: texinfo-5.1/install-info/install-info.c
-===================================================================
---- texinfo-5.1.orig/install-info/install-info.c
-+++ texinfo-5.1/install-info/install-info.c
+diff --git a/install-info/install-info.c b/install-info/install-info.c
+index b454c15..4e39122 100644
+--- a/install-info/install-info.c
++++ b/install-info/install-info.c
@@ -22,6 +22,7 @@
#include <getopt.h>
#include <regex.h>
@@ -25,16 +34,17 @@ Index: texinfo-5.1/install-info/install-info.c
#define TAB_WIDTH 8
-@@ -670,7 +671,7 @@ The first time you invoke Info you start
+@@ -684,15 +685,15 @@ The first time you invoke Info you start off looking at this node.\n\
- MAGIC number, not the filename. */
-
+ Return either stdin reading the file, or a non-stdin pipe reading
+ the output of the compression program. */
-FILE *
+void *
open_possibly_compressed_file (char *filename,
void (*create_callback) (char *),
- char **opened_filename, char **compression_program, int *is_pipe)
-@@ -678,7 +679,7 @@ open_possibly_compressed_file (char *fil
+- char **opened_filename, char **compression_program)
++ char **opened_filename, char **compression_program, int *is_pipe)
+ {
char *local_opened_filename, *local_compression_program;
int nread;
char data[13];
@@ -43,7 +53,7 @@ Index: texinfo-5.1/install-info/install-info.c
/* We let them pass NULL if they don't want this info, but it's easier
to always determine it. */
-@@ -686,48 +687,48 @@ open_possibly_compressed_file (char *fil
+@@ -700,48 +701,48 @@ open_possibly_compressed_file (char *filename,
opened_filename = &local_opened_filename;
*opened_filename = filename;
@@ -99,17 +109,17 @@ Index: texinfo-5.1/install-info/install-info.c
+ f = gzopen (*opened_filename, FOPEN_RBIN);
}
#endif /* __MSDOS__ */
- if (!f)
-@@ -739,7 +740,7 @@ open_possibly_compressed_file (char *fil
- /* And try opening it again. */
- free (*opened_filename);
- *opened_filename = filename;
-- f = fopen (*opened_filename, FOPEN_RBIN);
-+ f = gzopen (*opened_filename, FOPEN_RBIN);
- if (!f)
- pfatal_with_name (filename);
- }
-@@ -749,12 +750,12 @@ open_possibly_compressed_file (char *fil
+ if (!f)
+@@ -757,7 +758,7 @@ open_possibly_compressed_file (char *filename,
+ (*create_callback) (filename);
+
+ /* And try opening it again. */
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = gzopen (*opened_filename, FOPEN_RBIN);
+ if (!f)
+ return 0;
+ }
+@@ -767,12 +768,12 @@ open_possibly_compressed_file (char *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. */
@@ -118,70 +128,106 @@ Index: texinfo-5.1/install-info/install-info.c
+ nread = gzread (f, data, sizeof (data));
+ if (nread != sizeof (data))
{
- /* Empty files don't set errno, so we get something like
- "install-info: No error for foo", which is confusing. */
+ /* Empty files don't set errno. Calling code can check for
+ this, so make sure errno == 0 just in case it isn't already. */
- if (nread == 0)
+ if (nread >= 0)
- fatal (_("%s: empty file"), *opened_filename);
- pfatal_with_name (*opened_filename);
+ errno = 0;
+ return 0;
}
-@@ -821,20 +822,22 @@ open_possibly_compressed_file (char *fil
+@@ -838,35 +839,40 @@ open_possibly_compressed_file (char *filename,
+ *compression_program = NULL;
+
+ /* Seek back over the magic bytes. */
+- if (fseek (f, 0, 0) < 0)
++ if (gzseek (f, 0, SEEK_SET) == -1)
+ return 0;
if (*compression_program)
- { /* It's compressed, so fclose the file and then open a pipe. */
+ { /* It's compressed, so open a pipe. */
+ FILE *p;
- char *command = concat (*compression_program," -cd <", *opened_filename);
+ char *command = concat (*compression_program, " -d", "");
+
- if (fclose (f) < 0)
+ if (gzclose (f) < 0)
- pfatal_with_name (*opened_filename);
+ return 0;
+- f = freopen (*opened_filename, FOPEN_RBIN, stdin);
+- if (!f)
++ p = freopen (*opened_filename, FOPEN_RBIN, stdin);
++ if (!p)
+ return 0;
- f = popen (command, "r");
-- if (f)
+- if (!f)
+ p = popen (command, "r");
-+ if (p)
- *is_pipe = 1;
- else
- pfatal_with_name (command);
++ if (!p)
+ {
+ /* Used for error message in calling code. */
+ *opened_filename = command;
+ return 0;
+ }
++ else
++ *is_pipe = 1;
+ return p;
}
else
- { /* It's a plain file, seek back over the magic bytes. */
-- if (fseek (f, 0, 0) < 0)
-+ if (gzseek (f, 0, SEEK_SET) < 0)
- pfatal_with_name (*opened_filename);
+ {
-#if O_BINARY
+#if 0 && O_BINARY
/* Since this is a text file, and we opened it in binary mode,
switch back to text mode. */
f = freopen (*opened_filename, "r", f);
-@@ -859,7 +862,7 @@ readfile (char *filename, int *sizep,
+ if (! f)
+ return 0;
+ #endif
++ *is_pipe = 0;
+ }
+
+ return f;
+@@ -885,7 +891,8 @@ readfile (char *filename, int *sizep,
+ void (*create_callback) (char *), char **opened_filename,
char **compression_program)
{
- char *real_name;
- FILE *f;
+ void *f;
- int pipe_p;
++ int pipe_p;
int filled = 0;
int data_size = 8192;
-@@ -873,7 +876,12 @@ readfile (char *filename, int *sizep,
+ char *data = xmalloc (data_size);
+@@ -893,14 +900,20 @@ readfile (char *filename, int *sizep,
+ /* If they passed the space for the file name to return, use it. */
+ f = open_possibly_compressed_file (filename, create_callback,
+ opened_filename,
+- compression_program);
++ compression_program,
++ &pipe_p);
+
+ if (!f)
+ return 0;
for (;;)
{
- int nread = fread (data + filled, 1, data_size - filled, f);
+ int nread;
-+
++
+ if (pipe_p)
-+ nread = fread (data + filled, 1, data_size - filled, f);
++ nread = fread (data + filled, 1, data_size - filled, f);
+ else
-+ nread = gzread (f, data + filled, data_size - filled);
++ nread = gzread (f, data + filled, data_size - filled);
if (nread < 0)
- pfatal_with_name (real_name);
+ return 0;
if (nread == 0)
-@@ -895,7 +903,7 @@ readfile (char *filename, int *sizep,
- if (pipe_p)
+@@ -919,8 +932,10 @@ readfile (char *filename, int *sizep,
+ /* We need to close the stream, since on some systems the pipe created
+ by popen is simulated by a temporary file which only gets removed
+ inside pclose. */
+- if (f != stdin)
++ if (pipe_p)
pclose (f);
- else
-- fclose (f);
++ else
+ gzclose (f);
*sizep = filled;
return data;
+--
+2.1.4
+
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 312430f..0000000
--- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.13a-powerpc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Pending
-
-diff -up texinfo-4.13/install-info/install-info.c.patch texinfo-4.13/install-info/install-info.c
---- texinfo-4.13/install-info/install-info.c.patch 2010-01-11 14:46:32.000000000 +0100
-+++ texinfo-4.13/install-info/install-info.c 2010-01-11 14:48:47.162152695 +0100
-@@ -772,7 +772,7 @@ open_possibly_compressed_file (char *fil
- }
- else
- { /* It's a plain file, seek back over the magic bytes. */
-- if (gzseek (f, 0, SEEK_SET) < 0)
-+ if (gzseek (f, 0, SEEK_SET) == -1)
- pfatal_with_name (*opened_filename);
- #if 0 && O_BINARY
- /* 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
similarity index 93%
rename from meta/recipes-extended/texinfo/texinfo_5.2.bb
rename to meta/recipes-extended/texinfo/texinfo_6.0.bb
index aa644e1..8fb715a 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 = ""
SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
file://texinfo-4.12-zlib.patch \
- file://texinfo-4.13a-powerpc.patch \
file://disable-native-tools.patch \
file://link-zip.patch \
file://dont-depend-on-help2man.patch \
@@ -38,8 +37,8 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
${TARGET_PATCH} \
"
-SRC_URI[md5sum] = "1b8f98b80a8e6c50422125e07522e8db"
-SRC_URI[sha256sum] = "6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74"
+SRC_URI[md5sum] = "e1a2ef5dce5018b53f0f6eed45b247a7"
+SRC_URI[sha256sum] = "83d3183290f34e7f958d209d0b20022c6fe9e921eb6fe94c27d988827d4878d2"
tex_texinfo = "texmf/tex/texinfo"
--
2.1.4
More information about the Openembedded-core
mailing list