diff --git a/build/macos/all-deps-uni.txt b/build/macos/all-deps-uni.txt index 0b0b45bcad..45246f86c0 100644 --- a/build/macos/all-deps-uni.txt +++ b/build/macos/all-deps-uni.txt @@ -42,7 +42,7 @@ librsvg|homebrew:librsvg \ tiff|homebrew:libtiff \ webp|homebrew:webp \ libwmf -x11|homebrew:libwmf \ -maxflow \ +maxflow #homebrew rejected maxflow https://github.com/Homebrew/homebrew-core/pull/276186 \ mypaint-brushes|homebrew:mypaint-brushes \ openexr|homebrew:openexr \ openjpeg|homebrew:openjpeg \ @@ -51,7 +51,7 @@ poppler +pinentry -pinentry_mac|homebrew:poppler \ poppler-data \ python313|homebrew:python \ py313-certifi|homebrew:certifi py313-gobject3|homebrew:pygobject3 \ -qoi \ +qoi #homebrew rejected qoi https://github.com/Homebrew/homebrew-core/pull/276182 \ #suitesparse not built by Apple Clang #xpm depends on x11 xz|homebrew:xz diff --git a/build/windows/1_build-deps-msys2.ps1 b/build/windows/1_build-deps-msys2.ps1 index 2169d89b59..3c38899d52 100644 --- a/build/windows/1_build-deps-msys2.ps1 +++ b/build/windows/1_build-deps-msys2.ps1 @@ -64,7 +64,7 @@ if (Test-Path "$env:VCPKG_ROOT\vcpkg.exe" -Type Leaf) else { powershell -Command { $ProgressPreference = 'SilentlyContinue'; $env:PATH="$env:MSYS_ROOT\usr\bin;$env:PATH"; pacman --noconfirm -Suy }; if ("$LASTEXITCODE" -gt '0') { exit 1 } - powershell -Command { $ProgressPreference = 'SilentlyContinue'; $env:PATH="$env:MSYS_ROOT\usr\bin;$env:PATH"; pacman --noconfirm -S --needed (Get-Content build/windows/all-deps-uni.txt | Select-String 'MINGW_' | ForEach-Object { ($_ -split '\|vcpkg:')[0] -replace '\$\{MINGW_PACKAGE_PREFIX\}', $(if ($env:MINGW_PACKAGE_PREFIX) { $env:MINGW_PACKAGE_PREFIX } elseif ($env:MSYSTEM_PREFIX -eq 'clangarm64') { 'mingw-w64-clang-aarch64' } else { 'mingw-w64-clang-x86_64' }) }) }; if ("$LASTEXITCODE" -gt '0') { exit 1 } + powershell -Command { $ProgressPreference = 'SilentlyContinue'; $env:PATH="$env:MSYS_ROOT\usr\bin;$env:PATH"; pacman --noconfirm -S --needed (Get-Content build/windows/all-deps-uni.txt | Where-Object { $_ -match 'MINGW_' -and -not $_.Trim().StartsWith('#') } | ForEach-Object { (($_.Split('#')[0].Trim() -split '\|vcpkg:')[0] -replace '\$\{MINGW_PACKAGE_PREFIX\}', $(if ($env:MINGW_PACKAGE_PREFIX) { $env:MINGW_PACKAGE_PREFIX } elseif ($env:MSYSTEM_PREFIX -eq 'clangarm64') { 'mingw-w64-clang-aarch64' } else { 'mingw-w64-clang-x86_64' })) }) }; if ("$LASTEXITCODE" -gt '0') { exit 1 } } Write-Output "$([char]27)[0Ksection_end:$(Get-Date -UFormat %s -Millisecond 0):deps_install$([char]13)$([char]27)[0K" diff --git a/build/windows/all-deps-uni.txt b/build/windows/all-deps-uni.txt index 44fb1744f5..85916a7e2d 100644 --- a/build/windows/all-deps-uni.txt +++ b/build/windows/all-deps-uni.txt @@ -42,7 +42,7 @@ ${MINGW_PACKAGE_PREFIX}-librsvg|vcpkg:librsvg ${MINGW_PACKAGE_PREFIX}-libtiff|vcpkg:tiff ${MINGW_PACKAGE_PREFIX}-libwebp|vcpkg:libwebp ${MINGW_PACKAGE_PREFIX}-libwmf -${MINGW_PACKAGE_PREFIX}-maxflow +${MINGW_PACKAGE_PREFIX}-maxflow #vcpkg rejected maxflow https://github.com/microsoft/vcpkg/pull/50950 ${MINGW_PACKAGE_PREFIX}-mypaint-brushes2|vcpkg:mypaint-brushes ${MINGW_PACKAGE_PREFIX}-openexr|vcpkg:openexr ${MINGW_PACKAGE_PREFIX}-openjpeg2|vcpkg:openjpeg