From 06e665bc642b22f7d39f187bcfe4639fa9a285b7 Mon Sep 17 00:00:00 2001
From: Aaron Colwell <300262+acolwell@users.noreply.github.com>
Date: Tue, 26 Nov 2024 15:34:06 -0800
Subject: [PATCH] Fix Windows build

- Add a dependency on mingw-w64-x86_64-pkg-config since the installer
  script depends on it.

- Fix libraw package build by removing an export to a directory
  that does not exist.

- Remove distutils from list of directories to copy in python zip
  since distutils was removed in python 3.12

- Add zipfile module to python zip since get-pip requires it now.
---
 tools/MINGW-packages/mingw-w64-libraw-gpl2/PKGBUILD           | 2 +-
 tools/MINGW-packages/mingw-w64-natron-build-deps-qt5/PKGBUILD | 1 +
 tools/MINGW-packages/windows_pacman_repo_version.txt          | 2 +-
 tools/jenkins/zip-python-mingw.sh                             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/MINGW-packages/mingw-w64-libraw-gpl2/PKGBUILD b/tools/MINGW-packages/mingw-w64-libraw-gpl2/PKGBUILD
index ab42c0cd8..831e5eefd 100644
--- a/tools/MINGW-packages/mingw-w64-libraw-gpl2/PKGBUILD
+++ b/tools/MINGW-packages/mingw-w64-libraw-gpl2/PKGBUILD
@@ -39,7 +39,7 @@ prepare() {
   patch -Np1 -i "${srcdir}/LibRaw_wsock32.patch"
   patch -Np1 -i "${srcdir}/LibRaw_obsolete-macros.patch"
 
-  export ACLOCAL_PATH="/msys64/usr/share/aclocal/"
+  #export ACLOCAL_PATH="/msys64/usr/share/aclocal/"
   autoreconf -ifv
 }
 
diff --git a/tools/MINGW-packages/mingw-w64-natron-build-deps-qt5/PKGBUILD b/tools/MINGW-packages/mingw-w64-natron-build-deps-qt5/PKGBUILD
index 88940a8b6..a562a9a06 100644
--- a/tools/MINGW-packages/mingw-w64-natron-build-deps-qt5/PKGBUILD
+++ b/tools/MINGW-packages/mingw-w64-natron-build-deps-qt5/PKGBUILD
@@ -43,6 +43,7 @@ depends=(
   "unzip"
   "${MINGW_PACKAGE_PREFIX}-firebird"
   "${MINGW_PACKAGE_PREFIX}-breakpad-git"
+  "${MINGW_PACKAGE_PREFIX}-pkgconf"
   "${MINGW_PACKAGE_PREFIX}-python-sphinx"
   "${MINGW_PACKAGE_PREFIX}-python-sphinx_rtd_theme"
   "${MINGW_PACKAGE_PREFIX}-natron-setup"
diff --git a/tools/MINGW-packages/windows_pacman_repo_version.txt b/tools/MINGW-packages/windows_pacman_repo_version.txt
index 6993b34a2..54d53fbbe 100644
--- a/tools/MINGW-packages/windows_pacman_repo_version.txt
+++ b/tools/MINGW-packages/windows_pacman_repo_version.txt
@@ -1 +1 @@
-20240717-1
+20241126-1
diff --git a/tools/jenkins/zip-python-mingw.sh b/tools/jenkins/zip-python-mingw.sh
index b846e8499..d0dc951c8 100755
--- a/tools/jenkins/zip-python-mingw.sh
+++ b/tools/jenkins/zip-python-mingw.sh
@@ -23,7 +23,6 @@ concurrent
 ctypes
 curses
 dbm
-distutils
 email
 encodings
 html
@@ -43,6 +42,7 @@ urllib
 wsgiref
 xml
 xmlrpc
+zipfile
 zoneinfo
 "