gnucash-on-windows master: Patch with -f instead of -t

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/dbb9f9a8 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/2bd3a281 (commit)



commit dbb9f9a87ef2967793168f3680739fd6fce7961d
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Apr 20 09:44:01 2018 +0200

    Patch with -f instead of -t
    
    -t was interpreting already applied patches as reversed patches, resulting
    in the patch to be undone again. With this every other run of setup-mingw64.ps1
    would result in a cmake that couldn't find swig.
    The workaround in jhbuild can probably be removed again now.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index c8a8323..41a6eb6 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -270,8 +270,8 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
    exit
 }
 
-bash-command -command "/usr/bin/patch -t -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -t -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+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/ -p0 -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"} |



Summary of changes:
 setup-mingw64.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)