From ac94da025d68f35e123fa3180b66100ca485c49d Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sun, 7 Jun 2026 16:32:29 +0300 Subject: [PATCH] Update package version to 5.9.1 --- pkg.info | 9 ++-- .../avoid-incompatible-pointer-types.patch | 48 ----------------- source.sh | 51 ++++++++++++++----- 3 files changed, 44 insertions(+), 64 deletions(-) delete mode 100644 source-files/avoid-incompatible-pointer-types.patch diff --git a/pkg.info b/pkg.info index 980b96e..7a111e1 100644 --- a/pkg.info +++ b/pkg.info @@ -1,7 +1,7 @@ name: zsh description: A powerful interactive shell -version: "5.9" -revision: 4 +version: 5.9.1 +revision: 1 url: https://www.zsh.org/ license: custom maintainers: @@ -9,7 +9,8 @@ maintainers: architecture: any type: source keep: - - etc/zsh/ + - etc/zsh/zprofile + - etc/zsh/zshrc make_depends: - texinfo - libcap @@ -19,4 +20,4 @@ downloads: - url: https://downloads.sourceforge.net/project/zsh/zsh/${BPM_PKG_VERSION}/zsh-${BPM_PKG_VERSION}.tar.xz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: 9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 + checksum: 5d20bec03f981dc4e9a09ec245e7415388ff641f79c5c5c416b5042e58d8280d diff --git a/source-files/avoid-incompatible-pointer-types.patch b/source-files/avoid-incompatible-pointer-types.patch deleted file mode 100644 index 1a9d32d..0000000 --- a/source-files/avoid-incompatible-pointer-types.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4c89849c98172c951a9def3690e8647dae76308f Mon Sep 17 00:00:00 2001 -From: Florian Weimer -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 diff --git a/source.sh b/source.sh index 924cc25..900af02 100644 --- a/source.sh +++ b/source.sh @@ -6,20 +6,49 @@ # This function is used for putting downloaded files to the correct location or applying patches prepare() { cd "$BPM_SOURCE" - patch -Np1 -i "$BPM_WORKDIR"/avoid-incompatible-pointer-types.patch + # Change config location in documentation to /etc/zsh + sed 's|/etc/z|/etc/zsh/z|g' -i Doc/*.* + # Set correct keymap path + sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys + # Fix usb.ids path + sed -i 's#/usr/share/misc/usb.ids#/usr/share/hwdata/usb.ids#g' Completion/Linux/Command/_lsusb + # Remove unneeded and conflicting completion scripts + for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat Solaris; do + rm -rf Completion/$_fpath + sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd + done + rm Completion/Linux/Command/_pkgtool + # Force generation of documentation with correct paths + rm Doc/version.yo + + autoreconf -fi } # The build function is executed in the source directory # This function is used to compile the source code build() { - sed -e 's/set_from_init_file/texinfo_&/' -i Doc/Makefile.in - sed 's|/etc/z|/etc/zsh/z|g' -i Doc/*.* - ./configure --prefix=/usr --sysconfdir=/etc/zsh --enable-etcdir=/etc/zsh --enable-cap --enable-gdbm - make - makeinfo Doc/zsh.texi --html -o Doc/html - makeinfo Doc/zsh.texi --plaintext -o zsh.txt - makeinfo Doc/zsh.texi --html --no-split --no-headers -o zsh.html + ./configure --prefix=/usr \ + --sysconfdir=/etc/zsh \ + --docdir=/usr/share/doc/zsh \ + --htmldir=/usr/share/doc/zsh/html \ + --enable-etcdir=/etc/zsh \ + --enable-zshenv=/etc/zsh/zshenv \ + --enable-zlogin=/etc/zsh/zlogin \ + --enable-zlogout=/etc/zsh/zlogout \ + --enable-zprofile=/etc/zsh/zprofile \ + --enable-zshrc=/etc/zsh/zshrc \ + --enable-maildir-support \ + --enable-multibyte \ + --enable-function-subdirs \ + --enable-fndir=/usr/share/zsh/functions \ + --enable-scriptdir=/usr/share/zsh/scripts \ + --with-tcsetpgrp \ + --enable-pcre \ + --enable-gdbm \ + --enable-cap \ + --enable-zsh-secure-free + make } # The check function is executed in the source directory @@ -34,9 +63,7 @@ package() { make DESTDIR="$BPM_OUTPUT" install # Install package documentation - make DESTDIR="$BPM_OUTPUT" infodir=/usr/share/info install.info - make DESTDIR="$BPM_OUTPUT" htmldir=/usr/share/doc/zsh/html install.html - install -m644 zsh.{html,txt} Etc/FAQ -t "$BPM_OUTPUT"/usr/share/doc/zsh + make DESTDIR="$BPM_OUTPUT" install.info install.html # Install default zsh config files install -d "$BPM_OUTPUT"/etc/zsh @@ -44,5 +71,5 @@ package() { install -m644 "$BPM_WORKDIR"/zshrc "$BPM_OUTPUT"/etc/zsh/zshrc # Install package license - install -Dm644 "$BPM_SOURCE"/LICENCE "$BPM_OUTPUT"/usr/share/licenses/zsh/COPYING + install -Dm644 "$BPM_SOURCE"/LICENCE "$BPM_OUTPUT"/usr/share/licenses/zsh/LICENCE }