From a5a6b557f1137364585b24a8686ce20ff1a6e817 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 4 Sep 2024 01:24:14 +0300 Subject: [PATCH 16/16] Update to crosser-2.9 See RM #722 Signed-off-by: Marko Lindqvist --- .../installer_cross/meson-installer_build.sh | 15 ++++++++++----- .../windows/installer_cross/meson-winbuild.sh | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/platforms/windows/installer_cross/meson-installer_build.sh b/platforms/windows/installer_cross/meson-installer_build.sh index 3ea059cb52..c34201c72f 100755 --- a/platforms/windows/installer_cross/meson-installer_build.sh +++ b/platforms/windows/installer_cross/meson-installer_build.sh @@ -20,12 +20,13 @@ add_common_env() { 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/lib/icuuc64.dll $2/ && - cp $1/lib/icudt64.dll $2/ && + cp $1/bin/libsqlite3-0.dll $2/ && + cp $1/lib/icuuc66.dll $2/ && + cp $1/lib/icudt66.dll $2/ && cp $1/bin/libfreetype-6.dll $2/ && - cp $1/bin/libpng16-16.dll $2/ && - cp $1/bin/libharfbuzz-0.dll $2/ + cp $1/bin/libpng16-16.dll $2/ && + cp $1/bin/libharfbuzz-0.dll $2/ && + cp $1/bin/libpsl-5.dll $2/ } add_glib_env() { @@ -59,6 +60,8 @@ add_gtk_common_env() { cp $1/bin/libatk-1.0-0.dll $2/ && cp $1/bin/libffi-8.dll $2/ && cp $1/bin/libxml2-2.dll $2/ && + cp $1/bin/libMagickWand-7.Q16HDRI-10.dll $2/ && + cp $1/bin/libMagickCore-7.Q16HDRI-10.dll $2/ && mkdir -p $2/lib && cp -R $1/lib/gdk-pixbuf-2.0 $2/lib/ && mkdir -p $2/share/icons && @@ -97,6 +100,8 @@ add_qt6_env() { cp $1/bin/Qt6Gui.dll $2/ && cp $1/bin/Qt6Widgets.dll $2/ && cp $1/bin/libpcre2-16-0.dll $2/ && + cp $1/bin/libMagickWand-7.Q16HDRI-10.dll $2/ && + cp $1/bin/libMagickCore-7.Q16HDRI-10.dll $2/ && mkdir -p $2/bin && cp ./helpers/installer-helper-qt.cmd $2/bin/installer-helper.cmd } diff --git a/platforms/windows/installer_cross/meson-winbuild.sh b/platforms/windows/installer_cross/meson-winbuild.sh index f70cb4c398..845c5032fb 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.8 +CROSSER_FEATURE_LEVEL=2.9 if test "$1" = "" || test "$1" = "-h" || test "$1" = "--help" ; then echo "Usage: $0 " -- 2.45.2