From 538fc37f031e0f73cb9481e9d175269bd20d65dd Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Tue, 3 Jun 2025 16:33:47 +0000
Subject: [PATCH] build: bump pyinstaller

---
 contrib/build-wine/prepare-wine.sh                      | 4 ++--
 contrib/deterministic-build/requirements-build-wine.txt | 4 ++--
 contrib/osx/make_osx.sh                                 | 4 ++--
 contrib/requirements/requirements-build-mac.txt         | 4 +++-
 contrib/requirements/requirements-build-wine.txt        | 8 +++++---
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh
index b2656bb3c..57396e9ed 100755
--- a/contrib/build-wine/prepare-wine.sh
+++ b/contrib/build-wine/prepare-wine.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
-PYINSTALLER_COMMIT="5d7a0449ecea400eccbbb30d5fcef27d72f8f75d"
-# ^ tag "v6.6.0"
+PYINSTALLER_COMMIT="306d4d92580fea7be7ff2c89ba112cdc6f73fac1"
+# ^ tag "v6.13.0"
 
 PYTHON_VERSION=3.12.10
 
diff --git a/contrib/deterministic-build/requirements-build-wine.txt b/contrib/deterministic-build/requirements-build-wine.txt
index fdd974d97..345402ccb 100644
--- a/contrib/deterministic-build/requirements-build-wine.txt
+++ b/contrib/deterministic-build/requirements-build-wine.txt
@@ -2,8 +2,8 @@ altgraph==0.17.4 \
     --hash=sha256:1b5afbb98f6c4dcadb2e2ae6ab9fa994bbb8c1d75f4fa96d340f9437ae454406
 packaging==25.0 \
     --hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f
-pefile==2024.8.26 \
-    --hash=sha256:3ff6c5d8b43e8c37bb6e6dd5085658d658a7a0bdcd20b6a07b1fcfc1c4e9d632
+pefile==2023.2.7 \
+    --hash=sha256:82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc
 pip==25.1.1 \
     --hash=sha256:3de45d411d308d5054c2168185d8da7f9a2cd753dbac8acbfa88a8909ecd9077
 pyinstaller-hooks-contrib==2025.4 \
diff --git a/contrib/osx/make_osx.sh b/contrib/osx/make_osx.sh
index 3b223059c..b78cec841 100755
--- a/contrib/osx/make_osx.sh
+++ b/contrib/osx/make_osx.sh
@@ -88,8 +88,8 @@ brew install autoconf automake libtool gettext coreutils pkgconfig
 
 info "Building PyInstaller."
 PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
-PYINSTALLER_COMMIT="5d7a0449ecea400eccbbb30d5fcef27d72f8f75d"
-# ^ tag "v6.6.0"
+PYINSTALLER_COMMIT="306d4d92580fea7be7ff2c89ba112cdc6f73fac1"
+# ^ tag "v6.13.0"
 (
     if [ -f "$CACHEDIR/pyinstaller/PyInstaller/bootloader/Darwin-64bit/runw" ]; then
         info "pyinstaller already built, skipping"
diff --git a/contrib/requirements/requirements-build-mac.txt b/contrib/requirements/requirements-build-mac.txt
index 5d7135ae5..5504223d3 100644
--- a/contrib/requirements/requirements-build-mac.txt
+++ b/contrib/requirements/requirements-build-mac.txt
@@ -3,9 +3,11 @@ setuptools
 wheel
 
 # needed by pyinstaller:
+# fixme: ugly to have to duplicate this here from upstream
 macholib>=1.8
 altgraph
-pyinstaller-hooks-contrib>=2020.6
+pyinstaller-hooks-contrib>=2025.2
+packaging>=22.0
 
 # Note: hidapi requires Cython at build-time (not needed at runtime).
 # For reproducible builds, the version of Cython must be pinned down.
diff --git a/contrib/requirements/requirements-build-wine.txt b/contrib/requirements/requirements-build-wine.txt
index 4e4e0c75d..80cccba33 100644
--- a/contrib/requirements/requirements-build-wine.txt
+++ b/contrib/requirements/requirements-build-wine.txt
@@ -3,7 +3,9 @@ setuptools
 wheel
 
 # needed by pyinstaller:
-pefile>=2017.8.1
+# fixme: ugly to have to duplicate this here from upstream
+pefile>=2022.5.30,!=2024.8.26
 altgraph
-pywin32-ctypes>=0.2.0
-pyinstaller-hooks-contrib>=2020.11
+pywin32-ctypes>=0.2.1
+pyinstaller-hooks-contrib>=2025.2
+packaging>=22.0