gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/03e084bc (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/6f845622 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/7ebb814b (commit)



commit 03e084bc5435ad049c16df8e44713be81c85adf6
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue May 28 12:22:48 2019 -0700

    One more fix for patching FindSWIG.cmake.

diff --git a/gnucash.modules b/gnucash.modules
index bf6566a..da1ce23 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -119,8 +119,8 @@
   </autotools>
 
   <autotools id="guile2" autogen-sh="configure" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads --with-modules --disable-static">
-    <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4+mingw.tar.bz2"
-	    version="2.2.4+mingw">
+    <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4.71-cf330.tar.bz2"
+	    version=" 2.2.4.71-cf330">
     </branch>
     <dependencies>
       <dep package="libunistring"/>
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 3081906..296cf5d 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -307,7 +307,7 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
 }
 
 bash-command -command "/usr/bin/patch -f -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -f -d $(dirname $(/usr/bin/find /$arch/share/cmake* -name FindSWIG.cmake) ) -p2 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+bash-command -command "/usr/bin/patch -f -d `$(dirname `$(/usr/bin/find /$arch/share/cmake* -name FindSWIG.cmake) ) -p1 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
 
 $jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
  %{$_ -replace "@-BASE_DIR-@", "$target_unix"} |

commit 6f845622415df86b9ac04b06fd4414c04938a090
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon May 27 12:17:29 2019 -0700

    Convert patches to relative paths.
    
    Allows builds from arbitrary checkouts.

diff --git a/gnucash.modules b/gnucash.modules
index 11ea028..bf6566a 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -118,7 +118,6 @@
     </dependencies>
   </autotools>
 
-  <!-- Unfortunately in addition to needing a few patches this hangs when it tries to compile Scheme. -->
   <autotools id="guile2" autogen-sh="configure" autogenargs="--disable-rpath --enable-networking --enable-nls --enable-posix --enable-regex --with-threads --with-modules --disable-static">
     <branch repo="sourceforge" module="gnucash/Dependencies/guile-2.2.4+mingw.tar.bz2"
 	    version="2.2.4+mingw">
@@ -172,7 +171,7 @@
   <autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
 	     autogenargs="--enable-local-install">
     <branch module="download.php?package=03&release=217&file=02&dummy=aqbanking-5.7.8.tar.gz" repo="aqbanking" version="5.7.8" checkoutdir="aqbanking-5.7.8">
-            <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/Fix-signature-mismatch-in-abgui.c.patch" strip='1'/>
+            <patch file="Fix-signature-mismatch-in-abgui.c.patch" strip='1'/>
     </branch>
     <dependencies>
       <dep package="gwenhywfar"/>
@@ -207,8 +206,8 @@
 	     autogen-template='/bin/bash -c "pushd %(srcdir)s && ./autoinit.sh && popd && %(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s"'>
     <branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
 	    version='1.5.2'>
-      <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/opensp-1.5.2.patch" strip='1'/>
-      <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/OpenSP-1.5.2-non-posix-functions.patch" strip='1'/>
+      <patch file="opensp-1.5.2.patch" strip='1'/>
+      <patch file="OpenSP-1.5.2-non-posix-functions.patch" strip='1'/>
     </branch>
   </autotools>
 
@@ -247,7 +246,7 @@
   <autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
     <branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
 	    version="0.8.4">
-      <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-0.8.3.patch" strip="1"/>
+      <patch file="libdbi-0.8.3.patch" strip="1"/>
     </branch>
   </autotools>
 
@@ -255,8 +254,8 @@
 	     autogenargs='--disable-docs --with-sqlite3 --with-sqlite3-dir="/mingw32" --with-pgsql --with-pgsql-dir="/mingw32" --with-mysql --with-mysql-dir="/mingw32" '>
     <branch repo="sourceforge" version="0.8.3"
 	    module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
-      <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-drivers-errno.patch" strip="1"/>
-      <patch file="https://raw.githubusercontent.com/Gnucash/gnucash-on-windows/master/patches/libdbi-drivers-linkage.patch" strip="1"/>
+      <patch file="libdbi-drivers-errno.patch" strip="1"/>
+      <patch file="libdbi-drivers-linkage.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="libdbi"/>



Summary of changes:
 gnucash.modules   | 17 ++++++++---------
 setup-mingw64.ps1 |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)