From b6741333938af50d85d53f0b553659080584bf48 Mon Sep 17 00:00:00 2001
From: Pekka Helenius <pekka.helenius@fjordtek.com>
Date: Mon, 18 Sep 2023 08:15:40 +0300
Subject: [PATCH] Update 'patchinstall' script references

---
 arch/0-wine-staging-git/PKGBUILD | 7 ++++---
 debian/wineroot/winebuild.sh     | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/arch/0-wine-staging-git/PKGBUILD b/arch/0-wine-staging-git/PKGBUILD
index 3938e1d..ce74bb7 100755
--- a/arch/0-wine-staging-git/PKGBUILD
+++ b/arch/0-wine-staging-git/PKGBUILD
@@ -7,7 +7,7 @@ PKGDEST="${PWD}"
 # Enable Wine Staging? 1 = yes
 enable_staging=1
 
-# Staging patchsets. Default: all patchsets. Please see Wine Staging patchinstall.sh file for individual patchset names.
+# Staging patchsets. Default: all patchsets. Please see Wine Staging 'patchset' directory contents for individual patchset names.
 staging_patchsets=(--all) # In order to disable all patchsets, use #(--all) and add desired patchsets individually here
 
 # Enable 32-bit compilation? 1 = yes
@@ -208,7 +208,8 @@ prepare() {
 
   if [[ ${_wine_commit} == HEAD ]] && [[ enable_staging -eq 1 ]]; then
     # Change back to the wine upstream commit that this version of wine-staging is based on
-    git checkout $(../"$pkgname"/patches/patchinstall.sh --upstream-commit)
+    chmod u+x ../"$pkgname"/staging/patchinstall.py
+    git checkout $(../"$pkgname"/staging/patchinstall.py --upstream-commit)
   fi
 
   # Restore the wine tree to its git origin state, without wine-staging patches
@@ -228,7 +229,7 @@ build() {
   if [[ enable_staging -eq 1 ]]; then
     # Apply all wine-staging patches
     msg2 "Applying wine-staging patches..."
-    ./wine-staging-git/patches/patchinstall.sh DESTDIR="${srcdir}/wine-git" \
+    ./wine-staging-git/staging/patchinstall.py DESTDIR="${srcdir}/wine-git" \
     ${staging_patchsets[*]}
   fi
 
diff --git a/debian/wineroot/winebuild.sh b/debian/wineroot/winebuild.sh
index 118088d..8ed813b 100755
--- a/debian/wineroot/winebuild.sh
+++ b/debian/wineroot/winebuild.sh
@@ -35,7 +35,7 @@ BUILDROOT="${PWD}"
 
 # Staging patchsets. Default: all patchsets.
 # Applies only if Wine Staging is set to be compiled
-# Please see Wine Staging patchinstall.sh file for individual patchset names.
+# Please see Wine Staging 'patchset' directory contents for individual patchset names.
 staging_patchsets=(--all)
 
 ########################################################
@@ -762,7 +762,8 @@ function refreshWineGIT() {
 
     if [[ ${git_commithash_wine} == HEAD ]]; then
       # Change back to the wine upstream commit that this version of wine-staging is based on
-      git checkout $(bash "${WINEDIR_STAGING}"/patches/patchinstall.sh --upstream-commit)
+      chmod u+x "${WINEDIR_STAGING}"/staging/patchinstall.py
+      git checkout $("${WINEDIR_STAGING}"/staging/patchinstall.py --upstream-commit)
 
     else
       cd "${WINEDIR_STAGING}"
@@ -791,7 +792,7 @@ function wine_version() {
 function patchWineSource() {
 
   if [[ ! -v NO_STAGING ]]; then
-    bash "${WINEDIR_STAGING}/patches/patchinstall.sh" DESTDIR="${WINEDIR}" ${staging_patchsets[*]}
+    "${WINEDIR_STAGING}/staging/patchinstall.py" DESTDIR="${WINEDIR}" ${staging_patchsets[*]}
   fi
 
   cp -r ${WINEROOT}/../../../wine_custom_patches/* "${WINEDIR_PATCHES}/"