gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/749648f5 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/012b37aa (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/18a3c478 (commit)



commit 749648f5629b7c43424a053b596bf29341faca44
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Nov 9 14:25:26 2017 -0800

    Update gwen and aquamaniac git URL.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index adfabfe..e0d2aa7 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -22,7 +22,7 @@
   <repository type="svn" name="svn.gnucash.org"
 	      href="http://svn.gnucash.org/repo/"/>
   <repository type="git" name="aquamaniac"
-	      href="http://git.aqbanking.de/git/"/>
+	      href="https://git.aquamaniac.de/git/"/>
   <repository type="git" name="github"
 	      href="git://github.com/"/>
   <repository type="tarball" name="openssl"
@@ -46,9 +46,8 @@
 
   <autotools id="gwenhywfar" autogen-sh="configure"
 	     autogenargs="--with-guis='' --enable-local-install">
-    <branch module="gnucash/Dependencies/gwenhywfar-4.17.0.tar.gz"
-            version="4.17.0"
-	    repo="sourceforge">
+    <branch module="gnucash/Dependencies/gwenhywfar-4.18.0.tar.gz"
+            version="4.18.0" repo="sourceforge">
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-include-file.patch" strip='1'/>
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
     </branch>

commit 012b37aac6d61553c9448d0a71bf46e0b5615cb6
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Nov 9 14:19:54 2017 -0800

    Bug 790142 - Path set incorrectly on MacOS

diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
index 8f109a1..a4c259f 100755
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ b/gnucash-bundler/gnucash-unstable.launcher
@@ -56,7 +56,7 @@ if /bin/expr "x$1" : "x-psn_.*" > /dev/null; then
 fi
 
 export RESPFX="${bundle_res}"
-PATH="${RESPFX}"/bin:/bin/usr/bin
+PATH="${RESPFX}"/bin:/bin:/usr/bin
 export PATH
 
 GUILE_WARN_DEPRECATED="no"



Summary of changes:
 gnucash-bundler/gnucash-unstable.launcher | 2 +-
 modulesets/gnucash.modules                | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)