gnucash-on-windows master: Include missing name parameter and use explicit path for find.

John Ralls jralls at code.gnucash.org
Sun May 26 18:59:43 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/7ebb814b (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/520cec85 (commit)



commit 7ebb814bb54215e07b3862a30b16478cc1afcaa0
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun May 26 15:59:35 2019 -0700

    Include missing name parameter and use explicit path for find.

diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index ea7fd5a..3081906 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 $(find /$arch/share/cmake*) ) -p1 -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) ) -p2 -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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



More information about the gnucash-changes mailing list