fix: unable to build binary module on some new systems

Aloxaf · Sep 25, 2024 · 536d84e · 536d84e
1 parent 14e16f0
commit 536d84e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/zsh.yaml b/.github/workflows/zsh.yaml
@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 1
 
       - name: install dependencies
-        run: apt update && apt-get install -y git build-essential autoconf libncurses-dev
+        run: apt update && apt-get install -y git curl build-essential autoconf libncurses-dev
 
       - name: test completion
         run: cd test && zsh -f runtests.zsh fzftab.ztst

diff --git a/lib/-ftb-build-module b/lib/-ftb-build-module
@@ -22,6 +22,14 @@ ln -sf $PWD/Src/fzftab.mdd ./zsh/$zsh_version/Src/Modules/
 
 # build zsh
 cd -q ./zsh/$zsh_version
+
+git checkout -- .
+
+[[ $zsh_version != "5.9" ]] || {
+  curl -s https://github.com/zsh-users/zsh/commit/4c89849c98172c951a9def3690e8647dae76308f.patch | git apply --exclude=ChangeLog -
+  curl -s https://github.com/zsh-users/zsh/commit/ab4d62eb975a4c4c51dd35822665050e2ddc6918.patch | git apply --exclude=ChangeLog -
+}
+
 [[ -f ./configure ]] || ./Util/preconfig
 [[ -f ./Makefile ]] || ./configure --disable-gdbm --disable-pcre --without-tcsetpgrp --prefix=/tmp/zsh-fzf-tab-module ${bundle:+DL_EXT=bundle}
 make -j$nproc