fix: add zsh texinfo patch

This commit is contained in:
ngn 2024-08-25 06:23:22 +03:00
parent defc9cb116
commit f0bbaa7439
2 changed files with 47 additions and 0 deletions

View File

@ -6,11 +6,13 @@ FILES=(
"https://www.zsh.org/pub/zsh-${VERSION}.tar.xz" "https://www.zsh.org/pub/zsh-${VERSION}.tar.xz"
"https://www.zsh.org/pub/zsh-${VERSION}-doc.tar.xz" "https://www.zsh.org/pub/zsh-${VERSION}-doc.tar.xz"
"zsh-${VERSION}-avoid-incompatible-pointer-types.patch" "zsh-${VERSION}-avoid-incompatible-pointer-types.patch"
"zsh-${VERSION}-support-texinfo-7-0.patch"
) )
HASHES=( HASHES=(
"182e37ca3fe3fa6a44f69ad462c5c30e" "182e37ca3fe3fa6a44f69ad462c5c30e"
"8db53446f613521fb4f9b0bd9f6adda1" "8db53446f613521fb4f9b0bd9f6adda1"
"984c804bfa4c7c9b1ddba9f18bbd29846bf6f2b3171f39bb775c11c8b1c7b5ad2c68d2922a59265c58f6e83016d6d440d64862c529d82f90cad308fd2af757ce" "984c804bfa4c7c9b1ddba9f18bbd29846bf6f2b3171f39bb775c11c8b1c7b5ad2c68d2922a59265c58f6e83016d6d440d64862c529d82f90cad308fd2af757ce"
"891577e8c3a5beb236a7044a0960a014d8a7149ce5dba7715f07b1e4d2db475f4aab7bb6cfeadaaeffe37fb889836f368467882fba1a5ac23076548185432d51"
) )
DEPENDS=("gdbm" "libcap" "pcre2" "grep") # grep needed for INSTALL DEPENDS=("gdbm" "libcap" "pcre2" "grep") # grep needed for INSTALL
@ -21,6 +23,7 @@ PACKAGE() {
cd "${NAME}-${VERSION}" cd "${NAME}-${VERSION}"
patch -Np1 < "../zsh-${VERSION}-avoid-incompatible-pointer-types.patch" patch -Np1 < "../zsh-${VERSION}-avoid-incompatible-pointer-types.patch"
patch -Np1 < "../zsh-${VERSION}-support-texinfo-7-0.patch"
tar --strip-components=1 -xvf "../zsh-${VERSION}-doc.tar.xz" tar --strip-components=1 -xvf "../zsh-${VERSION}-doc.tar.xz"
./configure --prefix=/usr \ ./configure --prefix=/usr \

View File

@ -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 ;;