gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/cbf63811 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/cedc5ffb (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/b9cc6307 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/70f6645c (commit)



commit cbf63811274f5d8960533eb11261a35eb120b720
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Dec 27 14:31:57 2019 -0800

    Use a webkitgtk3 package built by the GnuCash team.
    
    To replace the obsolescent one no longer supported by MinGW-w64.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 25bef59..dbea428 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -268,7 +268,7 @@ $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"
 
 # Install the remaining dependencies.
-$deps = "iso-codes shared-mime-info libmariadbclient postgresql ninja pdcurses"
+$deps = "boost iso-codes shared-mime-info libmariadbclient postgresql ninja pdcurses"
 
 Write-Host @"
 

commit cedc5ffb7f3983102e71caed140fcbc9fe76472b
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Dec 27 14:29:39 2019 -0800

    Run pacman -Syyuu twice.
    
    If there's a core update the first one just does that.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 86ae27d..25bef59 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -230,6 +230,7 @@ Write-Host @"
 Updating the installation. Accept the proposed changes. If the window doesn't close on its own then close it and re-run the script when it finishes.
 "@
 
+bash-command -command "pacman -Syyuu --noconfirm"
 bash-command -command "pacman -Syyuu --noconfirm"
 
 # Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
@@ -246,29 +247,23 @@ bash-command -command "pacman -S $msys_devel --noconfirm --needed"
 $mingw_toolchain = make-pkgnames -prefix $mingw_prefix -items $toolchain
 bash-command -command "pacman -S $mingw_toolchain --noconfirm --needed"
 
-# webkitgtk3 was removed from the pacman database but the package is still available via direct url
-# so we install it from that url directly.
-# Note webkitgtk3 depends on icu. Icu updates require dependent packages to be rebuilt to work with the new version.
-# However as there won't be any webkitgtk3 updates, we have to peg icu to the version the last webkitgtk3
-# was built with. That also impacts other icu dependent packages: boost and harfbuzz. As we peg icu
-# we equally need to peg these two.
-# Note that webkitgtk3 will pull in gtk3 automatically.
-
+# The mingw-w64-webkitgtk3 package is no longer supported by the msys2
+# project so we have our own build on SourceForge.
 Write-Host @"
-
-Now we'll install webkitgtk3 via direct url as it's no longer in the pacman database. With this we install a couple of other packages that are pegged to fixed version numbers due to how icu forces package dependencies. If the window doesn't close on its own then close it and re-run the script when it finishes.
-"@
-$direct_deps = "webkitgtk3-2.4.11-6-any.pkg.tar.xz boost-1.67.0-2-any.pkg.tar.xz harfbuzz-1.8.4-1-any.pkg.tar.xz icu-61.1-1-any.pkg.tar.xz"
-$mingw_direct_deps = make-pkgnames -prefix $mingw_url_prefix -items $direct_deps
-bash-command -command "pacman -U $mingw_direct_deps --noconfirm --needed"
-
-# Tell pacman to no longer update these manually installed packages
-$ignorefile = @"
-IgnorePkg   = mingw-w64-i686-icu
-IgnorePkg   = mingw-w64-i686-boost
-IgnorePkg   = mingw-w64-i686-harfbuzz
-IgnorePkg   = mingw-w64-i686-webkitgtk3
+Now we'll install a pre-built webkitgtk3 package we've created and placed in the GnuCash project on SourceForge. It will install several more dependencies from Mingw-w64's repository.
 "@
+$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.1-any.pkg.tar.xz"
+$webkit_url = $sourceforge_url + $webkit
+bash-command -command "wget $key_url"
+bash-command -command "pacman-key --add $signing_keyfile"
+bash-command -command "pacman-key --lsign $key_id"
+bash-command -command "pacman -U $webkit_url --noconfirm --needed"
+
+$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"
 

commit b9cc630773cc85f99b287ff4fc8e673489cd66ff
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Dec 25 15:18:45 2019 -0800

    Update the msys installer to the current version.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 2851ff3..86ae27d 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -137,8 +137,8 @@ function make-unixpath([string]$path) {
 # Install MSYS2 for the current machine's architechture.
 
 if (!(test-path -path $bash_path)) {
-    $mingw64_installer32 = "$preferred_mirror/distrib/i686/msys2-i686-20180531.exe"
-    $mingw64_installer64 = "$preferred_mirror/distrib/x86_64/msys2-x86_64-20180531.exe"
+    $mingw64_installer32 = "$preferred_mirror/distrib/i686/msys2-i686-20190524.exe"
+    $mingw64_installer64 = "$preferred_mirror/distrib/x86_64/msys2-x86_64-20190524.exe"
 
     $mingw64_installer_file = "$download_dir\msys2.exe"
     $mingw64_installer = If ([IntPtr]::size -eq 4) {$mingw64_installer32} Else {$mingw64_installer64}



Summary of changes:
 setup-mingw64.ps1 | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)