gnucash-on-windows master: New WebKit build to accommodate recent change to libxml2 build.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/1b2947f2 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/6b89956d (commit)



commit 1b2947f256ddf6d2e08ce63a5018074eb1a03a08
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Oct 16 15:34:33 2025 -0700

    New WebKit build to accommodate recent change to libxml2 build.
    
    MSYS2 didn't rebuild libsoup on 32-bit for the new libxml build so we have to do that too.

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 48aa245..c552fb5 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -193,7 +193,6 @@ Source: "@MINGW_DIR@\bin\libunistring-5.dll"; DestDir: "{app}\bin"; Components:
 Source: "@MINGW_DIR@\bin\libwebp-7.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libwebkitgtk-3.0-0.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libwinpthread-1.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libxml2-2.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libxml2-16.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libzstd.dll"; DestDir: "{app}\bin"; Components: main
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 45b8439..d6edabc 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -240,16 +240,20 @@ $sourceforge_url = "https://downloads.sourceforge.net/gnucash/Dependencies/"
 $signing_keyfile = "jralls_public_signing_key.asc"
 $key_url = $sourceforge_url + $signing_keyfile
 $key_id = "C1F4DE993CF5835F"
-$webkit = "$arch_long-webkitgtk3-2.4.11-999.8-any.pkg.tar.zst"
+$webkit = "$arch_long-webkitgtk3-2.4.11-999.10-any.pkg.tar.zst"
+$libsoup = "$arch-long-libsoup-2.74.3-4-any.pkg.tar.zst"
 $webkit_url = $sourceforge_url + $webkit
 $webkit_sig = $webkit_url + ".sig"
+$libsoup_url = $sourceforge + $libsoup
+$libsoup_sig = $libsoup + ".sig"
 $download_unix = make-unixpath $download_dir
 bash-command -command "curl -L -s -S -o $signing_keyfile $key_url"
 bash-command -command "pacman-key --add $signing_keyfile"
 bash-command -command "pacman-key --lsign-key  $key_id"
 bash-command -command "curl -L -s -S -O --output-dir $download_unix $webkit_url"
 bash-command -command "curl -L -s -S -O --output-dir $download_unix $webkit_sig"
-
+bash-command -command "curl -L -s -S -O --output-dir $download_unix $libsoup_url"
+bash-command -command "curl -L -s -S -O --output-dir $download_unix $libsoup_sig"
 $ignorefile = ""
 [IO.File]::WriteAllLines( "$msys2_root\etc\pacman.d\gnucash-ignores.pacman", $ignorefile)
 bash-command -command "perl -ibak -pe 'BEGIN{undef $/;} s#[[]options[]]\R(Include = [^\R]*\R)?#[options]\nInclude = /etc/pacman.d/gnucash-ignores.pacman\n#smg' /etc/pacman.conf"
@@ -260,7 +264,6 @@ $deps = "boost libgcrypt iso-codes libsecret docbook-xsl"
 if (!($x86_64)) {
     bash-command -command "pacman -U https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-icu-76.1-1-any.pkg.tar.zst --noconfirm --needed"
     bash-command -command "pacman -U https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-libmariadbclient-3.3.8-2-any.pkg.tar.zst --noconfirm --needed"
-    bash-command -command "pacman -U https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-libsoup-2.74.3-1-any.pkg.tar.zst --noconfirm --needed"
     bash-command -command "pacman -U https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-pdcurses-4.4.0-1-any.pkg.tar.zst --noconfirm --needed"
     bash-command -command "pacman -U https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-harfbuzz-11.0.1-1-any.pkg.tar.zst --noconfirm --needed"
     bash-command -command "pacman -U https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-harfbuzz-icu-11.0.1-1-any.pkg.tar.zst --noconfirm --needed"
@@ -269,7 +272,10 @@ if (!($x86_64)) {
 else {
     $deps += " icu libmariadbclient libsoup pdcurses"
 }
-
+# Mingw-64 didn't update libsoup when they reconfigure libxml2 so we need our own version on 32-bit builds.
+if (!($x86_64)) {
+    bash-command -command "pacman -U $download_unix/$libsoup --noconfirm --needed"
+}
 bash-command -command "pacman -U $download_unix/$webkit --noconfirm --needed"
 
 $mingw_deps = make-pkgnames -prefix $mingw_prefix -items $deps



Summary of changes:
 inno_setup/gnucash-mingw64.iss |  1 -
 setup-mingw64.ps1              | 14 ++++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)