From 6b69abb6dd8da43883f3ca7e9d8606bb4dfbb6f5 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 4 Sep 2024 01:25:58 +0300
Subject: [PATCH 12/12] Update to crosser-2.9

See RM #722

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_cross/installer_build.sh    | 23 +++++++++++--------
 .../installer_cross/meson-installer_build.sh  | 15 ++++++++----
 windows/installer_cross/meson-winbuild.sh     |  2 +-
 windows/installer_cross/winbuild.sh           |  2 +-
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh
index 8a356a2b58..8596a7811f 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-installer_build.sh b/windows/installer_cross/meson-installer_build.sh
index 1af2e2164c..9c91c94ca2 100755
--- a/windows/installer_cross/meson-installer_build.sh
+++ b/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/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh
index 328f78d962..dcf9863fdb 100755
--- a/windows/installer_cross/meson-winbuild.sh
+++ b/windows/installer_cross/meson-winbuild.sh
@@ -9,7 +9,7 @@
 
 MESON_WINBUILD_VERSION="3.2.0-alpha"
 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 <crosser dir> <gui>"
diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh
index fc3298029e..7b77dc4d46 100755
--- a/windows/installer_cross/winbuild.sh
+++ b/windows/installer_cross/winbuild.sh
@@ -11,7 +11,7 @@
 
 WINBUILD_VERSION="2.4.3"
 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 <crosser dir> [gui]"
-- 
2.45.2