From fd6eb5b9e2ffa5a6e67ee2d2d03826e9934ba5f8 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 25 Jun 2025 19:04:49 +0200
Subject: [PATCH] zsh: rebuild with new CHOST; partly drop msysize patches

* so it reports cygwin like bash (echo $OSTYPE)
* drop patches that are no longer needed with the cygwin CHOST
---
 zsh/PKGBUILD      |  4 +--
 zsh/msysize.patch | 75 -----------------------------------------------
 2 files changed, 2 insertions(+), 77 deletions(-)

diff --git a/zsh/PKGBUILD b/zsh/PKGBUILD
index bdf723ff..88362f93 100644
--- a/zsh/PKGBUILD
+++ b/zsh/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=zsh
 pkgname=('zsh' 'zsh-doc')
 pkgver=5.9
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='https://www.zsh.org/'
 msys2_repository_url='https://sourceforge.net/p/zsh/code'
@@ -32,7 +32,7 @@ sha256sums=('9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5'
             '06c05faa800cb7385b606fd2b3c9aa24cfac07d1dde7f0d2f017c11ede9b2ac8'
             '971e48433ec40e0c2fb64584b5555367b4f997156aa9acbd06c67d7bdacd6c59'
             'b3f74a10a27eff498124adc96bc8c5cced7bb15e18c2603d7c3490a81e3c2e48'
-            'b879d33cc60fc0c44361189eef1ee95a3bd0b8f9e8b32c81e439950483c151aa'
+            '85a4cc64ad11f9ce65a0af994dc84067021c33f8b751df3fa82b0255e819d04c'
             '336a8e6e93b778e7aec27348619b7200e0a75e5cf14dce720afd9dd6f836ea2c'
             'de515b0d86c13c29a663b4ba0fdb338dea83f82f145cf8c4da78d30369f963e4'
             'ea68214d5be0514aa1b19e93fc9f44de878b9428e920227230a8fa3a75b0bd18')
diff --git a/zsh/msysize.patch b/zsh/msysize.patch
index 2a2f1553..a1eb88e3 100644
--- a/zsh/msysize.patch
+++ b/zsh/msysize.patch
@@ -1,57 +1,3 @@
-diff -Naur zsh-5.0.7-orig/Completion/Unix/Command/_mount zsh-5.0.7/Completion/Unix/Command/_mount
---- zsh-5.0.7-orig/Completion/Unix/Command/_mount	2014-08-14 22:43:00.000000000 +0300
-+++ zsh-5.0.7/Completion/Unix/Command/_mount	2014-11-04 18:45:42.056000000 +0300
-@@ -1,6 +1,6 @@
- #compdef mount umount
- 
--if [[ "$OSTYPE" == cygwin ]]; then
-+if [[ "$OSTYPE" == cygwin || $OSTYPE = msys ]]; then
-   if [[ "$service" == mount ]] ; then
-     _arguments -s \
-       - mount \
-diff -Naur zsh-5.0.7-orig/config.guess zsh-5.0.7/config.guess
---- zsh-5.0.7-orig/config.guess	2013-11-27 22:00:20.000000000 +0300
-+++ zsh-5.0.7/config.guess	2014-11-04 18:37:39.158000000 +0300
-@@ -840,6 +840,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- 	exit ;;
-diff -Naur zsh-5.0.7-orig/configure.ac zsh-5.0.7/configure.ac
---- zsh-5.0.7-orig/configure.ac	2014-09-23 21:55:05.000000000 +0300
-+++ zsh-5.0.7/configure.ac	2014-11-04 18:41:11.052800000 +0300
-@@ -2698,7 +2698,7 @@
-   zsh_cv_sys_dynamic_strip_exe="${zsh_cv_sys_dynamic_strip_exe=yes}"
-   zsh_cv_sys_dynamic_strip_lib="${zsh_cv_sys_dynamic_strip_lib=yes}"
-   zsh_cv_shared_environ="${zsh_cv_shared_environ=yes}"
--elif test "$host_os" = cygwin; then
-+elif test "$host_os" = cygwin || test "$host_os" = msys; then
-   DL_EXT="${DL_EXT=dll}"
- ##DLLD="${DLLD=dllwrap}"
-   DLLD="${DLLD=$CC}"
-@@ -2972,7 +2972,7 @@
-   if $strip_libldflags && test "$zsh_cv_sys_dynamic_strip_lib" = yes; then
-     LIBLDFLAGS="$LIBLDFLAGS -s"
-   fi
--  if test "$host_os" = cygwin; then
-+  if test "$host_os" = cygwin || test "$host_os" = msys; then
-     INSTLIB="install.cygwin-lib"
-     UNINSTLIB="uninstall.cygwin-lib"
-   fi
-@@ -3010,7 +3010,7 @@
- AC_SUBST(INSTLIB)dnl
- AC_SUBST(UNINSTLIB)dnl
- 
--if test "$host_os" = cygwin; then
-+if test "$host_os" = cygwin || test "$host_os" = msys; then
-   EXTRAZSHOBJS="$EXTRAZSHOBJS zsh.res.o"
- fi
- 
 diff -Naur zsh-5.0.7-orig/Src/Makefile.in zsh-5.0.7/Src/Makefile.in
 --- zsh-5.0.7-orig/Src/Makefile.in	2013-11-27 22:00:20.000000000 +0300
 +++ zsh-5.0.7/Src/Makefile.in	2014-11-04 18:47:07.013600000 +0300
@@ -94,24 +40,3 @@ diff -Naur zsh-5.0.7-orig/Src/mkmakemod.sh zsh-5.0.7/Src/mkmakemod.sh
  			;;
  			* )
  			    mdll="\$(dir_top)/$loc/${depbase}.\$(DL_EXT) "
-diff -Naur zsh-5.1.1-orig/Test/C02cond.ztst zsh-5.1.1/Test/C02cond.ztst
---- zsh-5.1.1-orig/Test/C02cond.ztst	2014-05-16 22:21:25.000000000 +0300
-+++ zsh-5.1.1/Test/C02cond.ztst	2014-11-04 18:45:27.454400000 +0300
-@@ -111,7 +111,7 @@
-   if (( EUID == 0 )); then
-     print -u$ZTST_fd 'Warning: Not testing [[ ! -r file ]] (root reads anything)'
-     [[ -r zerolength && -r unmodish ]]
--  elif [[ $OSTYPE = cygwin ]]; then
-+  elif [[ $OSTYPE = cygwin || $OSTYPE = msys ]]; then
-     print -u$ZTST_fd 'Warning: Not testing [[ ! -r file ]]
-    (all files created by user may be readable)'
-    [[ -r zerolength ]]
-@@ -150,7 +150,7 @@
-   sleep 2
-   cat $unmodified
-   touch $newnewnew
--  if [[ $OSTYPE == "cygwin" ]]; then
-+  if [[ $OSTYPE == "cygwin" || $OSTYPE = msys ]]; then
-     ZTST_skip="[[ -N file ]] not supported on Cygwin"
-   elif (( isnfs )); then
-     ZTST_skip="[[ -N file ]] not supported with NFS"