Update dependencies.

Includes moving berkeleydb and pybsddb over from gtk-osx.

mac/gramps.bundle

@@ -13,7 +13,7 @@
 
   <plist>${project}/Info.plist</plist>
   <!-- Build gramps-launcher with:
-          gcc -L$PREFIX/lib `python-config -\-cflags -\-ldflags` \
+          gcc -L$PREFIX/lib `python-config -\-cflags -\-ldflags -\-embed` \
               -o $PREFIX/bin/gramps-launcher \
 	      path/to/gtk-mac-bundler/examples/python-launcher.c
        with the obvious substitution.
@@ -41,19 +41,15 @@
   </binary>
 
   <binary recurse="True">
-    ${prefix}/lib/python3.8/*.so
+    ${prefix}/lib/python3.9/*.so
   </binary>
 
   <binary>
     ${prefix}/lib/librsvg-2.2.dylib
   </binary>
 
-  <!--binary>
-    ${prefix}/lib/libwebkit-1.0.2.dylib
-  </binary-->
-
   <binary>
-    ${prefix}/lib/libgtkmacintegration-gtk3.2.dylib
+    ${prefix}/lib/libgtkmacintegration-gtk3.4.dylib
   </binary>
 
   <binary>
@@ -65,7 +61,7 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/enchant
+    ${prefix}/lib/enchant-2
   </binary>
 
   <binary>
@@ -77,7 +73,7 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/libhunspell-1.6.0.dylib
+    ${prefix}/lib/libhunspell-1.7.0.dylib
   </binary>
 
   <binary>
@@ -148,19 +144,19 @@
   <!-- We have to pull in the python modules, which are mixed python
        and loadable modules.  -->
   <data recurse="True">
-    ${prefix}/lib/python3.8/*.py
+    ${prefix}/lib/python3.9/*.py
   </data>
 
   <data>
-    ${prefix}/lib/python3.8/config-3.8-darwin/
+    ${prefix}/lib/python3.9/config-3.9-darwin/
   </data>
 
   <data>
-    ${prefix}/lib/python3.8/site-packages/gramps/gen/utils/resource-path
+    ${prefix}/lib/python3.9/site-packages/gramps/gen/utils/resource-path
   </data>
 
   <data>
-    ${prefix}/include/python3.8/pyconfig.h
+    ${prefix}/include/python3.9/pyconfig.h
   </data>
 
 
@@ -177,7 +173,7 @@
   </data>
 
   <data recurse="True">
-    ${prefix}/lib/python3.8/site-packages/gramps/*.glade
+    ${prefix}/lib/python3.9/site-packages/gramps/*.glade
   </data>
 
   <data>

mac/gramps.modules

@@ -9,22 +9,12 @@
 	      href="http://pywebkitgtk.googlecode.com/files/"/>
   <repository type="tarball" name="ftp.gnome.org"
 	      href="http://ftp.gnome.org/pub/GNOME/sources/"/>
-  <repository type="tarball" name="pyxdg"
-	      href="http://www.gnome.org/~fpeters/pyxdg/"/>
-  <repository type="tarball" name="xdg-utils"
-	      href="http://portland.freedesktop.org/download/"/>
-  <repository type="svn" name="gramps-addons"
-	      href="https://svn.code.sf.net/p/gramps-addons/code/"/>
   <repository type="tarball" name="oracle"
 	      href="http://download.oracle.com/"/>
   <repository type="tarball" name="pymodules"
 	      href="https://pypi.python.org/packages/"/>
-  <repository type="tarball" name="stowers"
-	     href="http://www.johnstowers.co.nz/files/"/>
   <repository type="git" name="github" href="git://github.com/"/>
   <repository type="tarball" name="github-tarball" href="https://github.com/"/>
-  <repository type="tarball" name="graphviz"
-              href="https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/"/>
   <repository type="tarball" name="exiv2.org"
 	      href="http://www.exiv2.org/releases/"/>
   <repository type="tarball" name="pythonware"
@@ -81,35 +71,10 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </distutils>
 
-  <autotools id="pyWebKitGtk" >
+  <meson id="json-glib" mesonargs="-Dgtk_doc=disabled -Dman=false -Dtests=false">
-    <branch module="pywebkitgtk-1.1.7.tar.bz2" version="1.1.7"
+    <branch module="json-glib/1.6/json-glib-1.6.2.tar.xz"
-	    repo="pywebkitgtk"/>
+            version="1.6.2" repo="ftp.gnome.org"
-    <dependencies>
+            hash="sha256:a33d66c6d038bda46b910c6c6d59c4e15db014e363dc997a0414c2e07d134f24"/>
-      <dep package="WebKit"/>
-      <dep package="sqlite"/>
-    </dependencies>
-  </autotools>
-
-
-  <distutils id="pyenchant">
-    <branch repo="pymodules" module="73/73/49f95fe636ab3deed0ef1e3b9087902413bcdf74ec00298c3059e660cfbb/pyenchant-1.6.8.tar.gz"
-	    version="1.6.1"/>
-  </distutils>
-
-  <distutils id="pyxdg">
-    <branch repo="pyxdg" module="pyxdg-0.17.tar.gz" version="0.17"
-            hash="sha256:fbc87711922b2dd6ceb23ee041f1f96da9b7dbb6971df03a3081b439def069ce"
-            md5sum="a086de99cc536095684d87f15594e4db" size="37372"/>
-  </distutils>
-
-  <autotools id="xdg-utils">
-    <branch module="xdg-utils-1.0.2.tgz" version="1.0.2" repo="xdg-utils"/>
-  </autotools>
-
-  <meson id="json-glib">
-    <branch module="json-glib/1.4/json-glib-1.4.4.tar.xz"
-            version="1.4.4" repo="ftp.gnome.org"
-            hash="sha256:720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47"/>
     <dependencies>
       <dep package="gobject-introspection"/>
     </dependencies>
@@ -128,46 +93,33 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   <autotools id="osmgpsmap" skip-autogen="never"
 	     autogenargs="--disable-gtk-doc-html"
 	     supports-non-srcdir-builds="no">
-    <branch module="nzjrs/osm-gps-map" revision="1.1.0" repo="github"/>
+    <branch module="nzjrs/osm-gps-map" revision="1.2.0" repo="github"/>
     <dependencies>
       <dep package="libsoup"/>
-    </dependencies>
+      <dep package="gtk+-3.0"/>
-    <after>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-gtk3.14"/>
-    </after>
-  </autotools>
-
-  <autotools id="graphviz" autogen-sh="configure"
-	     autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml --disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --with-pangocairo">
-    <branch module="graphviz.tar.gz" version="2.40.1"
-            repo="graphviz" checkoutdir="graphviz-2.40.1"/>
-    <dependencies>
-      <dep package="pango"/>
-      <dep package="meta-gtk-osx-freetype"/>
-      <dep package="librsvg"/>
     </dependencies>
   </autotools>
 
   <cmake id="exiv2" cmakeargs="-DEXIV2_ENABLE_PNG=ON">
-    <branch module="exiv2-0.27.0a-Source.tar.gz" repo="exiv2.org"
+    <branch module="exiv2-0.27.3-Source.tar.gz" repo="exiv2.org"
-            checkoutdir="exiv2-0.27.0-Source" version="0.27.0"/>
+            checkoutdir="exiv2-0.27.3-Source" version="0.27.3"
+            hash="sha256:a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778"/>
   </cmake>
 
   <meson id="gexiv2" mesonargs="-Dvapi=false">
-    <branch module="gexiv2/0.12/gexiv2-0.12.0.tar.xz"
+    <branch module="gexiv2/0.12/gexiv2-0.12.2.tar.xz"
-            repo="ftp.gnome.org" version="0.12.0"
+            repo="ftp.gnome.org" version="0.12.2"
-            hash="sha256:58f539b0386f36300b76f3afea3a508de4914b27e78f58ee4d142486a42f926a">
+            hash="sha256:2322b552aca330eef79724a699c51a302345d5e074738578b398b7f2ff97944c">
     </branch>
     <dependencies>
       <dep package="exiv2"/>
     </dependencies>
   </meson>
-
+https://files.pythonhosted.org/packages/
-  <distutils id="pil">
+  <distutils id="pillow">
-    <branch module="93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7/Pillow-4.1.1.tar.gz" version="4.1.1"
+    <branch module="21/23/af6bac2a601be6670064a817273d4190b79df6f74d8012926a39bc7aa77f/Pillow-8.2.0.tar.gz" version="8.2.0"
 	    repo="pymodules"
-	    hash="md5:f2565954955c8d10f3b4f1f72f852bf7">
+	    hash="sha256:a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1">
     </branch>
     <dependencies>
       <!--dep package="setuptools"/-->
@@ -175,13 +127,58 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </distutils>
 
  <distutils id='pyicu'>
-    <branch version='2.5' repo='pymodules'
+    <branch version='2.7.1' repo='pymodules'
-	    module='5a/99/c48c816095208bf3f4936ff67e571621fbddef461303a35a076f234e31f6/PyICU-2.5.tar.gz'/>
+            module='76/5d/6318f86c81665ddccc4a14408525297aec0c73a71a14994a3cbf822aef2a/PyICU-2.7.1.tar.gz'
+            hash="sha256:23191ec5cae0cf6172f84d3d06010d5c348b8d4d5428edbed4f817beecff2642"/>
     <dependencies>
       <dep package='icu'/>
     </dependencies>
+ </distutils>
+
+ <!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so that the nice prepended to the command doesn't eat the cd. -->
+  <autotools id="berkeleydb" autogen-sh="configure"
+	     supports-non-srcdir-builds="no"  makeargs="-C build_unix"
+	     autogen-template="cd .;cd build_unix; ../dist/%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s"
+	     makeinstallargs="-C build_unix install">
+
+    <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
+        repo="oracle"
+            hash="sha256:12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef" >
+      <patch file="https://raw.githubusercontent.com/gramps-project/gramps/master/mac/patches/berkeleydb-4.8-atomic.patch" strip='1'/>
+    </branch>
+  </autotools>
+
+  <!-- For out-of-source-tree builds (i.e., builddir is defined either
+       in .jhbuildrc-custom or passed as an option on the
+       command-line, the normal berkeleydb module will build in its
+       srcdir/build_unix directory. If you want to build it in the
+       build directory with most of the other modules, use this module
+       instead. -->
+  <autotools id="berkeleydb-nonsrctree" autogen-sh="configure"
+         autogen-template="%(srcdir)s/dist/%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s" >
+
+    <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
+            repo="oracle"
+            hash="sha256:12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef">
+      <patch file="https://raw.githubusercontent.com/gramps-project/gramps/master/mac/patches/berkeleydb-4.8-atomic.patch" strip='1'/>
+    </branch>
+  </autotools>
+
+
+  <distutils id="pybsddb">
+    <branch repo="pymodules" version="6.2.9"
+            module="f0/24/92034482656945fc6ceb10551222b43a0ff8d0c87e15839120487820067e/bsddb3-6.2.9.tar.gz"
+            hash="sha256:70d05ec8dc568f42e70fc919a442e0daadc2a905a1cfb7ca77f549d49d6e7801" />
+    <dependencies>
+      <dep package="python3"/>
+    </dependencies>
+    <after>
+      <dep package="berkeleydb"/>
+      <dep package="berkeleydb-nonsrctree"/>
+    </after>
   </distutils>
 
+
   <metamodule id="meta-gramps-modules">
     <dependencies>
       <dep package="python3"/>
@@ -202,7 +199,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
       <dep package="pygobject3"/>
       <dep package='pyicu'/>
       <dep package='pybsddb'/>
-      <dep package="pil"/>
+      <dep package="pillow"/>
     </dependencies>
   </metamodule>
 

mac/patches/berkeleydb-4.8-atomic.patch

@@ -0,0 +1,40 @@
+--- a/dist/configure	2010-04-12 13:25:23.000000000 -0700
++++ b/dist/configure	2021-04-11 11:27:32.000000000 -0700
+@@ -19158,7 +19158,7 @@
+ 	# x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++#include <stdlib.h>
+ int
+ main ()
+ {
+@@ -20197,7 +20197,7 @@
+ if test "$db_cv_atomic" = no; then
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++#include <stdlib.h>
+ int
+ main ()
+ {
+--- a/dbinc/atomic.h	2013-03-12 14:07:22.000000000 -0400
++++ b/dbinc/atomic.h	2013-03-12 14:06:35.000000000 -0400
+@@ -144,7 +144,7 @@
+ #define	atomic_inc(env, p)	__atomic_inc(p)
+ #define	atomic_dec(env, p)	__atomic_dec(p)
+ #define	atomic_compare_exchange(env, p, o, n)	\
+-	__atomic_compare_exchange((p), (o), (n))
++	__atomic_compare_exchange_db((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ 	int	temp;
+@@ -176,7 +176,7 @@
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int __atomic_compare_exchange_db(
+ 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ 	atomic_value_t was;