From f4c8636e544f32dc1fb7307f87c2b28eb79b5ff6 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 12 Apr 2023 23:16:06 +0300 Subject: [PATCH 45/45] Update to crosser-2.6 See osdn #47665 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 2 +- windows/installer_cross/meson-installer_build.sh | 2 +- windows/installer_cross/meson-winbuild.sh | 4 ++-- windows/installer_cross/winbuild.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index 7a1f8fe841..365fc29d60 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -66,7 +66,7 @@ add_gtk4_env() { cp $1/bin/libgtk-4-1.dll $2/ && cp $1/bin/libgraphene-1.0-0.dll $2/ && cp $1/bin/libcairo-script-interpreter-2.dll $2/ && - cp $1/bin/libtiff-5.dll $2/ && + cp $1/bin/libtiff-6.dll $2/ && cp $1/bin/gdbus.exe $2/ && cp $1/bin/gtk4-update-icon-cache.exe $2/bin/ && cp ./helpers/installer-helper-gtk4.cmd $2/bin/installer-helper.cmd diff --git a/windows/installer_cross/meson-installer_build.sh b/windows/installer_cross/meson-installer_build.sh index b895c45beb..643bf9f652 100755 --- a/windows/installer_cross/meson-installer_build.sh +++ b/windows/installer_cross/meson-installer_build.sh @@ -72,7 +72,7 @@ add_gtk4_env() { cp $1/bin/libgtk-4-1.dll $2/ && cp $1/bin/libgraphene-1.0-0.dll $2/ && cp $1/bin/libcairo-script-interpreter-2.dll $2/ && - cp $1/bin/libtiff-5.dll $2/ && + cp $1/bin/libtiff-6.dll $2/ && cp $1/bin/gdbus.exe $2/ && cp $1/bin/gtk4-update-icon-cache.exe $2/bin/ && cp ./helpers/installer-helper-gtk4.cmd $2/bin/installer-helper.cmd diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index 7e45b3a72d..c2e1f48f2b 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -7,9 +7,9 @@ # See COPYING available from the same location you got this script. # -MESON_WINBUILD_VERSION="3.1.0-alpha" +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.5 +CROSSER_FEATURE_LEVEL=2.6 if test "$1" = "" || test "$1" = "-h" || test "$1" = "--help" ; then echo "Usage: $0 " diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index c6df44343b..1c108f696c 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.5 +CROSSER_FEATURE_LEVEL=2.6 if test "$1" = "" || test "$1" = "-h" || test "$1" = "--help" ; then echo "Usage: $0 [gui]" -- 2.39.2