diff options
| author | Michael Prokop <mika@debian.org> | 2024-01-09 11:08:24 +0100 |
|---|---|---|
| committer | Michael Prokop <mika@debian.org> | 2024-01-09 11:14:24 +0100 |
| commit | c366ecc5d0b6f14f9e0112cf26b0b7ee9519b3bd (patch) | |
| tree | 9033a91b1e88a4132e508246e74fb0f8f1450365 /debian/patches | |
| parent | 5734f09ec5695d0b8b013a436592abf54232c05f (diff) | |
| download | zsh-c366ecc5d0b6f14f9e0112cf26b0b7ee9519b3bd.tar.gz zsh-c366ecc5d0b6f14f9e0112cf26b0b7ee9519b3bd.zip | |
Cherry pick upstream commit ecd3f9c9 to fix FTBFS issue with newer texinfo
Fixes:
| texi2any -c TEXI2HTML=1 --output . --ifinfo --split=chapter --node-files \
| --init-file texi2html.conf ../../Doc/zsh.texi
| texi2any: error parsing ./texi2html.conf: Undefined subroutine &Texinfo::Config::set_from_init_file called at ./texi2html.conf line 1.
Cherry picked (excluding Changelog change) from upstream commit
https://github.com/zsh-users/zsh/commit/ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4
Also see https://www.zsh.org/mla/workers/2023/msg00591.html
Closes: #1057610
fixup of debian/patches/cherry-pick-ecd3f9c9-1057610-support-texinfo-7.0.patch
fixup
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/cherry-pick-ecd3f9c9-1057610-support-texinfo-7.0.patch | 44 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/debian/patches/cherry-pick-ecd3f9c9-1057610-support-texinfo-7.0.patch b/debian/patches/cherry-pick-ecd3f9c9-1057610-support-texinfo-7.0.patch new file mode 100644 index 000000000..a766721f6 --- /dev/null +++ b/debian/patches/cherry-pick-ecd3f9c9-1057610-support-texinfo-7.0.patch @@ -0,0 +1,44 @@ +commit ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4 +Author: Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> +Date: Mon Jun 19 11:19:25 2023 +0900 + + 51862: support texinfo-7.0 + +diff --git a/Doc/Makefile.in b/Doc/Makefile.in +index 136b080d6..dabe11fe3 100644 +--- a/Doc/Makefile.in ++++ b/Doc/Makefile.in +@@ -43,6 +43,7 @@ TEXI2DVI = @TEXI2DVI@ + DVIPS = dvips + TEXI2PDF = @TEXI2PDF@ + TEXI2HTML = @TEXI2HTML@ ++SET_TEXI2ANY_VAR = @SET_TEXI2ANY_VAR@ + PAPERSIZE = @PAPERSIZE@ + + .SUFFIXES: .yo .1 +@@ -266,7 +267,7 @@ texi2html.conf: $(sdir_top)/Config/version.mk + d=`echo $(VERSION_DATE)`; \ + v="<font size=\"-1\">Zsh version $(VERSION), released on $$d.</font>"; \ + case '$(TEXI2HTML)' in \ +- *texi2any*) echo "set_from_init_file('PRE_BODY_CLOSE','$$v');" ;; \ ++ *texi2any*) echo "$(SET_TEXI2ANY_VAR)('PRE_BODY_CLOSE','$$v');" ;; \ + *) echo "\$$PRE_BODY_CLOSE = '$$v';" ;; \ + esac > $@ + +diff --git a/configure.ac b/configure.ac +index 4710d1659..ba76f9a60 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -623,7 +623,12 @@ fi + + if test x"$TEXI2HTML" = xtexi2any; then + TEXI2HTML='texi2any -c TEXI2HTML=1' ++ case `texi2any --version 2>/dev/null | sed -e 's/^.*) *//' -e 1q` in ++ [[1-6]].*) SET_TEXI2ANY_VAR=set_from_init_file ;; ++ *) SET_TEXI2ANY_VAR=texinfo_set_from_init_file ;; ++ esac + fi ++AC_SUBST(SET_TEXI2ANY_VAR) + + case "$LC_PAPER" in + ??_US*) PAPERSIZE=us ;; diff --git a/debian/patches/series b/debian/patches/series index eebee12c7..b8914f5b3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ cherry-pick-3e3cfabc-revert-38150-and-fix-in-calling-function-cfp_matcher_range- cherry-pick-4b7a9fd0-additional-typset--p--m-fix-for-namespaces.patch cherry-pick-b62e91134-51723-migrate-pcre-module-to-pcre2.patch cherry-pick-10bdbd8b-51877-do-not-build-pcre-module-if-pcre2-config-is-not-found.patch +cherry-pick-ecd3f9c9-1057610-support-texinfo-7.0.patch |