gnucash-on-osx master: Change gnucash-git dependencies for gtk3.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/cc0ad1e6 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/fb8ee915 (commit)



commit cc0ad1e6b34c373cc60b9fc29659553a5f5957f3
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jul 31 07:27:07 2017 +0100

    Change gnucash-git dependencies for gtk3.
    
    Note that this build will not support maint because the webkit build is wrong.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a1be51f..88deb2d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -53,6 +53,7 @@
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
     </branch>
     <dependencies>
+      <dep package="meta-gtk-osx-core"/>
       <dep package="libgcrypt"/>
       <dep package="gnutls"/>
     </dependencies>
@@ -62,6 +63,7 @@
 	     autogenargs="--with-guis=gtk2 --enable-local-install">
     <branch module="gwenhywfar" repo="aquamaniac"/>
     <dependencies>
+      <dep package="meta-gtk-osx-core"/>
       <dep package="libgcrypt"/>
       <dep package="gnutls"/>
     </dependencies>
@@ -260,11 +262,10 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
    <branch repo="github" module="Gnucash/gnucash.git" revision="master"
 	   checkoutdir="gnucash-git"/>
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="meta-gtk-osx-python"/>
+      <dep package="meta-gtk-osx-python-gtk3"/>
+      <dep package="meta-gtk-osx-webkit-gtk3"/>
       <dep package="libofx"/>
       <dep package="aqbanking"/>
-      <dep package="libgnomecanvas"/>
       <dep package="libdbi-drivers"/>
       <dep package="shared-mime-info"/>
       <dep package="iso-codes"/>
@@ -273,11 +274,6 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
       <dep package="boost"/>
       <dep package="googletest"/>
     </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-webkit1.6"/>
-      <dep package="meta-gtk-osx-webkit"/>
-    </after>
-
  </cmake>
 
   <autotools id="gnucash-docs-git" autogenargs="--disable-scrollkeeper"
@@ -336,7 +332,7 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
   <metamodule id="meta-gnucash-git">
     <dependencies>
       <dep package="gnucash-git"/>
-      <dep package="meta-gtk-osx-webkit"/>
+      <dep package="meta-gtk-osx-webkit-gtk3"/>
     </dependencies>
   </metamodule>
   <metamodule id="meta-gnucash-git-Leopard">



Summary of changes:
 modulesets/gnucash.modules | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)