gnucash-on-windows master: Use mingw swig rather than msys swig

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/56bb8402 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/ad97c2d9 (commit)



commit 56bb84025ea4bd89252e0559493b0529adbb923b
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Oct 2 10:14:58 2020 +0200

    Use mingw swig rather than msys swig
    
    The mingw variant returns the result we need for -swiglib.
    And with that our hack can now be removed.

diff --git a/gnucash.modules b/gnucash.modules
index ddf26f5..1616419 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -273,7 +273,7 @@
   </cmake>
 
  <cmake id="gnucash"
-        cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest">
+        cmakeargs="-DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest">
    <branch module="project/gnucash/gnucash%20%28stable%29/4.2/gnucash-4.2.tar.bz2"
 	   repo="sourceforge" version="4.2"/>
     <dependencies>
@@ -290,7 +290,7 @@
  </cmake>
 
  <cmake id="gnucash-unstable"
-        cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/">
+        cmakeargs="-DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/">
    <branch module="project/gnucash/gnucash%20%28unstable%29/3.906/gnucash-3.906.tar.bz2"
 	   repo="sourceforge" version="3.906"/>
     <dependencies>
@@ -307,7 +307,7 @@
  </cmake>
 
  <cmake id="gnucash-git"
-        cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/ -DCMAKE_BUILD_TYPE=Debug">
+        cmakeargs="-DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/ -DCMAKE_BUILD_TYPE=Debug">
    <branch repo="github" module="Gnucash/gnucash.git" revision="master"
 	   checkoutdir="gnucash-git"/>
     <dependencies>
diff --git a/patches/FindSWIG.patch b/patches/FindSWIG.patch
deleted file mode 100644
index cf018c9..0000000
--- a/patches/FindSWIG.patch
+++ /dev/null
@@ -1,12 +0,0 @@
- diff -u /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.14/Modules/FindSWIG.cmake
---- 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()
-     string(REGEX REPLACE "[\n\r]+" ";" SWIG_swiglib_output ${SWIG_swiglib_output})
--    find_path(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output} NO_CMAKE_FIND_ROOT_PATH)
-+    find_path(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output})
-     if(SWIG_DIR)
-       set(SWIG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseSWIG.cmake)
-       execute_process(COMMAND ${SWIG_EXECUTABLE} -version
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 787d9db..948c87a 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -235,9 +235,9 @@ bash-command -command "pacman -Syyuu --noconfirm"
 
 # Set up aliases for the parts of msys-devtools and mingw-w64-toolchain that
 # we need:
-$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config python2 rsync2 sed swig texinfo texinfo-tex wget xmlto git texinfo"
+$devel = "asciidoc autoconf autoconf2.13 autogen automake-wrapper bison diffstat diffutils dos2unix file flex gawk gettext gettext-devel gperf grep groff intltool libtool m4 make man-db pacman pactoys-git patch patchutils perl pkg-config python2 rsync2 sed texinfo texinfo-tex wget xmlto git texinfo"
 
-$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config tools-git winpthreads-git"
+$toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git libtool libwinpthread-git make pkg-config swig tools-git winpthreads-git"
 
 
 # Install the system and toolchain:
@@ -336,10 +336,6 @@ if (!(test-path -path "$target_dir\\msys2\\usr\\bin\\jhbuild")) {
     [IO.File]::WriteAllLines("$target_dir\\msys2\\usr\\bin\\jhbuild", $jhbuild)
 }
 
-if (!(get-childitem -path $target_dir\\msys2\\mingw32\\share -recurse -include FindSWIG.cmake.orig -name)) {
-    bash-command -command "/usr/bin/patch -b -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"} |
  %{$_ -replace "@-DOWNLOAD_DIR-@", "$download_unix"} |



Summary of changes:
 gnucash.modules        |  6 +++---
 patches/FindSWIG.patch | 12 ------------
 setup-mingw64.ps1      |  8 ++------
 3 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 patches/FindSWIG.patch