gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/d1cb94de (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/37acf6b6 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/577bf236 (commit)



commit d1cb94de07a3a76473cf6e17cde67077d15daf8b
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Nov 28 15:39:21 2020 -0800

    General update to jhbuildrc-custom for current dependencies.

diff --git a/jhbuildrc-custom b/jhbuildrc-custom
index d0a402c..b32e413 100644
--- a/jhbuildrc-custom
+++ b/jhbuildrc-custom
@@ -1,52 +1,34 @@
 # -*- mode: python -*-
 
-#Uncomment this if you have a completed build and only want to rebuild
-#updated modules instead of everything:
-#
-#build_policy = "updated-deps"
-
-#Select one of these, or use a different one: Do keep the directories
-#separate for stable and unstable as they have different
-#dependencies. 
-prefix = os.path.join(os.environ["HOME"], "gnucash-stable")
-#prefix = os.path.join(os.environ["HOME"], "gnucash-unstable")
-buildroot = os.path.join(prefix, 'build')
-checkoutroot = os.path.join(prefix, 'src')
-
-#Select which modules to build. The only difference is which gnucash
-#module (and all of the dependencies, see above) get built. "
-modules = ["python3", "meta-gtk-osx-bootstrap", "gnucash"]
-#modules = ["python3", "meta-gtk-osx-bootstrap", "gnucash-unstable"]
-#modules = ["python3", "meta-gtk-osx-bootstrap", "gnucash-git"]
-#branches["gnucash-git"] = (None, "maint")
-
-# This will set up the build for your system. The result will run on
-# the same or newer versionss of MacOS for the same archechture.
-setup_sdk()
-
-# To build a GnuCash able to run on older systems you can specify
-# minimum version, SDK, and architecture. Note that only
-# MacOSX10.9.sdk and later can build for earlier MacOS versions, and
-# that all Macs running 10.7 and later are 64-bit. Finally note that
-# GnuCash 2.6.99 and later requuire MacOS X 10.9 or later and 3.900
-# and later require MacOS 10.13 or later. If you need to build with an
-# older SDK see
-# https://wiki.gnome.org/Projects/GTK+/OSX/Building#Building_for_Older_Versions_of_Mac_OS_X
-
-#This will build a 32-bit version for 10.9 and later:
-#setup_sdk("10.9", ["i386"])
-
+prefix = os.environ['PREFIX']
+checkoutroot = os.path.join(os.environ['HOME'], 'gnucash', 'src')
+buildroot = os.path.join(os.environ['HOME'], 'gnucash', 'build')
 moduleset = "https://github.com/gnucash/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
 
-skip.append('icu') # Webkit1 requires icu55, Harfbuzz depends on icu but works fine with icu55.
-append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
-
-append_autogenargs("scrollkeeper", "--with-xml-catalog=" + os.path.join(prefix, "etc/xml/catalog"))
+_modules_deps = ['python3', 'meta-gtk-osx-bootstrap', 'meta-gtk-osx-gtk3',
+                'meta-gtk-osx-python-gtk3', 'openSP', 'libofx', 'aqbanking',
+                'libdbi-drivers', 'shared-mime-info', 'iso-codes', 'guile22',
+                'swig', 'boost', 'googletest', 'webkit2gtk3']
+_modules_stable = ['python3', 'meta-gtk-osx-bootstrap',
+                  'gnucash', 'gnucash-docs']
+_modules_stable = ['python3', 'meta-gtk-osx-bootstrap',
+                  'gnucash', 'gnucash-docs']
+_modules_git = ['python3', 'meta-gtk-osx-bootstrap',
+               'gnucash-git', 'gnucash-docs-git']
+
+#set modules to the _modules variable above corresponding you what you need.
+modules = _modules_stable
+
+_pypathenv = {'PYTHON':os.path.join(prefix, 'bin', 'python3')}
+module_extra_env['pycairo'] = _pypathenv
+module_extra_env['pygobject3'] = _pypathenv
+
+module_extra_env['icu'] = {'CXXFLAGS':os.environ['CXXFLAGS'] + ' -std=c++17'}
+module_extra_env['boost'] = {'CXXFLAGS':os.environ['CXXFLAGS'] + ' -std=c++17'}
+module_makeargs["aqbanking"]="-j1"
+os.environ['CC_FOR_BUILD'] = os.environ['CC']
+os.environ['CPP_FOR_BUILD'] = os.environ['CC']
+os.environ['CFLAGS_FOR_BUILD'] = os.environ['CFLAGS']
+module_cmakeargs['boost'] = '-DCMAKE_CXX_FLAGS="' + os.environ['CXXFLAGS'] + ' -std=c++17"'
 
-append_autogenargs("OpenSP", "--enable-shared") #To override the global --disable-shared
-append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
-append_autogenargs("libiconv", "--with-libintl-prefix=" + prefix)
-
-#Tell fontconfig where to find fonts and to not set a cache directory in prefix:
-append_autogenargs("fontconfig", "--with-default-fonts=/Library/Fonts --with-cache-dir=home")
-module_makecheck["gmp"] = True
+setup_sdk()

commit 37acf6b6b6afa2def892548a066cb635a754a698
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Nov 28 15:38:02 2020 -0800

    Add WebKit2Gtk3 external process executables and IPC loadable module.

diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index a5039d9..8063c3f 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -101,6 +101,14 @@
     ${prefix}/lib/dbd
   </binary>
 
+  <binary dest="${bundle}/Contents/MacOS">
+    ${prefix}/libexec/webkit2gtk-4.0/*
+  </binary>
+
+  <binary loadable="True">
+    ${prefix}/lib/webkit2gtk-4.0
+  </binary>
+  
 <!-- Data to copy in, usually Glade/UI files, images, sounds files
        etc. The destination inside the bundle can be specified if the
        files should end up at a different location, by using the



Summary of changes:
 gnucash-bundler/gnucash.bundle |  8 +++++
 jhbuildrc-custom               | 76 ++++++++++++++++--------------------------
 2 files changed, 37 insertions(+), 47 deletions(-)