gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/f1ec6b99 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/eda44784 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/bd60c8f8 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/7c46eec2 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/7ac50c72 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/177e4027 (commit)



commit f1ec6b99c0a2f68b7855ec771396fcb5717f7d3d
Merge: eda4478 7c46eec
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 7 13:18:37 2021 -0700

    Merge Usamimikamen-sk's 'dbk-docbook' into master.


commit eda44784d4e9d11727c94e6781f662439032ae97
Merge: bd60c8f 7ac50c7
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 7 13:15:49 2021 -0700

    Merge Usamimiken-sk's 'msys-installer-path' into master.


commit bd60c8f890c81af6174cfd32434629f1f41fd837
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Sep 7 13:13:51 2021 -0700

    Remove mysql-connector from moduleset, it's not used.

diff --git a/gnucash.modules b/gnucash.modules
index 8c0ca3d..abf1088 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -9,8 +9,6 @@
 	      href="http://downloads.sourceforge.net/"/>
   <repository type="tarball" name="csail"
 	      href="http://groups.csail.mit.edu/mac/ftpdir/"/>
-  <repository type="tarball" name="csclub"
-	      href="http://mirror.csclub.uwaterloo.ca/mysql/Downloads/"/>
   <repository type="tarball" name="gnucash.org"
 	      href="http://www.gnucash.org/pub/gnucash/sources/"/>
   <repository type="git" name="git.gnucash.org"
@@ -238,16 +236,6 @@
     </dependencies>
   </autotools>
 
-
-  <cmake id="mysql">
-    <branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
-	    version="6.0.2" >
-    </branch>
-    <dependencies>
-      <dep package="cmake"/>
-    </dependencies>
-  </cmake>
-
   <autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
     <branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
 	    version="0.8.4">

commit 7c46eec28032eeeb7b6a18c4fd8c89ce95cfa60b
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Sep 4 20:24:15 2021 +0900

    Add docbook-xsl (and docbook-xml) to build dependencies.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 22fbc33..2029a92 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 = "boost icu gtk3 iso-codes shared-mime-info libmariadbclient libsoup libwebp postgresql ninja pdcurses sqlite3"
+$deps = "boost icu gtk3 iso-codes shared-mime-info libmariadbclient libsoup libwebp postgresql ninja pdcurses sqlite3 docbook-xsl"
 
 Write-Host @"
 

commit 7ac50c72f0c9f395320afdb86c2ddb7d747afee4
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Aug 21 14:34:58 2021 +0900

    Change msys2-x86_64 installer path because trustdb for pacman is not updated properly.
    See https://github.com/msys2/msys2-installer/releases/tag/2021-07-25

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 22fbc33..6ca087d 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -140,7 +140,7 @@ function make-unixpath([string]$path) {
 
 if (!(test-path -path $bash_path)) {
     $mingw64_installer32 = "$preferred_mirror/distrib/msys2-i686-latest.exe"
-    $mingw64_installer64 = "$preferred_mirror/distrib/x86_64/msys2-x86_64-20200903.exe"
+    $mingw64_installer64 = "$preferred_mirror/distrib/msys2-x86_64-latest.exe"
 
     $mingw64_installer = If ([IntPtr]::size -eq 4) {$mingw64_installer32} Else {$mingw64_installer64}
     $msys_install_dir = (join-path $target_dir "msys2") -replace "\\", '/'



Summary of changes:
 gnucash.modules   | 12 ------------
 setup-mingw64.ps1 |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)