Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / zsh
Commits:
7ab4fd0e by Vladislav Nepogodin at 2024-06-20T20:48:51+02:00
fix build with terminfo
- - - - -
3 changed files:
- .SRCINFO
- + 0005-52383-avoid-incompatible-pointer-types.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -16,6 +16,7 @@ pkgbase = zsh
source = 0002-fix-autocompletion.patch
source = 0003-51862-support-texinfo-7-0.patch
source = 0004-pcre2.patch
+ source = 0005-52383-avoid-incompatible-pointer-types.patch
source = zprofile
validpgpkeys = F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3
validpgpkeys = E96646BE08C0AF0AA0F90788A5FEEE3AC7937444
@@ -28,6 +29,7 @@ pkgbase = zsh
sha512sums =
fa01836f40602e158fa5e802e8f2548af751c806c87a54e1761196497b2c35a68c6f8a195a5aac22c3c27e59b80b2f50bf590f124afe3ed4a9289b00033aff1f
sha512sums =
891577e8c3a5beb236a7044a0960a014d8a7149ce5dba7715f07b1e4d2db475f4aab7bb6cfeadaaeffe37fb889836f368467882fba1a5ac23076548185432d51
sha512sums =
2b6fd1d077244023591e7e2995797e90b2cda7f9c8b3978521c0b77ef1c363f175b6ebb48730deb7171c695cba23c9455d71c3ddc5a55da91832274121587af5
+ sha512sums =
984c804bfa4c7c9b1ddba9f18bbd29846bf6f2b3171f39bb775c11c8b1c7b5ad2c68d2922a59265c58f6e83016d6d440d64862c529d82f90cad308fd2af757ce
sha512sums =
b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034
pkgname = zsh
=====================================
0005-52383-avoid-incompatible-pointer-types.patch
=====================================
@@ -0,0 +1,48 @@
+From 4c89849c98172c951a9def3690e8647dae76308f Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fwei...@redhat.com>
+Date: Fri, 8 Dec 2023 21:58:07 +0100
+Subject: [PATCH] 52383: Avoid incompatible pointer types in terminfo global
+ variable checks
+
+---
+ configure.ac | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2a8221e1f..2871dcb7c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1768,27 +1768,27 @@ if test x$zsh_cv_path_term_header != xnone; then
+ fi
+
+ AC_MSG_CHECKING(if boolcodes is available)
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test =
boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES)
boolcodes=yes],[boolcodes=no])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char
**)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES)
boolcodes=yes],[boolcodes=no])
+ AC_MSG_RESULT($boolcodes)
+
+ AC_MSG_CHECKING(if numcodes is available)
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test =
numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES)
numcodes=yes],[numcodes=no])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char
**)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES)
numcodes=yes],[numcodes=no])
+ AC_MSG_RESULT($numcodes)
+
+ AC_MSG_CHECKING(if strcodes is available)
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test =
strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES)
strcodes=yes],[strcodes=no])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char
**)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES)
strcodes=yes],[strcodes=no])
+ AC_MSG_RESULT($strcodes)
+
+ AC_MSG_CHECKING(if boolnames is available)
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test =
boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES)
boolnames=yes],[boolnames=no])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char
**)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES)
boolnames=yes],[boolnames=no])
+ AC_MSG_RESULT($boolnames)
+
+ AC_MSG_CHECKING(if numnames is available)
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test =
numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES)
numnames=yes],[numnames=no])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char
**)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES)
numnames=yes],[numnames=no])
+ AC_MSG_RESULT($numnames)
+
+ AC_MSG_CHECKING(if strnames is available)
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test =
strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES)
strnames=yes],[strnames=no])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char
**)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES)
strnames=yes],[strnames=no])
+ AC_MSG_RESULT($strnames)
+
+ dnl There are apparently defective terminal library headers on some
=====================================
PKGBUILD
=====================================
@@ -13,6 +13,7 @@
source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
'0002-fix-autocompletion.patch'
'0003-51862-support-texinfo-7-0.patch'
'0004-pcre2.patch'
+ '0005-52383-avoid-incompatible-pointer-types.patch'
'zprofile')
sha512sums=('d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e'
'SKIP'
@@ -22,6 +23,7 @@
sha512sums=('d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396
'fa01836f40602e158fa5e802e8f2548af751c806c87a54e1761196497b2c35a68c6f8a195a5aac22c3c27e59b80b2f50bf590f124afe3ed4a9289b00033aff1f'
'891577e8c3a5beb236a7044a0960a014d8a7149ce5dba7715f07b1e4d2db475f4aab7bb6cfeadaaeffe37fb889836f368467882fba1a5ac23076548185432d51'
'2b6fd1d077244023591e7e2995797e90b2cda7f9c8b3978521c0b77ef1c363f175b6ebb48730deb7171c695cba23c9455d71c3ddc5a55da91832274121587af5'
+
'984c804bfa4c7c9b1ddba9f18bbd29846bf6f2b3171f39bb775c11c8b1c7b5ad2c68d2922a59265c58f6e83016d6d440d64862c529d82f90cad308fd2af757ce'
'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034')
validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3'
'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444'
@@ -46,6 +48,9 @@ prepare() {
# 51877: do not build pcre module if pcre2-config is not found
patch -Np1 < ../0004-pcre2.patch
+ # 52394: Avoid incompatible pointer types in terminfo global variable checks
+ patch -Np1 < ../0005-52383-avoid-incompatible-pointer-types.patch
+
# Set correct keymap path
sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g'
Completion/Unix/Command/_loadkeys
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/zsh/-/commit/7ab4fd0e5fcb6542966476422353266d00e9cf02
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/zsh/-/commit/7ab4fd0e5fcb6542966476422353266d00e9cf02
You're receiving this email because of your account on gitlab.archlinux.org.
