From d7e83749dc65b3eae3694ad4dab1be5b34085185 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 4 Sep 2024 01:27:24 +0300 Subject: [PATCH 8/8] Update to crosser-2.9 See RM #722 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 23 ++++++++++++---------- windows/installer_cross/meson-winbuild.sh | 2 +- windows/installer_cross/winbuild.sh | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index 51fadbbfcc..3966c302e6 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -95,18 +95,21 @@ add_qt6_env() { } add_common_env() { - cp $1/bin/libcurl-4.dll $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/libsqlite3-0.dll $2/ && - cp $1/bin/libiconv-2.dll $2/ && - cp $1/bin/libz.dll.1.3.1 $2/ && - cp $1/lib/icuuc64.dll $2/ && - cp $1/lib/icudt64.dll $2/ && - cp $1/bin/libpng16-16.dll $2/ && + cp $1/bin/libcurl-4.dll $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/libsqlite3-0.dll $2/ && + cp $1/bin/libiconv-2.dll $2/ && + cp $1/bin/libz.dll.1.3.1 $2/ && + cp $1/lib/icuuc66.dll $2/ && + cp $1/lib/icudt66.dll $2/ && + cp $1/bin/libpng16-16.dll $2/ && cp $1/bin/libfreetype-6.dll $2/ && cp $1/bin/libharfbuzz-0.dll $2/ && + cp $1/bin/libpsl-5.dll $2/ && + cp $1/bin/libMagickWand-7.Q16HDRI-10.dll $2/ && + cp $1/bin/libMagickCore-7.Q16HDRI-10.dll $2/ && add_glib_env $1 $2 } diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index dfaa3f46f5..792cc8261c 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -9,7 +9,7 @@ MESON_WINBUILD_VERSION="3.1.0-beta" MIN_WINVER=0x0603 # Windows 8.1. Qt6-client and Qt6-ruledit builds override this -CROSSER_FEATURE_LEVEL=2.8 +CROSSER_FEATURE_LEVEL=2.9 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then echo "Usage: $0 " diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index 4cb4b878b1..45a4619728 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -11,7 +11,7 @@ WINBUILD_VERSION="2.4.2" MIN_WINVER=0x0603 # Windows 8.1, Qt6-client and Qt6-ruledit builds override this -CROSSER_FEATURE_LEVEL=2.8 +CROSSER_FEATURE_LEVEL=2.9 if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then echo "Usage: $0 [gui]" -- 2.45.2