From b6bc66fbd927b5d67969c0e95b540d1522664e5a Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Thu, 11 Jan 2018 09:46:08 -0800
Subject: [PATCH] Upgrade Gwenhywfar to latest release and don't build
 libgwengui-gtk2.

---
 gnucash.modules | 6 +++---
 jhbuildrc.in    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnucash.modules b/gnucash.modules
index 81e345e0..9ac4db6f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -142,8 +142,8 @@
   </autotools>
 
   <autotools id="gwenhywfar" autogen-sh="configure"
-	     autogenargs="--with-guis=gtk2 --enable-local-install --disable-binreloc --disable-ssl">
-    <branch module="gnucash/Dependencies/gwenhywfar-4.17.0.tar.gz" version="4.17.0"
+	     autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
+    <branch module="gnucash/Dependencies/gwenhywfar-4.18.0.tar.gz" version="4.18.0"
 	    repo="sourceforge">
     </branch>
     <dependencies>
@@ -153,7 +153,7 @@
   </autotools>
 
   <autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
-	     autogenargs="--with-guis=gtk2 --enable-local-install --disable-binreloc --disable-ssl">
+	     autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
     <branch module="gwenhywfar" repo="aquamaniac"/>
     <dependencies>
       <dep package="gcrypt"/>
diff --git a/jhbuildrc.in b/jhbuildrc.in
index f7973aad..1f149bfb 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -78,6 +78,5 @@ module_makeargs["aqbanking"]="-j 1"
 module_makeargs["gnucash"]="-j 1"
 module_makeargs["gnucash-git"]="-j 1"
 
-module_extra_env["gwenhywfar"]={'CPPFLAGS':_popen('pkg-config --cflags gtk+-2.0'), 'LDFLAGS':_popen('pkg-config --libs gtk+-2.0')}
 module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join('/mingw32', 'share', 'aclocal')}