From d9d14f35af75add4b835deb514c2bc2fe1dc9e18 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 20 Sep 2026 23:12:13 +0300 Subject: [PATCH 31/31] Update to crosser-2.12 See RM #2212 Signed-off-by: Marko Lindqvist --- .../windows/installer_cross/meson-installer_build.sh | 8 ++++---- platforms/windows/installer_cross/meson-winbuild.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platforms/windows/installer_cross/meson-installer_build.sh b/platforms/windows/installer_cross/meson-installer_build.sh index b3c3433461..3071ae4f93 100755 --- a/platforms/windows/installer_cross/meson-installer_build.sh +++ b/platforms/windows/installer_cross/meson-installer_build.sh @@ -15,14 +15,14 @@ add_common_env() { cp $1/bin/libcurl-4.dll $2/ && - cp $1/bin/libz.dll.1.3.1 $2/ && + cp $1/bin/libz.dll.1.3.2 $2/ && cp $1/bin/liblzma-5.dll $2/ && cp $1/bin/libzstd-1.dll $2/ && cp $1/bin/libintl-8.dll $2/ && cp $1/bin/libiconv-2.dll $2/ && cp $1/bin/libsqlite3-0.dll $2/ && - cp $1/bin/icuuc76.dll $2/ && - cp $1/bin/icudt76.dll $2/ && + cp $1/bin/icuuc78.dll $2/ && + cp $1/bin/icudt78.dll $2/ && cp $1/bin/libfreetype-6.dll $2/ && cp $1/bin/libpng16-16.dll $2/ && cp $1/bin/libharfbuzz-0.dll $2/ && @@ -60,7 +60,7 @@ add_gtk_common_env() { cp $1/bin/libfontconfig-1.dll $2/ && cp $1/bin/libpixman-1-0.dll $2/ && cp $1/bin/libgmodule-2.0-0.dll $2/ && - cp $1/bin/libjpeg-9.dll $2/ && + cp $1/bin/libjpeg-10.dll $2/ && cp $1/bin/libepoxy-0.dll $2/ && cp $1/bin/libfribidi-0.dll $2/ && cp $1/bin/libatk-1.0-0.dll $2/ && diff --git a/platforms/windows/installer_cross/meson-winbuild.sh b/platforms/windows/installer_cross/meson-winbuild.sh index 561b5601bb..5ef36a8938 100755 --- a/platforms/windows/installer_cross/meson-winbuild.sh +++ b/platforms/windows/installer_cross/meson-winbuild.sh @@ -9,7 +9,7 @@ MESON_WINBUILD_VERSION="3.3.0-dev" MIN_WINVER=0x0603 # Windows 8.1. Qt6-client and Qt6-ruledit builds override this -CROSSER_FEATURE_LEVEL=2.11 +CROSSER_FEATURE_LEVEL=2.12 if test "$1" = "" || test "$1" = "-h" || test "$1" = "--help" ; then echo "Usage: $0 " -- 2.53.0