From 8de1983940019f1f0ee9a62f3da0b59a8a18ace5 Mon Sep 17 00:00:00 2001
From: Jeremy Drake <github@jdrake.com>
Date: Mon, 29 Jul 2024 11:06:39 -0700
Subject: [PATCH] Don't attempt to install i686 7zip.

That package seems to be gone now.
---
 .github/workflows/build32.yml | 2 +-
 create-sfx.sh                 | 4 ++--
 make-msys2-installer          | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build32.yml b/.github/workflows/build32.yml
index 6e482e4..0f378be 100644
--- a/.github/workflows/build32.yml
+++ b/.github/workflows/build32.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: jeremyd2019/setup-msys2@v2_build32
         with:
           msystem: MINGW32
-          install: tar mingw-w64-i686-7zip mingw-w64-x86_64-7zip mingw-w64-x86_64-zstd
+          install: tar mingw-w64-x86_64-7zip mingw-w64-i686-xz mingw-w64-x86_64-zstd
           update: true
           bitness: 32
 
diff --git a/create-sfx.sh b/create-sfx.sh
index 9a8bfa3..6b721b2 100644
--- a/create-sfx.sh
+++ b/create-sfx.sh
@@ -14,7 +14,7 @@ if [ ! -f "$BASE.exe" ]; then
 fi
 echo "$CHECKSUM $BASE.exe" | sha256sum --quiet --check
 if [ ! -d "$BASE" ]; then
-    7z e -o"$BASE" "$DIR/_cache/$NAME.exe"
+    /mingw64/bin/7z e -o"$BASE" "$DIR/_cache/$NAME.exe"
 fi
 
 NAME="7z22.01-zstd-x32"
@@ -27,7 +27,7 @@ if [ ! -f "$BASE32.exe" ]; then
 fi
 echo "$CHECKSUM $BASE32.exe" | sha256sum --quiet --check
 if [ ! -d "$BASE32" ]; then
-    7z e -o"$BASE32" "$DIR/_cache/$NAME.exe"
+    /mingw64/bin/7z e -o"$BASE32" "$DIR/_cache/$NAME.exe"
 fi
 
 # Creat SFX installer
diff --git a/make-msys2-installer b/make-msys2-installer
index fe79faa..a0c90f0 100644
--- a/make-msys2-installer
+++ b/make-msys2-installer
@@ -94,7 +94,6 @@ create_chroot_system() {
 
 main() {
   pacman -S --noconfirm --needed \
-    "${MINGW_PACKAGE_PREFIX}-7zip" \
     "${MINGW_PACKAGE_PREFIX}-xz" \
     "${MINGW_PACKAGE_PREFIX}-zstd" \
     "tar"