texinfo: update 6.7 -> 6.8
PATCH 1/1 texinfo: update 6.7 -> 6.8
Drop texinfo-4.12-zlib.patch as it completely lacks a description, was added together with the original recipe without an explanation in the commit message, and is difficult to rebase.
---
.../texinfo/texinfo/texinfo-4.12-zlib.patch | 254 ------------------
.../{texinfo_6.7.bb => texinfo_6.8.bb} | 4 +-
2 files changed, 1 insertion(+), 257 deletions(-)
delete mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
rename meta/recipes-extended/texinfo/{texinfo_6.7.bb => texinfo_6.8.bb} (94%)meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0 -254
@@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001 -From: Edwin Plauchu <[email protected]> -Date: Tue, 29 Nov 2016 12:27:17 -0600 -Subject: [PATCH] texinfo-4.12-zlib - -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <[email protected]> -Signed-off-by: Edwin Plauchu <[email protected]> - ---- - install-info/Makefile.in | 2 +- - install-info/install-info.c | 79 ++++++++++++++++++++++--------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@ - #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start off looking at this node.\n\ - - 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) -+ char **opened_filename, char **compression_program, int *is_pipe) - { - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,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; - } -@@ -764,26 +765,26 @@ 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. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof(f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose(f) != 0) - return 0; /* unknown error closing file */ - -- if (remove (filename) != 0) -+ if (remove(filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread(f, data, sizeof (data)); -+ if (nread >= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *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 open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - 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) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#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); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - { -- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,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); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,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 -+ gzclose (f); - - *sizep = filled; - return data;
meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +1 -3
@@ -29,15 +29,13 @@ TARGET_PATCH = "file://use_host_makedoc.patch" TARGET_PATCH_class-native = "" SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ file://disable-native-tools.patch \ file://link-zip.patch \ file://dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] = "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e" +SRC_URI[sha256sum] = "8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08" tex_texinfo = "texmf/tex/texinfo"
Signature · 1 line
2.31.1
Quoted 2 lines · Alexander Kanavin
Drop texinfo-4.12-zlib.patch as it completely lacks a description,
if it is not described then perhaps adding description to it will make things better, the patch is adding gz compressed
info files which should reduce the size of these files which is quite good for embedded systems. Distros like fedora and suse
are carrying this patch too.
Quoted 3 lines
was added together with the original recipe without an explanation in the commit message, and is difficult to rebase.
Get it from https://src.fedoraproject.org/rpms/texinfo/raw/rawhide/f/texinfo-4.12-zlib.patch
this time.
Quoted 298 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../texinfo/texinfo/texinfo-4.12-zlib.patch | 254 ------------------ .../{texinfo_6.7.bb => texinfo_6.8.bb} | 4 +- 2 files changed, 1 insertion(+), 257 deletions(-) delete mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch rename meta/recipes-extended/texinfo/{texinfo_6.7.bb => texinfo_6.8.bb} (94%)meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-254@@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001 -From: Edwin Plauchu <[email protected]> -Date: Tue, 29 Nov 2016 12:27:17 -0600 -Subject: [PATCH] texinfo-4.12-zlib - -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <[email protected]> -Signed-off-by: Edwin Plauchu <[email protected]> - ---- - install-info/Makefile.in | 2 +- - install-info/install-info.c | 79 ++++++++++++++++++++++--------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@ - #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start off looking at this node.\n\ - - 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) -+ char **opened_filename, char **compression_program, int *is_pipe) - { - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,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; - } -@@ -764,26 +765,26 @@ 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. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof(f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose(f) != 0) - return 0; /* unknown error closing file */ - -- if (remove (filename) != 0) -+ if (remove(filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread(f, data, sizeof (data)); -+ if (nread >= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *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 open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - 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) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#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); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - { -- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,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); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,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 -+ gzclose (f); - - *sizep = filled; - return data;meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +1
-4@@ -29,15 +29,13 @@ TARGET_PATCH = "file://use_host_makedoc.patch" TARGET_PATCH_class-native = "" SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ file://disable-native-tools.patch \ file://link-zip.patch \ file://dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] = "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e" +SRC_URI[sha256sum] = "8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08" tex_texinfo = "texmf/tex/texinfo" --2.31.1
Khem, please. What is the use case you are trying to justify? Who on earth would want to install and read .info files on a target device (of the kind where saving a few kilobytes matters, no less!), when it's a million times more convenient to do that on the host, or just open the same things hosted online in a browser?
Sorry, no.
Alex
Quoted 329 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
Drop texinfo-4.12-zlib.patch as it completely lacks a description,
if it is not described then perhaps adding description to it will make things better, the patch is adding gz compressed
info files which should reduce the size of these files which is quite good for embedded systems. Distros like fedora and suse
are carrying this patch too.Quoted 3 lines
was added together with the original recipe without an explanation in the commit message, and is difficult to rebase.
Get it from
https://src.fedoraproject.org/rpms/texinfo/raw/rawhide/f/texinfo-4.12-zlib.patch
this time.Quoted 6 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../texinfo/texinfo/texinfo-4.12-zlib.patch | 254 ------------------ .../{texinfo_6.7.bb => texinfo_6.8.bb} | 4 +- 2 files changed, 1 insertion(+), 257 deletions(-) delete mode 100644
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patchQuoted 1 line
rename meta/recipes-extended/texinfo/{texinfo_6.7.bb => texinfo_6.8.bb}(94%)
Quoted 2 lines
diff --git
a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patchb/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patchQuoted 15 lines
deleted file mode 100644
index f72097e639..0000000000meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-10@@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001 -From: Edwin Plauchu <[email protected]> -Date: Tue, 29 Nov 2016 12:27:17 -0600 -Subject: [PATCH] texinfo-4.12-zlib - -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <[email protected]> -Signed-off-by: Edwin Plauchu <[email protected]> -meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch line 20
Quoted 10 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-10---- - install-info/Makefile.in | 2 +- - install-info/install-info.c | 79 ++++++++++++++++++++++--------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)""$(DESTDIR)$(bindir)"
Quoted 11 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-11- PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.cmeta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 10 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-10-+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@ - #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start offlooking at this node.\n\
Quoted 7 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-7- - 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 *),meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 10 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-10-- 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]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it'seasier
Quoted 176 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-176- to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,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; - } -@@ -764,26 +765,26 @@ 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. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof(f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose(f) != 0) - return 0; /* unknown error closing file */ - -- if (remove (filename) != 0) -+ if (remove(filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread(f, data, sizeof (data)); -+ if (nread >= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *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 open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - 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) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#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); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - { -- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,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;meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 10 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-10-+ -+ if (pipe_p) -+ nread = fread (data + filled, 1, data_size - filled, f); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep, - /* We need to close the stream, since on some systems the pipecreated
Review
Quoted 11 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-10- by popen is simulated by a temporary file which only gets removed - inside pclose. */ -- if (f != stdin) -+ if (pipe_p) - pclose (f); -+ else -+ gzclose (f); - - *sizep = filled; - return data;(quoted diff) +0
-0b/meta/recipes-extended/texinfo/texinfo_6.8.bb
Quoted 9 lines
similarity index 94%
rename from meta/recipes-extended/texinfo/texinfo_6.7.bb rename to meta/recipes-extended/texinfo/texinfo_6.8.bb indexd421b79a0b..e5046ffbe1100644meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +0
-0@@ -29,15 +29,13 @@ TARGET_PATCH = "file://use_host_makedoc.patch" TARGET_PATCH_class-native = ""meta/recipes-extended/texinfo/texinfo_6.8.bb TARGET_PATCH = "file://use_host_makedoc.patch" · line 40
Quoted 10 lines
meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +0
-3SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ file://disable-native-tools.patch \ file://link-zip.patch \ file://dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] ="
a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e"meta/recipes-extended/texinfo/texinfo_6.8.bb TARGET_PATCH = "file://use_host_makedoc.patch" · line 38
Quoted 1 line
meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +1
-0+SRC_URI[sha256sum] ="
8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08"Quoted 9 lines
meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +0
-1tex_texinfo = "texmf/tex/texinfo" --2.31.1
Quoted 3 lines · Alexander Kanavin
Khem, please. What is the use case you are trying to justify? Who on earth would want to install and read .info files on a target device (of the kind where saving a few kilobytes matters, no less!), when it's a million times more convenient to do that on the host, or just open the same things hosted online in a browser?
iff its added I would err on the side that patch is used by users, since adding a patch to implement unused feature would be counter intuitive.
This patch has been there for long time in OE, there is not much effort to port it forward as other distros are maintaining this patch too, perhaps its better to carry this on, I would have agreed if it was something that OE was lugging along alone.
Quoted 1 line
Sorry, no.
thats fine, drop this upgrade.
Quoted 321 lines
Alex
Quoted 317 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
Drop texinfo-4.12-zlib.patch as it completely lacks a description,
if it is not described then perhaps adding description to it will make things better, the patch is adding gz compressed
info files which should reduce the size of these files which is quite good for embedded systems. Distros like fedora and suse
are carrying this patch too.Quoted 3 lines
was added together with the original recipe without an explanation in the commit message, and is difficult to rebase.
Get it from https://src.fedoraproject.org/rpms/texinfo/raw/rawhide/f/texinfo-4.12-zlib.patch
this time.Quoted 298 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../texinfo/texinfo/texinfo-4.12-zlib.patch | 254 ------------------ .../{texinfo_6.7.bb => texinfo_6.8.bb} | 4 +- 2 files changed, 1 insertion(+), 257 deletions(-) delete mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch rename meta/recipes-extended/texinfo/{texinfo_6.7.bb => texinfo_6.8.bb} (94%)meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-254@@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001 -From: Edwin Plauchu <[email protected]> -Date: Tue, 29 Nov 2016 12:27:17 -0600 -Subject: [PATCH] texinfo-4.12-zlib - -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <[email protected]> -Signed-off-by: Edwin Plauchu <[email protected]> - ---- - install-info/Makefile.in | 2 +- - install-info/install-info.c | 79 ++++++++++++++++++++++--------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@ - #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start off looking at this node.\n\ - - 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) -+ char **opened_filename, char **compression_program, int *is_pipe) - { - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,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; - } -@@ -764,26 +765,26 @@ 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. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof(f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose(f) != 0) - return 0; /* unknown error closing file */ - -- if (remove (filename) != 0) -+ if (remove(filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread(f, data, sizeof (data)); -+ if (nread >= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *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 open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - 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) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#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); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - { -- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,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); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,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 -+ gzclose (f); - - *sizep = filled; - return data;meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +1
-4@@ -29,15 +29,13 @@ TARGET_PATCH = "file://use_host_makedoc.patch" TARGET_PATCH_class-native = "" SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ file://disable-native-tools.patch \ file://link-zip.patch \ file://dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] = "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e" +SRC_URI[sha256sum] = "8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08" tex_texinfo = "texmf/tex/texinfo" --2.31.1
Once again: it was bundled with the initial recipe submission over 10 years ago, without explanation or origin info, and not added later on. There was never any indication anyone finds it useful. Probably someone just took all of Red Hat's patches without reviewing their utility.
I am not porting it forward, the use case is simply not there, what you are saying is utter madness, and we should spend our time on actually useful things, where there is clear evidence they are useful.
Alex
Quoted 364 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
Khem, please. What is the use case you are trying to justify? Who on
earth would want to install and read .info files on a target device (of the kind where saving a few kilobytes matters, no less!), when it's a million times more convenient to do that on the host, or just open the same things hosted online in a browser?
Quoted 1 line
iff its added I would err on the side that patch is used by users, since adding a patch to implement unused feature would be counter intuitive.
This patch has been there for long time in OE, there is not much effort to port it forward as other distros are maintaining this patch too, perhaps its better to carry this on, I would have agreed if it was something that OE was lugging along alone.Quoted 1 line
Sorry, no.
thats fine, drop this upgrade.
Quoted 21 lines
Alex
Quoted 17 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
Drop texinfo-4.12-zlib.patch as it completely lacks a description,
if it is not described then perhaps adding description to it will make things better, the patch is adding gz compressed
info files which should reduce the size of these files which is quite good for embedded systems. Distros like fedora and suse
are carrying this patch too.Quoted 3 lines
was added together with the original recipe without an explanation in the commit message, and is difficult to rebase.
Get it from
https://src.fedoraproject.org/rpms/texinfo/raw/rawhide/f/texinfo-4.12-zlib.patch
Quoted 5 lines
Quoted 5 lines
this time.
Quoted 3 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../texinfo/texinfo/texinfo-4.12-zlib.patch | 254------------------
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
.../{texinfo_6.7.bb => texinfo_6.8.bb} | 4 +- 2 files changed, 1 insertion(+), 257 deletions(-) delete mode 100644
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patchQuoted 1 line
Quoted 1 line
Quoted 1 line
rename meta/recipes-extended/texinfo/{texinfo_6.7.bb =>texinfo_6.8.bb} (94%)
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
diff --git
a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patchb/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patchQuoted 6 lines
Quoted 6 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch line 1
Quoted 6 lines
deleted file mode 100644
index f72097e639..0000000000meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-1@@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:002001
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-4-From: Edwin Plauchu <[email protected]> -Date: Tue, 29 Nov 2016 12:27:17 -0600 -Subject: [PATCH] texinfo-4.12-zlib -Quoted 8 lines
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-8-Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <[email protected]> -Signed-off-by: Edwin Plauchu <[email protected]> - ---- - install-info/Makefile.in | 2 +- - install-info/install-info.c | 79++++++++++++++++++++++---------------
Quoted 7 lines
Quoted 7 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 7 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-7- 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)""$(DESTDIR)$(bindir)"
Quoted 9 lines
Quoted 9 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 9 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-9- PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c
b/install-info/install-info.cQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-4-index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@Quoted 8 lines
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-8- #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start offlooking at this node.\n\
Quoted 9 lines
Quoted 9 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 9 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-9- - 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) -+ char **opened_filename, char **compression_program, int
*is_pipe)Quoted 8 lines
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-8- { - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it'seasier
Quoted 62 lines
Quoted 62 lines
Quoted 62 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-62- to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,7 @@ open_possibly_compressed_file (char *filename, - (*create_callback) (filename); - - /* And try opening it again. */Quoted 8 lines
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-8-- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; - } -@@ -764,26 +765,26 @@ open_possibly_compressed_file (char *filename, - - /* Read first few bytes of file rather than relying on thefilename.
Quoted 85 lines
Quoted 85 lines
Quoted 85 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-85- If the file is shorter than this it can't be usable anyway. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof(f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose(f) != 0) - return 0; /* unknown error closing file */ - -- if (remove (filename) != 0) -+ if (remove(filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread(f, data, sizeof (data)); -+ if (nread >= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *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 open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - 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) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#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); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - {Quoted 8 lines
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-8-- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,20 @@ readfile (char *filename, int *sizep, - /* If they passed the space for the file name to return, use it.*/
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-15- 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)Quoted 8 lines
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
Quoted 8 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-8-+ nread = fread (data + filled, 1, data_size - filled, f); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep, - /* We need to close the stream, since on some systems the pipecreated
Quoted 1 line
Quoted 1 line
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch line 245
Quoted 1 line
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-1- by popen is simulated by a temporary file which only getsremoved
Quoted 10 lines
Quoted 10 lines
Review
Quoted 10 lines
meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-9- inside pclose. */ -- if (f != stdin) -+ if (pipe_p) - pclose (f); -+ else -+ gzclose (f); - - *sizep = filled; - return data;(quoted diff) +0
-0b/meta/recipes-extended/texinfo/texinfo_6.8.bb
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
similarity index 94%
rename from meta/recipes-extended/texinfo/texinfo_6.7.bb rename to meta/recipes-extended/texinfo/texinfo_6.8.bb indexd421b79a0b..e5046ffbe1100644meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +0
-1@@ -29,15 +29,13 @@ TARGET_PATCH = "file://use_host_makedoc.patch" TARGET_PATCH_class-native = "" SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ file://disable-native-tools.patch \ file://link-zip.patch \ file://dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ "Quoted 2 lines
Quoted 2 lines
meta/recipes-extended/texinfo/texinfo_6.8.bb TARGET_PATCH = "file://use_host_makedoc.patch" · line 40
Quoted 2 lines
meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +0
-2-SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] ="
a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e"Quoted 1 line
Quoted 1 line
meta/recipes-extended/texinfo/texinfo_6.8.bb TARGET_PATCH = "file://use_host_makedoc.patch" · line 38
Quoted 1 line
meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +1
-0+SRC_URI[sha256sum] ="
8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08"Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +0
-1tex_texinfo = "texmf/tex/texinfo" --2.31.1
Quoted 5 lines · Alexander Kanavin
Once again: it was bundled with the initial recipe submission over 10 years ago, without explanation or origin info, and not added later on. There was never any indication anyone finds it useful. Probably someone just took all of Red Hat's patches without reviewing their utility.
I am not porting it forward, the use case is simply not there, what you are saying is utter madness, and we should spend our time on actually useful things, where there is clear evidence they are useful.
My consideration was if it was being used for larger distributions being built using OE they might be using this but then perhaps we do not have data on someone using it and no one has raised their hand.
I do not have a direct usecase where info files are shipped on target
either. in that light perhaps its fine to drop it.
Quoted 343 lines
Alex
Quoted 340 lines · Khem Raj
Quoted 3 lines · Alexander Kanavin
Khem, please. What is the use case you are trying to justify? Who on earth would want to install and read .info files on a target device (of the kind where saving a few kilobytes matters, no less!), when it's a million times more convenient to do that on the host, or just open the same things hosted online in a browser?
iff its added I would err on the side that patch is used by users, since adding a patch to implement unused feature would be counter intuitive.
This patch has been there for long time in OE, there is not much effort to port it forward as other distros are maintaining this patch too, perhaps its better to carry this on, I would have agreed if it was something that OE was lugging along alone.Quoted 1 line
Sorry, no.
thats fine, drop this upgrade.
Quoted 321 lines
Alex
Quoted 317 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin
Drop texinfo-4.12-zlib.patch as it completely lacks a description,
if it is not described then perhaps adding description to it will make things better, the patch is adding gz compressed
info files which should reduce the size of these files which is quite good for embedded systems. Distros like fedora and suse
are carrying this patch too.Quoted 3 lines
was added together with the original recipe without an explanation in the commit message, and is difficult to rebase.
Get it from https://src.fedoraproject.org/rpms/texinfo/raw/rawhide/f/texinfo-4.12-zlib.patch
this time.Quoted 298 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../texinfo/texinfo/texinfo-4.12-zlib.patch | 254 ------------------ .../{texinfo_6.7.bb => texinfo_6.8.bb} | 4 +- 2 files changed, 1 insertion(+), 257 deletions(-) delete mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch rename meta/recipes-extended/texinfo/{texinfo_6.7.bb => texinfo_6.8.bb} (94%)meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-254@@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001 -From: Edwin Plauchu <[email protected]> -Date: Tue, 29 Nov 2016 12:27:17 -0600 -Subject: [PATCH] texinfo-4.12-zlib - -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <[email protected]> -Signed-off-by: Edwin Plauchu <[email protected]> - ---- - install-info/Makefile.in | 2 +- - install-info/install-info.c | 79 ++++++++++++++++++++++--------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@ - #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start off looking at this node.\n\ - - 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) -+ char **opened_filename, char **compression_program, int *is_pipe) - { - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,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; - } -@@ -764,26 +765,26 @@ 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. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof(f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose(f) != 0) - return 0; /* unknown error closing file */ - -- if (remove (filename) != 0) -+ if (remove(filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread(f, data, sizeof (data)); -+ if (nread >= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *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 open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - 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) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#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); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - { -- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,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); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,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 -+ gzclose (f); - - *sizep = filled; - return data;meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +1
-4@@ -29,15 +29,13 @@ TARGET_PATCH = "file://use_host_makedoc.patch" TARGET_PATCH_class-native = "" SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ file://disable-native-tools.patch \ file://link-zip.patch \ file://dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] = "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e" +SRC_URI[sha256sum] = "8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08" tex_texinfo = "texmf/tex/texinfo" --2.31.1
This fails to build with master-next (+ glibc 2.34 perhaps)
https://errors.yoctoproject.org/Errors/Details/587462/
Quoted 303 lines · Alexander Kanavin
Drop texinfo-4.12-zlib.patch as it completely lacks a description, was added together with the original recipe without an explanation in the commit message, and is difficult to rebase.
Signed-off-by Alexander Kanavin <[email protected]>--- .../texinfo/texinfo/texinfo-4.12-zlib.patch | 254 ------------------ .../{texinfo_6.7.bb => texinfo_6.8.bb} | 4 +- 2 files changed, 1 insertion(+), 257 deletions(-) delete mode 100644 meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch rename meta/recipes-extended/texinfo/{texinfo_6.7.bb => texinfo_6.8.bb} (94%)meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted +0
-254@@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001 -From: Edwin Plauchu <[email protected]> -Date: Tue, 29 Nov 2016 12:27:17 -0600 -Subject: [PATCH] texinfo-4.12-zlib - -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <[email protected]> -Signed-off-by: Edwin Plauchu <[email protected]> - ---- - install-info/Makefile.in | 2 +- - install-info/install-info.c | 79 ++++++++++++++++++++++--------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@ - #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start off looking at this node.\n\ - - 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) -+ char **opened_filename, char **compression_program, int *is_pipe) - { - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,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; - } -@@ -764,26 +765,26 @@ 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. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof(f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose(f) != 0) - return 0; /* unknown error closing file */ - -- if (remove (filename) != 0) -+ if (remove(filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread(f, data, sizeof (data)); -+ if (nread >= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *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 open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - 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) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#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); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - { -- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,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); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,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 -+ gzclose (f); - - *sizep = filled; - return data;meta/recipes-extended/texinfo/texinfo_6.8.bb renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb +1
-4@@ -29,15 +29,13 @@ TARGET_PATCH = "file://use_host_makedoc.patch" TARGET_PATCH_class-native = "" SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ file://disable-native-tools.patch \ file://link-zip.patch \ file://dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] = "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e" +SRC_URI[sha256sum] = "8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08" tex_texinfo = "texmf/tex/texinfo" --2.31.1