gnucash-on-windows master: Bug 797257 - fragile windows patch FindSWIG.patch; ...

[John Ralls]

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



commit 520cec8583848eb54763ee5d3bc4ae2b4afaa709
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun May 26 09:24:28 2019 -0700

    Bug 797257 - fragile windows patch FindSWIG.patch;...
    
    recommend remove version string dependency.

diff --git a/patches/FindSWIG.patch b/patches/FindSWIG.patch
index fb8f236..cf018c9 100644
--- a/patches/FindSWIG.patch
+++ b/patches/FindSWIG.patch
@@ -1,6 +1,6 @@
  diff -u /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake
---- /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake    2017-08-10 06:36:32.000000000 -0700
-+++ /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake     2017-09-05 10:34:59.692229400 -0700
+--- a/FindSWIG.cmake    2017-08-10 06:36:32.000000000 -0700
++++ b/FindSWIG.cmake     2017-09-05 10:34:59.692229400 -0700
 @@ -41,7 +41,7 @@
      endif()
    else()
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 512004d..ea7fd5a 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/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.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"
 
 $jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
  %{$_ -replace "@-BASE_DIR-@", "$target_unix"} |



Summary of changes:
 patches/FindSWIG.patch | 4 ++--
 setup-mingw64.ps1      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)