Update texinfo to 7.2

+ fix parts.rst
2026-03-02 01:18:08 +01:00 · 2026-01-25 12:36:18 +11:00 · 2026-01-25 12:36:18 +11:00 · 70cea07218
commit 70cea07218
parent ad6a44e2aa
10 changed files with 351 additions and 173 deletions
--- a/steps/texinfo-7.2/import-gnulib.sh
+++ b/steps/texinfo-7.2/import-gnulib.sh
@ -0,0 +1,133 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+rm gnulib/lib/unictype/ctype_*.h \
+ gnulib/lib/uniwidth/width*.h \
+ gnulib/lib/unicase/tolower.h \
+ tp/Texinfo/XS/gnulib/lib/unicase/{tolower,cased,ignorable,toupper}.h \
+ tp/Texinfo/XS/gnulib/lib/unicase/special-casing-table.gperf \
+ tp/Texinfo/XS/gnulib/lib/uninorm/composition-table* \
+ tp/Texinfo/XS/gnulib/lib/uninorm/decomposition-table{1,2}.h \
+ tp/Texinfo/XS/gnulib/lib/uniwidth/width*.h \
+ tp/Texinfo/XS/gnulib/lib/unictype/{combiningclass,ctype_upper}.h \
+ tp/Texinfo/XS/gnulib/lib/unictype/{pr_,categ_}*.h
+
+GNULIB_DIR=$(realpath ../gnulib-d82702e)
+
+pushd "$GNULIB_DIR"
+rm lib/unictype/ctype_*.h \
+ lib/unictype/combiningclass.h \
+ lib/unictype/{pr_,categ_}*.h \
+ lib/unicase/{tolower,cased,ignorable,toupper}.h \
+ lib/unicase/special-casing-table.gperf \
+ lib/uninorm/composition-table* \
+ lib/uninorm/decomposition-table{1,2}.h \
+ lib/uniwidth/width*.h
+
+pushd lib
+gcc -Iunictype -o gen-uni-tables gen-uni-tables.c
+mv ../../*-16.0.0.txt ../../PropList-3.0.1.txt .
+./gen-uni-tables UnicodeData-16.0.0.txt \
+    PropList-16.0.0.txt \
+    DerivedCoreProperties-16.0.0.txt \
+    emoji-data-16.0.0.txt \
+    ArabicShaping-16.0.0.txt \
+    Scripts-16.0.0.txt \
+    Blocks-16.0.0.txt \
+    PropList-3.0.1.txt \
+    BidiMirroring-16.0.0.txt \
+    EastAsianWidth-16.0.0.txt \
+    LineBreak-16.0.0.txt \
+    WordBreakProperty-16.0.0.txt \
+    GraphemeBreakProperty-16.0.0.txt \
+    CompositionExclusions-16.0.0.txt \
+    SpecialCasing-16.0.0.txt \
+    CaseFolding-16.0.0.txt \
+    16.0.0
+popd
+
+popd
+
+"$GNULIB_DIR"/gnulib-tool --import \
+ --lib=libgnu \
+ --source-base=gnulib/lib \
+ --m4-base=gnulib/m4 \
+ --doc-base=doc \
+ --tests-base=tests \
+ --aux-dir=build-aux \
+ --conditional-dependencies \
+ --no-libtool \
+ --macro-prefix=gl \
+ --no-vc-files \
+ argz \
+ getopt-gnu \
+ gettext-h \
+ iconv \
+ mbchar \
+ mbiter \
+ mbscasecmp \
+ mbschr \
+ mbslen \
+ mbsncasecmp \
+ mbsstr \
+ mbswidth \
+ memrchr \
+ mkstemp \
+ regex \
+ stdarg \
+ strcasestr \
+ strdup-posix \
+ strerror \
+ vasprintf \
+ xalloc
+
+pushd tp/Texinfo/XS
+"$GNULIB_DIR"/gnulib-tool --import \
+ --lib=libgnu \
+ --source-base=gnulib/lib \
+ --m4-base=gnulib/m4 \
+ --doc-base=doc \
+ --tests-base=tests \
+ --aux-dir=build-aux \
+ --no-conditional-dependencies \
+ --libtool \
+ --macro-prefix=gl \
+ euidaccess \
+ getline \
+ gettext-h \
+ iconv \
+ libunistring \
+ locale \
+ setenv \
+ strchrnul \
+ strndup \
+ uchar \
+ unicase/u8-tolower \
+ unicase/u8-toupper \
+ unictype/category-L \
+ unictype/category-M \
+ unictype/category-Mn \
+ unictype/category-Nd \
+ unictype/category-test \
+ unictype/ctype-upper \
+ unictype/property-alphabetic \
+ unictype/property-join-control \
+ unictype/property-test \
+ uninorm/nfc \
+ uninorm/nfkd \
+ uninorm/u8-normalize \
+ unistr/u32-next \
+ unistr/u8-mbsnlen \
+ unistr/u8-mbtouc \
+ unistr/u8-next \
+ unistr/u8-strlen \
+ unistr/u8-strmbtouc \
+ unistr/u8-uctomb \
+ uniwidth/u8-strwidth \
+ uniwidth/u8-width \
+ unsetenv \
+ vasprintf
+popd
--- a/steps/texinfo-7.2/pass1.sh
+++ b/steps/texinfo-7.2/pass1.sh
@ -0,0 +1,55 @@
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2026 Samuel Tyler <samuel@samuelt.me>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    default
+
+    find . \( -name '*.mo' -o -name '*.gmo' -o -name '*.pdf' \) -delete
+    rm man/{info,install-info,makeinfo,pod2texi,texi2dvi,texindex}.1
+
+    rm tp/Texinfo/XS/convert/converters_options.{c,h} \
+        tp/Texinfo/XS/convert/cmd_converter.c \
+        tp/Texinfo/XS/main/{cmd,global,options}_* \
+        tp/Texinfo/XS/main/{element_types,html_conversion_data}.{c,h} \
+        tp/Texinfo/XS/main/{accent_tables_8bit_codepoints.c,command_data.c,command_ids.h} \
+        tp/Texinfo/Documentlanguages.pm \
+        tp/maintain/lib/libintl-perl/{gettext_xs,}/Makefile \
+        tp/maintain/lib/{Text-Unidecode,libintl-perl}/META.json \
+        tp/maintain/template.pod
+
+    touch tp/Texinfo/XS/main/command_{ids.h,data.c} \
+        tp/Texinfo/XS/main/global_{multi,unique}_commands_case.c \
+        tp/Texinfo/XS/main/global_commands_types.h
+
+    rm -r tp/t/results \
+        tp/tests/test_scripts \
+        tp/tests/*/res_parser \
+        tp/tests/many_input_files/*_res \
+        install-info/tests/ii-*-file*
+
+    for f in \
+        tp/Texinfo/{Commands,Options,HTMLData}.pm \
+        tp/Texinfo/Convert/{Info,DocBook,Plaintext,TexinfoXML,HTML}.pm; do
+        sed '/^__END__$/q' "$f" > "$f.new"
+        mv "$f.new" "$f"
+    done
+
+    grep generated tp/maintain/lib/libintl-perl/lib/Locale/RecodeData/*.pm -l | xargs rm
+
+    pushd tp
+    mv ../../ISO-639-2_utf-8.txt ../../country-codes.csv maintain/
+    perl maintain/regenerate_documentlanguages-loc.pl
+    popd
+
+    ../../import-gnulib.sh
+    autoreconf -fi
+    pushd tp/Texinfo/XS
+    autoreconf -fi
+    popd
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}"
+}
--- a/steps/texinfo-7.2/patches/documentlanguages_no_download.patch
+++ b/steps/texinfo-7.2/patches/documentlanguages_no_download.patch
@ -0,0 +1,20 @@
+SPDX-FileCopyrightText: 2026 Samuel Tyler <samuel@samuelt.me>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+
+We download the files separately, don't use wget in the environment.
+
+--- texinfo-7.2/tp/maintain/regenerate_documentlanguages-loc.pl	2026-01-25 11:41:11.642692461 +1100
+++ texinfo-7.2/tp/maintain/regenerate_documentlanguages-loc.pl	2026-01-25 11:41:38.678693603 +1100
+@@ -26,11 +26,6 @@
+ use Text::CSV;
+ 
+ my $dir = 'maintain';
+-system ("cd $dir && wget -N https://www.loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt");
+-# the ISO 3166-1 alpha-2 codes are not easily accessible from the ISO website, there is
+-# an interface not a raw download (seems incredible, but true...).
+-# Use the country code project list instead
+-system ("cd $dir && wget -N https://raw.githubusercontent.com/datasets/country-codes/master/data/country-codes.csv");
+ 
+ open(TXT, "$dir/ISO-639-2_utf-8.txt") or die "Open $dir/ISO-639-2_utf-8.txt: $!\n";
+ binmode(TXT, ":utf8");
--- a/steps/texinfo-7.2/sources
+++ b/steps/texinfo-7.2/sources
@ -0,0 +1,22 @@
+f https://mirrors.kernel.org/gnu/texinfo/texinfo-7.2.tar.xz 0329d7788fbef113fa82cb80889ca197a344ce0df7646fe000974c5d714363a6
+g https://https.git.savannah.gnu.org/git/gnulib.git~d82702e _ 6c6e35a6028317dcea2ddacc9551e2d03308fb9c85c5b7f636a866689d304629 gnulib-d82702e.tar.gz
+f http://ftp.unicode.org/Public/16.0.0/ucd/UnicodeData.txt ff58e5823bd095166564a006e47d111130813dcf8bf234ef79fa51a870edb48f UnicodeData-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/PropList.txt 53d614508e2a0b2305a8aa21cd60d993de9326cdf65993660dfcce4503548583 PropList-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/DerivedCoreProperties.txt 39d35161f2954497f69e08bdb9e701493f476a3d30222de20028feda36c1dabd DerivedCoreProperties-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/emoji/emoji-data.txt f1365a5173eee18e1f98b240cdc492e84a25f1ce7e0c9d1094eb29c41a22696a emoji-data-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/ArabicShaping.txt 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 ArabicShaping-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/Scripts.txt 9e88f0a677df47311106340be8ede2ecdacd9c1c931831218d2be6d5508e0039 Scripts-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/Blocks.txt f3907b395d410f1b97342292ca6bc83dd12eb4b205f2a0c48efdef99e517d7b0 Blocks-16.0.0.txt
+f http://ftp.unicode.org/Public/3.0-Update1/PropList-3.0.1.txt 909eef4adbeddbdddcd9487c856fe8cdbb8912aa8eb315ed7885b6ef65f4dc4c
+f http://ftp.unicode.org/Public/16.0.0/ucd/BidiMirroring.txt d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d BidiMirroring-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/EastAsianWidth.txt 43adc76c0686a42cb370764eb8cfe2b2a45b10b855e5572a2db4a0eecce15d5b EastAsianWidth-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/LineBreak.txt e97e4259d0d20fab150b9c7b4b28abfae5cd78ca97e7f4ac6ed20d685d5f4a7c LineBreak-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/auxiliary/WordBreakProperty.txt 476464e71a4b7b779b8ba7c5671f4338fea77da8e6b6b05fb82b3fdd14603779 WordBreakProperty-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/auxiliary/GraphemeBreakProperty.txt c29360bd6f7132811d701d29069541e827eb44bfc4c8fbde8c370d6982689dc1 GraphemeBreakProperty-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/CompositionExclusions.txt 89e83cf9cc8bef6c1f8bf77e42cf6f0341dfa42e66261f4dbe9b492e7a23c8ee CompositionExclusions-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/SpecialCasing.txt 8d5de354eef79f2395a54c9c7dcebbaf3d30fc962d0f85611ea97aa973a0c451 SpecialCasing-16.0.0.txt
+f http://ftp.unicode.org/Public/16.0.0/ucd/CaseFolding.txt 6f1f9c588eb4a5c718d9e8f93b782685e5c7fec872cf05e8e6878053599e09bb CaseFolding-16.0.0.txt
+f http://ftp.unicode.org/Public/4.0-Update1/Blocks-4.0.1.txt c9dba71655b8787c381b3421ba2bf9a3df9e6168b5835f93fd3931c1eeff90cf Blocks-4.0.1.txt
+f http://ftp.unicode.org/Public/4.0-Update1/UnicodeData-4.0.1.txt de54d68f2df927a20ea4a83dfd74a543ca7f3e3df2441576e7f6a185ec6fa217 UnicodeData-4.0.1.txt
+f https://www.loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt 42b71885e4dc885559fda5ad059fd81838cf4782cedb5fd08cc3431f7d067371
+f https://raw.githubusercontent.com/datasets/country-codes/1991017dfce2e8cdea0c1d6f20341bd0f9baa225/data/country-codes.csv bc34b498d87dfaadc10a2fa52e38dacc72a16fbc9ae477a294450667fa8abf49