gnucash-on-windows master: Change gwenhywfar environment to specify PKG_CONFIG instead of CFLAGS.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/62c32876 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/d80fbecb (commit)



commit 62c328760349f08cc0fb64ce50a531b997215f18
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 11 14:45:48 2019 -0700

    Change gwenhywfar environment to specify PKG_CONFIG instead of CFLAGS.
    
    And re-enable Gwenhywfar 4.20.1.
    Gwenhywfar 4.20.1 tries to check pkg-config for gtk3 but can't find
    pkg-config without help. Once it can find pkg-config it doesn't need
    to have the gtk3 paths added to CFLAGS and CXXFLAGS.
    
    Also patch gwenhywfar to not delete the gwenhywfar4 directory during
    clean. The links are created by configure so should be deleted during
    distclean; removing them in clean breaks subsequent builds until the
    build directory is reconfigured.

diff --git a/gnucash.modules b/gnucash.modules
index cff5708..c6f0857 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -146,7 +146,8 @@
 
   <autotools id="gwenhywfar" autogen-sh="configure"
 	     autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
-    <branch module="10/gwenhywfar-4.20.0.tar.gz" version="4.20.0" repo="aqbanking" checkoutdir="gwenhywfar-4.20.0">
+    <branch module="10/gwenhywfar-4.20.1.tar.gz" version="4.20.1" repo="aqbanking" checkoutdir="gwenhywfar-4.20.1">
+      <patch file="gwenhywfar-4.20.1-clean-targets.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="gcrypt"/>
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 32a9a92..4d86544 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -76,13 +76,11 @@ else:
     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")
 append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
 append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
 module_makeargs["aqbanking"]="-j 1"
 
 module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
 module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
-module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}
+module_extra_env["gwenhywfar"]={'PKG_CONFIG': os.path.join('/', _arch, 'bin', 'pkg-config')}
 
diff --git a/patches/gwenhywfar-4.20.1-clean-targets.patch b/patches/gwenhywfar-4.20.1-clean-targets.patch
new file mode 100644
index 0000000..a490b62
--- /dev/null
+++ b/patches/gwenhywfar-4.20.1-clean-targets.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2019-08-08 15:42:36.000000000 -0700
++++ b/Makefile.in	2019-08-12 14:57:37.642988300 -0700
+@@ -1212,7 +1212,7 @@
+ clean-local: clean-local-check
+ .PHONY: clean-local
+ clean-local-check:
+-	rm -rf apidoc gwenhywfar4
++	rm -rf apidoc
+ 
+ listdoc.h: $(top_builddir)/admin/mklistdoc
+ 	admin/mklistdoc -v -I $(top_srcdir)/src/base `find "$(top_builddir)/gwenhywfar4/gwenhywfar" -name "*.h" | LC_ALL=C sort` >listdoc.h



Summary of changes:
 gnucash.modules                               |  3 ++-
 jhbuildrc.in                                  |  4 +---
 patches/gwenhywfar-4.20.1-clean-targets.patch | 11 +++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 patches/gwenhywfar-4.20.1-clean-targets.patch