gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Mon Sep 17 17:48:32 EDT 2018


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/4ba69dcd (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/bc708c6b (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/da0a8ff1 (commit)



commit 4ba69dcd96f307cd54f06c9d2a1310c8ae419116
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Sep 17 14:48:05 2018 -0700

    Update the FindSWIG patch to match the current version of CMake installed by MSys2.

diff --git a/patches/FindSWIG.patch b/patches/FindSWIG.patch
index 4278502..2ba7d77 100644
--- a/patches/FindSWIG.patch
+++ b/patches/FindSWIG.patch
@@ -1,6 +1,6 @@
  diff -u /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake~ /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake
---- /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake~    2017-08-10 06:36:32.000000000 -0700
-+++ /mingw32/share/cmake-3.10/Modules/FindSWIG.cmake     2017-09-05 10:34:59.692229400 -0700
+--- /mingw32/share/cmake-3.12/Modules/FindSWIG.cmake    2017-08-10 06:36:32.000000000 -0700
++++ /mingw32/share/cmake-3.12/Modules/FindSWIG.cmake     2017-09-05 10:34:59.692229400 -0700
 @@ -41,7 +41,7 @@
      endif()
    else()

commit bc708c6b3d2b02900e8cd83672fb976b98ac407b
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Sep 17 14:47:26 2018 -0700

    Build the branch for gnucash-docs-git.

diff --git a/jhbuildrc.in b/jhbuildrc.in
index 27a84cf..033c8cc 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -74,6 +74,7 @@ if _branch == 'releases':
 else:
     modules = ["meta-gnucash-git"]
     branches['gnucash-git'] = (None, _branch)
+    branches['gnucash-docs-git'] = (None, _branch)
 
 _gtk_cflags = _popen("pkg-config --cflags gtk+-3.0")
 _gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")



Summary of changes:
 jhbuildrc.in           | 1 +
 patches/FindSWIG.patch | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)



More information about the gnucash-changes mailing list