gnucash-on-windows master: Call patch with the right path and -d/.
John Ralls
jralls at code.gnucash.org
Tue Sep 5 19:03:39 EDT 2017
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/bb023335 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/2aa0df87 (commit)
commit bb0233353011d5dad046745ef53dff308ffe001c
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Sep 5 16:03:25 2017 -0700
Call patch with the right path and -d/.
The latter so that it won't fail because of patching a subdir of /usr.
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 908d5aa..7d25aa7 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -254,8 +254,8 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
exit
}
-bash-command -command "$mingw_bin/patch -i $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "$mingw_bin/patch -i $target_dir/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+bash-command -command "/usr/bin/patch -d/ -p0 -i $target_dir/src/gnucash-on-windows.git/patches/jhbuild.patch"
+bash-command -command "/usr/bin/patch -d/ -p0 -i $target_dir/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$target_unix = make-unixpath $target_dir
$download_unix = make-unixpath $download_dir
Summary of changes:
setup-mingw64.ps1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list