Skip to content

Commit 8326245

Browse files
authored
Fix Windows build (#1017)
- 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.
1 parent de45046 commit 8326245

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

tools/MINGW-packages/mingw-w64-libraw-gpl2/PKGBUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ prepare() {
3939
patch -Np1 -i "${srcdir}/LibRaw_wsock32.patch"
4040
patch -Np1 -i "${srcdir}/LibRaw_obsolete-macros.patch"
4141

42-
export ACLOCAL_PATH="/msys64/usr/share/aclocal/"
4342
autoreconf -ifv
4443
}
4544

tools/MINGW-packages/mingw-w64-natron-build-deps-qt5/PKGBUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ depends=(
4343
"unzip"
4444
"${MINGW_PACKAGE_PREFIX}-firebird"
4545
"${MINGW_PACKAGE_PREFIX}-breakpad-git"
46+
"${MINGW_PACKAGE_PREFIX}-pkgconf"
4647
"${MINGW_PACKAGE_PREFIX}-python-sphinx"
4748
"${MINGW_PACKAGE_PREFIX}-python-sphinx_rtd_theme"
4849
"${MINGW_PACKAGE_PREFIX}-natron-setup"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20240717-1
1+
20241126-1

tools/jenkins/zip-python-mingw.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ concurrent
2323
ctypes
2424
curses
2525
dbm
26-
distutils
2726
email
2827
encodings
2928
html
@@ -43,6 +42,7 @@ urllib
4342
wsgiref
4443
xml
4544
xmlrpc
45+
zipfile
4646
zoneinfo
4747
"
4848

0 commit comments

Comments
 (0)