Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c26ac87e6 | ||
|
|
1e6c555686 | ||
|
|
2b9718590d | ||
|
|
508f143279 |
3 changed files with 114 additions and 1 deletions
69
texinfo-6.7-zstd-compression.patch
Normal file
69
texinfo-6.7-zstd-compression.patch
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
diff -up texinfo-6.7/info/filesys.c.omv~ texinfo-6.7/info/filesys.c
|
||||
--- texinfo-6.7/info/filesys.c.omv~ 2020-01-05 02:24:32.094858726 +0100
|
||||
+++ texinfo-6.7/info/filesys.c 2020-01-05 02:25:59.789854472 +0100
|
||||
@@ -58,9 +58,11 @@ static COMPRESSION_ALIST compress_suffix
|
||||
#if STRIP_DOT_EXE
|
||||
{ ".gz", "gunzip" },
|
||||
{ ".lz", "lunzip" },
|
||||
+ { ".zst", "unzstd" },
|
||||
#else
|
||||
{ ".gz", "gzip -d" },
|
||||
{ ".lz", "lzip -d" },
|
||||
+ { ".zst", "zstd -d" },
|
||||
#endif
|
||||
{ ".xz", "unxz" },
|
||||
{ ".bz2", "bunzip2" },
|
||||
diff -up texinfo-6.7/install-info/install-info.c.omv~ texinfo-6.7/install-info/install-info.c
|
||||
--- texinfo-6.7/install-info/install-info.c.omv~ 2020-01-05 02:20:38.837870043 +0100
|
||||
+++ texinfo-6.7/install-info/install-info.c 2020-01-05 02:24:03.029860136 +0100
|
||||
@@ -451,6 +451,16 @@ strip_info_suffix (char *fname)
|
||||
len -= 4;
|
||||
ret[len] = 0;
|
||||
}
|
||||
+ else if (len > 4 && FILENAME_CMP (ret + len - 4, ".zst") == 0)
|
||||
+ {
|
||||
+ len -= 4;
|
||||
+ ret[len] = 0;
|
||||
+ }
|
||||
+ else if (len > 5 && FILENAME_CMP (ret + len - 5, ".zstd") == 0)
|
||||
+ {
|
||||
+ len -= 5;
|
||||
+ ret[len] = 0;
|
||||
+ }
|
||||
#ifdef __MSDOS__
|
||||
else if (len > 4 && (FILENAME_CMP (ret + len - 4, ".inz") == 0
|
||||
|| FILENAME_CMP (ret + len - 4, ".igz") == 0))
|
||||
@@ -727,6 +737,18 @@ open_possibly_compressed_file (char *fil
|
||||
*opened_filename = concat (filename, ".lzma", "");
|
||||
f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
}
|
||||
+ if (!f)
|
||||
+ {
|
||||
+ free (*opened_filename);
|
||||
+ *opened_filename = concat (filename, ".zst", "");
|
||||
+ f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+ }
|
||||
+ if (!f)
|
||||
+ {
|
||||
+ free (*opened_filename);
|
||||
+ *opened_filename = concat (filename, ".zstd", "");
|
||||
+ f = fopen (*opened_filename, FOPEN_RBIN);
|
||||
+ }
|
||||
#ifdef __MSDOS__
|
||||
if (!f)
|
||||
{
|
||||
@@ -850,6 +872,14 @@ determine_file_type:
|
||||
*compression_program = "lzma";
|
||||
#endif
|
||||
|
||||
+ else if (data[0] == 0x28 && data[1] == 0xb5 && data[2] == 0x2f
|
||||
+ && data[3] == 0xfd)
|
||||
+#ifndef STRIP_DOT_EXE
|
||||
+ *compression_program = "zstd.exe";
|
||||
+#else
|
||||
+ *compression_program = "zstd";
|
||||
+#endif
|
||||
+
|
||||
else
|
||||
*compression_program = NULL;
|
||||
|
||||
24
texinfo-7.2-fix-perl-precedence-warnings.patch
Normal file
24
texinfo-7.2-fix-perl-precedence-warnings.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff -up texinfo-7.2/tp/Texinfo/Convert/Converter.pm.orig texinfo-7.2/tp/Texinfo/Convert/Converter.pm
|
||||
--- texinfo-7.2/tp/Texinfo/Convert/Converter.pm.orig 2024-12-19 19:31:42.000000000 +0100
|
||||
+++ texinfo-7.2/tp/Texinfo/Convert/Converter.pm 2025-08-01 10:31:55.845929864 +0200
|
||||
@@ -386,7 +386,7 @@ sub output_tree($$)
|
||||
|
||||
my $fh;
|
||||
my $encoded_output_file;
|
||||
- if (! $output_file eq '') {
|
||||
+ if ($output_file ne '') {
|
||||
my $path_encoding;
|
||||
($encoded_output_file, $path_encoding)
|
||||
= $self->encoded_output_file_name($output_file);
|
||||
diff -up texinfo-7.2/tp/Texinfo/Convert/LaTeX.pm.orig texinfo-7.2/tp/Texinfo/Convert/LaTeX.pm
|
||||
--- texinfo-7.2/tp/Texinfo/Convert/LaTeX.pm.orig 2024-12-19 19:31:42.000000000 +0100
|
||||
+++ texinfo-7.2/tp/Texinfo/Convert/LaTeX.pm 2025-08-01 10:32:57.790836873 +0200
|
||||
@@ -1085,7 +1085,7 @@ sub output($$)
|
||||
|
||||
my $fh;
|
||||
my $encoded_output_file;
|
||||
- if (! $output_file eq '') {
|
||||
+ if ($output_file ne '') {
|
||||
my $path_encoding;
|
||||
($encoded_output_file, $path_encoding)
|
||||
= $self->encoded_output_file_name($output_file);
|
||||
22
texinfo.spec
22
texinfo.spec
|
|
@ -3,7 +3,7 @@
|
|||
Summary: Tools needed to create Texinfo format documentation files
|
||||
Name: texinfo
|
||||
Version: 7.2
|
||||
Release: 3%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: GPL-3.0-or-later
|
||||
Url: http://www.gnu.org/software/texinfo/
|
||||
Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
|
||||
|
|
@ -17,6 +17,10 @@ Patch1: texinfo-6.5-fix-info-dir.patch
|
|||
Patch3: texinfo-7.1-various-sast-fixes.patch
|
||||
# Patch4: fixes issues detected by static analysis
|
||||
Patch4: texinfo-7.1-make-tainted-data-safe.patch
|
||||
# Patch5: fixes Perl precedence warnings (already upstream)
|
||||
Patch5: texinfo-7.2-fix-perl-precedence-warnings.patch
|
||||
# Patch6: add support for zstd compression
|
||||
Patch6: texinfo-6.7-zstd-compression.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
|
|
@ -51,6 +55,8 @@ browser program for viewing texinfo files.
|
|||
Summary: Tools for formatting Texinfo documentation files using TeX
|
||||
Requires: texinfo = %{version}-%{release}
|
||||
Requires: tex(tex) tex(epsf.tex)
|
||||
Requires: /usr/bin/cmp
|
||||
Requires: /usr/bin/diff
|
||||
Requires(post): %{_bindir}/texconfig-sys
|
||||
Requires(postun): %{_bindir}/texconfig-sys
|
||||
Provides: tex-texinfo
|
||||
|
|
@ -146,6 +152,20 @@ export ALL_TESTS=yes
|
|||
%{_mandir}/man1/pdftexi2dvi.1*
|
||||
|
||||
%changelog
|
||||
* Sat Nov 29 2025 Neal Gompa <ngompa@fedoraproject.org> - 7.2-7
|
||||
- Add patch to support zstd compressed info pages
|
||||
|
||||
* Fri Aug 01 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 7.2-6
|
||||
- Fix FTBFS (Perl precedence warnings)
|
||||
Resolves: #2385687
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Wed Jun 25 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 7.2-4
|
||||
- Fix texi2dvi missing dependencies
|
||||
Resolves: #2374602
|
||||
|
||||
* Tue Jan 21 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 7.2-3
|
||||
- Changes related to bin and sbin unify
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue