From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 8 Sep 2024 10:20:22 +0000 (+0300)
Subject: Update Texinfo
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=95a6fa9bd70cfff3e4a78381898f7b0487f6327a790039f6b4b14eb25531d1e9;p=bass.git

Update Texinfo
---

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 45a964f..e78765e 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -224,7 +224,7 @@
 /sxhkd-0.6.2-5-gb0923b6.tar.zst
 /sxhkd.git/
 /tcl8.6.14.tar.gz
-/texinfo-7.1.tar.xz
+/texinfo-7.1.1.tar.xz
 /tiff-4.6.0.tar.xz
 /tigervnc-1.13.90.tar.gz
 /tk8.6.14.tar.gz
diff --git a/build/distfiles/texinfo-7.1.1.tar.xz.meta4 b/build/distfiles/texinfo-7.1.1.tar.xz.meta4
new file mode 100644
index 0000000..b7b3c3f
--- /dev/null
+++ b/build/distfiles/texinfo-7.1.1.tar.xz.meta4
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="texinfo-7.1.1.tar.xz">
+    <hash type="blake3-256">b2caa41ae951413a1e64e7abfd90c722cf6ef509851ff933833d352ac3e76bc3</hash>
+    <hash type="blake2b-512">64dbd315e65d5b7cb0bb06c918e9924bb15a25a4bb26322db10b7ee98e9e6626b62592f8edd0ff016256f4a84837dabacb5278c3826e34fa3e080a5e8c0fb626</hash>
+    <hash type="blake2b-256">7749f51ccc4ae67e15dbf21e8c0624228c897ade108e0affe3819f3e7f39f1a8</hash>
+    <hash type="skein-512">cec3816511459c94e43846e3820b5bb130e35b7504889d66ceff772de04e9b79fb89bd4d0c5ba5275017f8a247a0fc1c859d6d9d98f5221fcfc90a775cdb1ab8</hash>
+    <hash type="shake128">b8e6191e5b8e0994af5487269167dcd9a70561977a1b68df58a2267ec9efa2da</hash>
+    <hash type="shake256">a5ac10091d59a2e220cfdee984ae1d711a1d0b8a09a777f424ca7be808b5044d218b625451aff032b3da28ea983f128208abf53e9179744da084f6175a5fca2d</hash>
+    <hash type="sha-512">05d605fba810f2939cab16ed5ddb341e22d397370648e6e0271c807fa573267e933c75ed7ae682c3c9cfecb568311a8df7abeb8c0556a94ef7169737d5b9c52a</hash>
+    <hash type="sha-256">31ae37e46283529432b61bee1ce01ed0090d599e606fc6a29dca1f77c76a6c82</hash>
+    <hash type="streebog-512">6689da537d833705f2eaaec7a2207ee4155b0fae062f791e2f89d42953f24b3145216b6745e619c3257be0b4098eb787ce6513ef9f4f3b02f97f1c9713acf0bb</hash>
+    <hash type="streebog-256">2a5df2d9ced274b118c8bf58551fc30a895cdcc184d851f1fcb3fe3a5e417b83</hash>
+    <hash type="xxh3-128">a077faf3328da1f159241fa2b437cc99</hash>
+    <signature mediatype="application/pgp-signature"><![CDATA[
+-----BEGIN PGP SIGNATURE-----
+
+iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCZtyXRhkcZ2F2aW5zbWl0
+aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/upBrsBAIFtn2ygX4jGyMF9xcmSQ0Br
+84+iJ7RuU8A8GliQS3kgAP4qaY6EJ6qQBPCdGLD0Co4gKM8GHKmPkRMl0loraVfu
+Vg==
+=Z01c
+-----END PGP SIGNATURE-----
+]]></signature>
+    <size>5572864</size>
+    <url>https://ftpmirror.gnu.org/texinfo/texinfo-7.1.1.tar.xz</url>
+  </file>
+</metalink>
diff --git a/build/distfiles/texinfo-7.1.tar.xz.meta4 b/build/distfiles/texinfo-7.1.tar.xz.meta4
deleted file mode 100644
index 7e24c8f..0000000
--- a/build/distfiles/texinfo-7.1.tar.xz.meta4
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="texinfo-7.1.tar.xz">
-    <hash type="blake3-256">4254ec7d0580952e67c59128d88e54d877455b386b99a33a3b9c8df6645c0e9d</hash>
-    <hash type="blake2b-512">4385ca6250daeaa4f6bfedd9ab41f25993613031bcb8da55360365701213f4f3cf786d958749c59dc1c9dda328eca42f028aa051a7062313142aa92f55a96ecd</hash>
-    <hash type="blake2b-256">90b9979021c64f79060082ab5839b85dbfbafc2ecb76907c4afefb15506735e5</hash>
-    <hash type="skein-512">3bc9ec6edfacb5ffbfbc983f7ef48ec07654f90d2f3d5e81ab0ded3ca6558b6c38da9d45682b1ec2d5026c233c9fc1f9e093a8d2648d0d0dcf7bd53f9c3d56c4</hash>
-    <hash type="shake128">8149b589361f5efd47b456a4eb950c5af9011360f5a113bd7b4377f9a946b77b</hash>
-    <hash type="shake256">3c6201023fd43f85d46c07dfc3687aac5373b5150fad01f7d05d5fe3205c5e4f9117dff67435277b9cabaa0aaa696427309b5d533c30900cacd8986981979a6d</hash>
-    <hash type="sha-512">ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db</hash>
-    <hash type="sha-256">deeec9f19f159e046fdf8ad22231981806dac332cc372f1c763504ad82b30953</hash>
-    <hash type="streebog-512">7fd7c11d8ba95b9850fde5893ac0b8a91a4f502f6a4b5b76ac509912d5cd60411d130c4ce185d933e3a596bdb0926fc8a6b8c915c707f63864e944e26df4ddb4</hash>
-    <hash type="streebog-256">e995394561bb0ea3eacbc87bd49a458f0b16fe0dbcd42f9e7adc0568f4a5cc47</hash>
-    <hash type="xxh3-128">698c26f2476e8ed904f24014e8c25388</hash>
-    <signature mediatype="application/pgp-signature"><![CDATA[
------BEGIN PGP SIGNATURE-----
-
-iI8EABEIADcWIQTq9mmzHjHh3svRFRPdvFedqzf7qQUCZS/iphkcZ2F2aW5zbWl0
-aDAxMjNAZ21haWwuY29tAAoJEN28V52rN/up5LYBALwlhLMF0ms2VhWq8mXvHbii
-L2ySgaLsL1Pe3bFv6UC5AP0XSWsH5VQGq3wRVvo5KCH9TIi2aAMZ3RrfJbaPmxHS
-xA==
-=bAky
------END PGP SIGNATURE-----
-]]></signature>
-    <size>5545720</size>
-    <url>https://ftpmirror.gnu.org/texinfo/texinfo-7.1.tar.xz</url>
-  </file>
-</metalink>
diff --git a/build/skel/multimedia/ffmpeg-n7.1-dev-2083-g94165d1b79d.do b/build/skel/multimedia/ffmpeg-n7.1-dev-2083-g94165d1b79d.do
index f7b24c3..733b574 100644
--- a/build/skel/multimedia/ffmpeg-n7.1-dev-2083-g94165d1b79d.do
+++ b/build/skel/multimedia/ffmpeg-n7.1-dev-2083-g94165d1b79d.do
@@ -8,7 +8,7 @@ stow
 archivers/zstd
 devel/gmake-4.4.1
 devel/pkgconf-2.1.1
-textproc/texinfo-7.1
+textproc/texinfo-7.1.1
 devel/nasm-2.16.01
 "
 rdeps="
diff --git a/build/skel/shells/zsh-full-5.9.do b/build/skel/shells/zsh-full-5.9.do
index 58d68fb..7857bad 100644
--- a/build/skel/shells/zsh-full-5.9.do
+++ b/build/skel/shells/zsh-full-5.9.do
@@ -2,7 +2,7 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 . "$BASS_ROOT"/build/skel/common.rc
 
-bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1 textproc/texinfo-7.1"
+bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1 textproc/texinfo-7.1.1"
 rdeps="devel/libiconv-1.17 devel/ncurses-6.4 devel/pcre-8.45"
 ver=${NAME#zsh-full-}
 redo-ifchange $bdeps "$DISTFILES"/zsh-$ver.tar.xz $rdeps
diff --git a/build/skel/textproc/texinfo-7.1.do b/build/skel/textproc/texinfo-7.1.1.do
similarity index 92%
rename from build/skel/textproc/texinfo-7.1.do
rename to build/skel/textproc/texinfo-7.1.1.do
index 483e831..8168fc4 100644
--- a/build/skel/textproc/texinfo-7.1.do
+++ b/build/skel/textproc/texinfo-7.1.1.do
@@ -22,8 +22,6 @@ for f in pod2texi texi2any ; do
 done
 cd "$SKELBINS"/$ARCH/$NAME-$hsh/share/texinfo/Texinfo/Convert
 patch <"$BASS_ROOT"/build/skel/textproc/texinfo-bordered-table.patch >&2
-cd ..
-patch <"$BASS_ROOT"/build/skel/textproc/texinfo-no-ref-in-item-warn.patch >&2
 
 cd "$SKELBINS"/$ARCH
 rm -f $NAME-$hsh/share/info/dir
diff --git a/build/skel/textproc/texinfo-no-ref-in-item-warn.patch b/build/skel/textproc/texinfo-no-ref-in-item-warn.patch
deleted file mode 100644
index fc6e606..0000000
--- a/build/skel/textproc/texinfo-no-ref-in-item-warn.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ParserNonXS.pm.orig	2024-07-18 02:53:41.582404000 +0300
-+++ ParserNonXS.pm	2024-07-25 11:36:22.958731000 +0300
-@@ -499,7 +499,7 @@
- 
- my %in_basic_inline_commands = %in_full_text_commands;
- foreach my $not_in_basic_inline_commands
--                               ('xref', 'ref', 'pxref', 'inforef',
-+                               ('xref', 'pxref', 'inforef',
-                                 'titlefont', 'anchor', 'footnote', 'verb') {
-   delete $in_basic_inline_commands{$not_in_basic_inline_commands};
- }