testing/texinfo
SHA256
3
0
Fork 0
forked from pool/texinfo
Code Pull Requests Activity

Fix factory issue with GPM (forwarded request 972890 from susnux)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texinfo?expand=0&rev=64
This commit is contained in:
Dominique Leuenberger 2022-04-27 19:40:57 +00:00 committed by Git OBS Bridge
parent 5190140a1a
commit f11c278de4
8 changed files with 118 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
13a8894fe2.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c b/tp/Texinfo/XS/parsetexi/end_line.c
index a5bd0ce..c973cc1 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -778,8 +778,8 @@ kdbinputstyle_invalid:
case CM_headings:
{
if (!strcmp (line, "off") || !strcmp (line, "on")
- || !strcmp (line, "double") || !strcmp (line, "singleafter")
- || !strcmp (line, "doubleafter"))
+ || !strcmp (line, "single") || !strcmp (line, "double")
+ || !strcmp (line, "singleafter") || !strcmp (line, "doubleafter"))
{
ADD_ARG(line);
}

3
texinfo-6.7.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa
size 4337984

8
texinfo-6.7.tar.xz.sig
View File

@ -1,8 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCXYpOxhkcZ2F2aW5zbWl0
aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upFfsA/ijrBDSblwgcANew2xreyJMk
2oicyeBfOWwiSbjlBNSsAP4+mM2vwqo2CAHqUd2CHGV0tz/FnU7SxPrOdJneUIc2
xQ==
=5SpL
-----END PGP SIGNATURE-----

3
texinfo-6.8.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4
size 4961528

8
texinfo-6.8.tar.xz.sig Normal file
View File

@ -0,0 +1,8 @@
-----BEGIN PGP SIGNATURE-----
iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCYOBI7hkcZ2F2aW5zbWl0
aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upvZEA/R2uZA180mjPpl2kesisoFr7
FgWLsI5pBkoW9zkQgHLFAP4+A356Y3n3KGzrJaekeDZaeyn+BxXxVWrzNEIP6Tvq
WA==
=xAUQ
-----END PGP SIGNATURE-----

98
texinfo-zlib.patch
View File

@ -1,23 +1,6 @@
Index: texinfo-6.6/install-info/Makefile.in diff -Nur texinfo-6.8/install-info/install-info.c new/install-info/install-info.c
=================================================================== --- texinfo-6.8/install-info/install-info.c 2021-06-15 22:02:27.000000000 +0200
--- +++ new/install-info/install-info.c 2022-04-25 12:38:13.573744683 +0200
texinfo-6.6/install-info/Makefile.in | 2 -
texinfo-6.6/install-info/install-info.c | 54 ++++++++++++++++++++++++--------
2 files changed, 42 insertions(+), 14 deletions(-)
--- texinfo-6.6/install-info/Makefile.in
+++ texinfo-6.6/install-info/Makefile.in 2019-09-27 08:03:19.381937177 +0000
@@ -218,7 +218,7 @@ am__installdirs = "$(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) -lzio
am__DEPENDENCIES_1 =
ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
--- texinfo-6.6/install-info/install-info.c
+++ texinfo-6.6/install-info/install-info.c 2019-09-27 08:52:36.071070583 +0000
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#include <getopt.h> #include <getopt.h>
#include <regex.h> #include <regex.h>
@ -26,20 +9,23 @@ Index: texinfo-6.6/install-info/Makefile.in
#define TAB_WIDTH 8 #define TAB_WIDTH 8
@@ -858,20 +859,33 @@ determine_file_type: @@ -852,22 +853,33 @@
return 0;
if (*compression_program) if (*compression_program)
- { /* It's compressed, so open a pipe. */ {
- /* Redirect stdin to the file and fork the decompression process
- reading from stdin. This allows shell metacharacters in filenames. */
- char *command = concat (*compression_program, " -d", ""); - char *command = concat (*compression_program, " -d", "");
- -
+ {
if (fclose (f) < 0) if (fclose (f) < 0)
return 0; return 0;
- f = freopen (*opened_filename, FOPEN_RBIN, stdin); - f = freopen (*opened_filename, FOPEN_RBIN, stdin);
- if (!f) - if (!f)
- return 0; - return 0;
- f = popen (command, "r"); - f = popen (command, "r");
- if (!f)
- {
+
+ if (**compression_program == 'g' || **compression_program == 'z') + if (**compression_program == 'g' || **compression_program == 'z')
+ f = fzopen (*opened_filename, "rg"); + f = fzopen (*opened_filename, "rg");
+ if (**compression_program == 'b') + if (**compression_program == 'b')
@ -50,28 +36,24 @@ Index: texinfo-6.6/install-info/Makefile.in
+ f = fzopen (*opened_filename, "rl"); + f = fzopen (*opened_filename, "rl");
+ if (**compression_program == 'x') + if (**compression_program == 'x')
+ f = fzopen (*opened_filename, "rx"); + f = fzopen (*opened_filename, "rx");
if (!f) + if (!f) {
- { + /* Redirect stdin to the file and fork the decompression process
- /* Used for error message in calling code. */ + reading from stdin. This allows shell metacharacters in filenames. */
- *opened_filename = command; + char *command = concat (*compression_program, " -d", "");
- return 0; + f = freopen (*opened_filename, FOPEN_RBIN, stdin);
+ { /* It's compressed, so open a pipe. */ + if (!f)
+ char *command = concat (*compression_program, " -d", ""); + return 0;
+ + f = popen (command, "r");
+ f = freopen (*opened_filename, FOPEN_RBIN, stdin); + if (!f) {
+ if (!f) /* Used for error message in calling code. */
+ return 0; *opened_filename = command;
+ f = popen (command, "r"); return 0;
+ if (!f)
+ {
+ /* Used for error message in calling code. */
+ *opened_filename = command;
+ return 0;
+ }
} }
+ }
} }
else else
@@ -958,8 +972,22 @@ output_dirfile (char *dirfile, int dir_n {
@@ -957,8 +969,22 @@
if (compression_program) if (compression_program)
{ {
@ -79,20 +61,32 @@ Index: texinfo-6.6/install-info/Makefile.in
- output = popen (command, "w"); - output = popen (command, "w");
+ output = NULL; + output = NULL;
+ if (*compression_program == 'g' || *compression_program == 'z') + if (*compression_program == 'g' || *compression_program == 'z')
+ output = fzopen (dirfile, "wg"); + output = fzopen (dirfile, "wg");
+ if (*compression_program == 'b') + if (*compression_program == 'b')
+ output = fzopen (dirfile, "wb"); + output = fzopen (dirfile, "wb");
+ if (*compression_program == 'Z') + if (*compression_program == 'Z')
+ output = fzopen (dirfile, "wZ"); + output = fzopen (dirfile, "wZ");
+ if (*compression_program == 'l') + if (*compression_program == 'l')
+ output = fzopen (dirfile, "wl"); + output = fzopen (dirfile, "wl");
+ if (*compression_program == 'x') + if (*compression_program == 'x')
+ output = fzopen (dirfile, "wx"); + output = fzopen (dirfile, "wx");
+ if (!output) + if (!output)
+ { + {
+ char *command = concat (compression_program, ">", dirfile); + char *command = concat (compression_program, ">", dirfile);
+ output = popen (command, "w"); + output = popen (command, "w");
+ } + }
} }
else else
output = fopen (dirfile, "w"); output = fopen (dirfile, "w");
diff -Nur texinfo-6.8/install-info/Makefile.in new/install-info/Makefile.in
--- texinfo-6.8/install-info/Makefile.in 2021-07-03 11:13:01.000000000 +0200
+++ new/install-info/Makefile.in 2022-04-25 12:30:06.593744741 +0200
@@ -239,7 +239,7 @@
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) -lzio
am__DEPENDENCIES_1 =
ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

39
texinfo.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Tue Apr 26 13:37:31 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
- Add 13a8894fe2.patch
* Fixing @headings: Add missing option value 'single'.
Resolved regression where gpm could not be build.
-------------------------------------------------------------------
Mon Apr 25 10:39:55 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to version 6.8
* new command @displaymath for formatting of mathematical notation
* new command @example takes an argument to specify the language
* Deprecate commands: @centerchap, @definfoenclose, @refill, @inforef
* new paper size @bsixpaper
* texi2any
* should be faster as Perl XS parser is enabled by default
* SHOW_MENU customization variable replaced by FORMAT_MENU.
* only check menu structure if CHECK_NORMAL_MENU_STRUCTURE
variable is set
* MathJax support for display of math.
* JavaScript License Web Labels support
* Use sectional tables of contents instead of menus by defaut
* Use section names in links by default
* CONTENTS_OUTPUT_LOCATION sets location of table of contents
* Document sections wrapped in <div> elements
* New variable USE_NODE_DIRECTIONS to use node or section structure
for node directions
* copiable anchor links for definitions
* Don't add an extra period before file extension given as
an argument to @image if image file is not found
* info: Support compressed dir files
* texi2dvi: Stop on first error in input file
* texinfo.tex:
* put logical page numbers into PDF's ('page labels')
* put chapter numbers in the PDF outline
* new Finnish translation
- Rebased texinfo-zlib.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 21 07:44:17 UTC 2022 - Dr. Werner Fink <werner@suse.de> Mon Feb 21 07:44:17 UTC 2022 - Dr. Werner Fink <werner@suse.de>

13
texinfo.spec
View File

@ -19,7 +19,7 @@
# perl modules are not installed in global path # perl modules are not installed in global path
%global __provides_exclude ^(libtool|perl)\\( %global __provides_exclude ^(libtool|perl)\\(
Name: texinfo Name: texinfo
Version: 6.7 Version: 6.8
Release: 0 Release: 0
Summary: Tools for creating documentation from texinfo sources Summary: Tools for creating documentation from texinfo sources
License: GPL-3.0-or-later License: GPL-3.0-or-later
@ -28,8 +28,10 @@ Source0: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz
Source1: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz.sig Source1: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz.sig
Source2: %{name}.keyring Source2: %{name}.keyring
Source42: %{name}-rpmlintrc Source42: %{name}-rpmlintrc
Patch1: texinfo-zlib.patch Patch0: texinfo-zlib.patch
Patch2: install-info_exitcode.patch Patch1: install-info_exitcode.patch
# PATCH-FIX-UPSTREAM 13a8894fe2.patch -- https://git.savannah.gnu.org/cgit/texinfo.git/diff/?id=13a8894fe2
Patch2: 13a8894fe2.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: glibc-locale BuildRequires: glibc-locale
BuildRequires: help2man BuildRequires: help2man
@ -106,8 +108,7 @@ or standalone GNU Info.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .zio %autopatch -p1
%patch2 -p1
%build %build
LANG=en_GB.UTF-8 LANG=en_GB.UTF-8
@ -115,7 +116,7 @@ export LANG
%configure \ %configure \
--with-external-Text-Unidecode \ --with-external-Text-Unidecode \
--enable-perl-xs --enable-perl-xs
make %{?_smp_mflags} %make_build
%install %install
%make_install %make_install