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.
acolwell · Nov 28, 2024 · 06e665b · 06e665b
1 parent de45046
commit 06e665b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-20240717-1
+20241126-1
diff --git 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
 "
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ concurrent @@
     ctypes
     curses
     dbm
-    distutils
     email
     encodings
     html
@@ Expand All / @@ -43,6 +42,7 @@ urllib @@
     wsgiref
     xml
     xmlrpc
+    zipfile
     zoneinfo
     "
@@ Expand Down @@