gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/d5d02b9b (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/51a71ebc (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/a8308540 (commit)



commit d5d02b9bca1af84440a5a4688b666d2e7c786a2e
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Nov 7 11:09:27 2015 -0800

    Change patch file URLs to match Github's new content-service policy.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3e35a0b..327b391 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -47,7 +47,7 @@
     <branch module="gnucash/Dependencies/gwenhywfar-4.13.1.tar.gz" version="4.13.1"
 	    repo="sourceforge">
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-include-file.patch" strip='1'/>
-      <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
+      <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
     </branch>
     <dependencies>
       <dep package="libgcrypt"/>
@@ -111,7 +111,7 @@
 	     autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls">
     <branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
 	    version='1.5.2'>
-      <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/OpenSP-AC_CONFIG_HEADERS.patch" strip='0'/>
+      <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/OpenSP-AC_CONFIG_HEADERS.patch" strip='0'/>
     </branch>
   </autotools>
 
@@ -144,7 +144,7 @@
 	    module="slib"/> -->
     <branch repo="csail" module="scm/slib-3b4.zip" version="3b3"
 	    checkoutdir="slib">
-      <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/slib-install.patch"/>
+      <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/slib-install.patch"/>
     </branch>
     <dependencies>
       <dep package="guile"/>
@@ -154,7 +154,7 @@
   <cmake id="mysql">
     <branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
 	    version="6.0.2" >
-      <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/libmysql.patch"/>
+      <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libmysql.patch"/>
     </branch>
     <dependencies>
       <dep package="cmake"/>
@@ -164,7 +164,7 @@
   <autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
     <branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
 	    version="0.8.4">
-      <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/libdbi-fix-cflags.patch" strip="1"/>
+      <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libdbi-fix-cflags.patch" strip="1"/>
     </branch>
   </autotools>
 
@@ -172,7 +172,7 @@
 	     autogenargs='--with-sqlite3 --disable-docs --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib" '>
     <branch repo="sourceforge" version="0.8.3-1"
 	    module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
-      <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/dbi-drv.patch" strip="1"/>
+      <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/dbi-drv.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="libdbi"/>
@@ -197,7 +197,7 @@
   <autotools id="goffice" autogen-sh="configure">
    <branch module="goffice/0.8/goffice-0.8.17.tar.xz" version="0.8.17"
 	   hash="sha256:165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15">
-     <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/goffice-gsize.patch" strip="1"/>
+     <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/goffice-gsize.patch" strip="1"/>
    </branch>
     <dependencies>
       <dep package="gtk+"/>

commit 51a71ebcefc3bcf2f039cb019298f0b1972592a7
Author: Rob.Gowin <robgowin at gmail.com>
Date:   Fri Nov 6 19:27:44 2015 -0600

    Add patch to gwenhywfar that changes include file so that _NSGetExecutablePath is defined
    
    As mentioned at https://mail.gnome.org/archives/gtk-osx-users-list/2015-April/msg00001.html.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2d15eb3..3e35a0b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -46,6 +46,7 @@
 	     autogenargs="--with-guis=gtk2 --enable-local-install">
     <branch module="gnucash/Dependencies/gwenhywfar-4.13.1.tar.gz" version="4.13.1"
 	    repo="sourceforge">
+      <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-include-file.patch" strip='1'/>
       <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
     </branch>
     <dependencies>
diff --git a/patches/gwen-include-file.patch b/patches/gwen-include-file.patch
new file mode 100644
index 0000000..5709938
--- /dev/null
+++ b/patches/gwen-include-file.patch
@@ -0,0 +1,11 @@
+--- gwenhywfar-4.13.1.orig/src/os/posix/directory.c	2014-10-12 08:12:22.000000000 -0500
++++ gwenhywfar-4.13.1/src/os/posix/directory.c	2015-11-06 15:40:36.000000000 -0600
+@@ -28,7 +28,7 @@
+ 
+ #include "directory_p.h"
+ #if defined(OS_DARWIN) && defined(ENABLE_LOCAL_INSTALL)
+-#  include <CoreFoundation/CFBundle.h>
++#  include <mach-o/dyld.h>
+ #  include <sys/param.h>
+ #else
+ # include "binreloc.h"



Summary of changes:
 modulesets/gnucash.modules      | 15 ++++++++-------
 patches/gwen-include-file.patch | 11 +++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 patches/gwen-include-file.patch