Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / zsh
Commits:
e4f8bf9e by Christian Hesse at 2024-02-28T13:41:28+01:00
fix build with texinfo 7
- - - - -
4 changed files:
- .SRCINFO
- fix-autocompletion.patch → 0002-fix-autocompletion.patch
- + 0003-51862-support-texinfo-7-0.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -13,7 +13,8 @@ pkgbase = zsh
source = https://www.zsh.org/pub/zsh-5.9-doc.tar.xz
source = https://www.zsh.org/pub/zsh-5.9-doc.tar.xz.asc
source = 0001-50629-do-not-use-egrep-in-tests.patch
- source = fix-autocompletion.patch
+ source = 0002-fix-autocompletion.patch
+ source = 0003-51862-support-texinfo-7-0.patch
source = zprofile
validpgpkeys = F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3
validpgpkeys = E96646BE08C0AF0AA0F90788A5FEEE3AC7937444
@@ -24,6 +25,7 @@ pkgbase = zsh
sha512sums = SKIP
sha512sums =
af6a905e83807efb614a585ac1876e0a9cc8b745911b43915b06aab46757a6df6dfc64a7a60b53cc7e62e528c04aa7460e660a1de6720476030dd746af76c6e3
sha512sums =
fa01836f40602e158fa5e802e8f2548af751c806c87a54e1761196497b2c35a68c6f8a195a5aac22c3c27e59b80b2f50bf590f124afe3ed4a9289b00033aff1f
+ sha512sums =
891577e8c3a5beb236a7044a0960a014d8a7149ce5dba7715f07b1e4d2db475f4aab7bb6cfeadaaeffe37fb889836f368467882fba1a5ac23076548185432d51
sha512sums =
b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034
pkgname = zsh
=====================================
fix-autocompletion.patch → 0002-fix-autocompletion.patch
=====================================
=====================================
0003-51862-support-texinfo-7-0.patch
=====================================
@@ -0,0 +1,44 @@
+commit ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4
+Author: Jun-ichi Takimoto <[email protected]>
+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 ;;
=====================================
PKGBUILD
=====================================
@@ -10,7 +10,8 @@ license=('custom')
makedepends=('pcre' 'libcap' 'gdbm' 'yodl')
source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
'0001-50629-do-not-use-egrep-in-tests.patch'
- 'fix-autocompletion.patch'
+ '0002-fix-autocompletion.patch'
+ '0003-51862-support-texinfo-7-0.patch'
'zprofile')
sha512sums=('d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e'
'SKIP'
@@ -18,6 +19,7 @@
sha512sums=('d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396
'SKIP'
'af6a905e83807efb614a585ac1876e0a9cc8b745911b43915b06aab46757a6df6dfc64a7a60b53cc7e62e528c04aa7460e660a1de6720476030dd746af76c6e3'
'fa01836f40602e158fa5e802e8f2548af751c806c87a54e1761196497b2c35a68c6f8a195a5aac22c3c27e59b80b2f50bf590f124afe3ed4a9289b00033aff1f'
+
'891577e8c3a5beb236a7044a0960a014d8a7149ce5dba7715f07b1e4d2db475f4aab7bb6cfeadaaeffe37fb889836f368467882fba1a5ac23076548185432d51'
'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034')
validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3'
'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444'
@@ -31,7 +33,10 @@ prepare() {
#
https://github.com/zsh-users/zsh/commit/3e3cfabcc74dc79d4d8717c4e5859d8d01be6c54
# https://www.zsh.org/mla/workers/2022/msg00652.html
- patch -Np1 < ../fix-autocompletion.patch
+ patch -Np1 < ../0002-fix-autocompletion.patch
+
+ # 51862: support texinfo-7.0
+ patch -Np1 < ../0003-51862-support-texinfo-7-0.patch
# Set correct keymap path
sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g'
Completion/Unix/Command/_loadkeys
@@ -48,6 +53,9 @@ prepare() {
# force generation of documentation with correct paths
rm Doc/version.yo
+
+ # regenerate configure script
+ autoreconf -fi
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/zsh/-/commit/e4f8bf9e501375269dc0da170d49320915784189
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/zsh/-/commit/e4f8bf9e501375269dc0da170d49320915784189
You're receiving this email because of your account on gitlab.archlinux.org.
