Update Gramps & dependencies for 5.1.6 release.

ChangeLog

@@ -1,192 +1,174 @@
-2022-02-05  Nick Hall <nick-h@gramps-project.org>
+2023-06-29  Nick Hall <nick-h@gramps-project.org>
 
-	* .travis.yml: Remove Travis CI configuration
+	* docs/conf.py, gramps/gen/const.py: Update copyright date
 
-2022-02-05  Nick Hall <nick-h@gramps-project.org>
+2023-05-13  SNoiraud <Serge.Noiraud@free.fr>
 
-	* README.md: Fix badges in README file
+	* gramps/plugins/webreport/media.py: Narrative web: problem with
+	small pictures.  Fixes #012884
 
-2022-02-05  Nick Hall <nick-h@gramps-project.org>
+2023-05-09  SNoiraud <Serge.Noiraud@free.fr>
 
-	* gramps/gen/const.py: Update copyright date
+	* gramps/plugins/view/familyview.py: Implement the "<CTRL>J" for the
+	family view Fixes #012882
 
-2021-09-18  SNoiraud <Serge.Noiraud@free.fr>
+2022-07-11  Jon Schewe <jpschewe@mtu.net>
 
-	* gramps/gui/views/pageview.py, gramps/gui/widgets/grampletbar.py: 
+	* gramps/plugins/webreport/basepage.py: Avoid application crash on
-	Strange behavior for the scrollbar in the bottombar Fixes #012438
+	invalid user input If the user inputs an invalid date this change keeps the application
+	from crashing when such a date is found. The invalid date
+	information is reported to the user in the log.  Fixes #12658.
 
-2022-02-04  romjerome <romjerome@yahoo.fr>
+2023-05-13  Nick Hall <nick-h@gramps-project.org>
 
-	* data/grampsxml.dtd, data/grampsxml.rng: Fix place object element
+	* gramps/plugins/export/exportgedcom.py: Fix export where private
-	order in DTD and RNG schemas Element placeobj content does not follow the DTD and RNG, expecting
+	citations are excluded
-	(ptitle? , pname+) Fixes #12500
 
-2022-01-31  Krystian Safjan <ksafjan@gmail.com>
+2022-06-01  prculley <paulr2787@gmail.com>
 
-	* po/pl.po: Fixes suggested after review by @stojex
+	* gramps/plugins/tool/eventcmp.py: Fix Event compare tool to display
+	enclosed places properly
 
-2022-01-07  Krystian Safjan <ksafjan@gmail.com>
+2022-06-08  SNoiraud <Serge.Noiraud@free.fr>
 
-	* po/pl.po: Update Polish translation - Consistent usage of "Tag": was "Tag" or "Atrybut", note that   "Attribute" (atrybut) is something different than tag - "Magazyn" (repository) renamed to "Repozytorium" - other fixes and addons
+	* gramps/gui/viewmanager.py: Check that view exists before calling
+	post_create method Avoids 'NoneType' object has no attribute 'post_create' error.  Fixes #12638
 
-2021-09-04  SNoiraud <Serge.Noiraud@free.fr>
+2022-06-15  Jingxuan He <LostBenjamin@users.noreply.github.com>
 
-	* gramps/gui/widgets/grampletpane.py: Solve InterpolationSyntaxError
+	* gramps/plugins/webreport/webcal.py: Fix a wrong operator bug in
-	if "%" in a string The grampletpane module save data in a config file for all the
+	the web calendar report
-	gramplets added in the dashboard.  The python configparser module
-	doesn't like if we have a "%" character in a string.  Fixes #012423
 
-2021-11-06  SNoiraud <Serge.Noiraud@free.fr>
+2022-10-08  Himanshu Gohel <1551217+hgohel@users.noreply.github.com>
 
-	* gramps/plugins/drawreport/calendarreport.py: '<' not supported
+	* gramps/gen/plug/docgen/treedoc.py: Revert "Enclose tree report
-	between 2 instances of IndexMark Fixes #012467
+	image path and file name in braces" Fixes #12437 by reverting commit
+	75921ceaf40f3ced597d99c43794b98f81e49957 due to reports of
+	regression where processing of the generated TeX file fails due to
+	bad path specificiation for image files.  Change was introduced in bug fix for #10495.  Bugs #12437 and #12697 reported the regression and confirmed that
+	reverting the change fixes the regression.
 
-2022-01-29  Nick Hall <nick-h@gramps-project.org>
+2022-10-22  SNoiraud <Serge.Noiraud@free.fr>
 
-	* gramps/gen/filters/rules/test/person_rules_test.py,
+	* gramps/plugins/lib/maps/geography.py: Geography View: Fix number
-	gramps/plugins/test/db_undo_and_signals_test.py: Remove debug
+	of arguments in add_bookmark method add_bookmark() takes 2 positional arguments but 3 were given Fixes #12718
-	sattements in unit tests
 
-2022-01-29  Nick Hall <nick-h@gramps-project.org>
+2022-12-08  GaryGriffin <genealogy@garygriffin.net>
 
-	* gramps/gen/lib/date.py, gramps/gen/lib/test/date_test.py: Fix
+	* gramps/plugins/lib/libsubstkeyword.py: Use date-specific place in
-	negative Span when dates are not Gregorian Fixes #12525
+	report substitution variables Fix place title in graphical reports which have user-defined display
+	formats to use date-specific alternate name.  This impacts Ancestor Tree, Descendant Tree, and Family Descendant
+	Tree.  Fixes #12763.
 
-2022-01-29  Mirko Leonhaeuser <mirko@leonhaeuser.de>
+2022-12-27  John Ralls <jralls@ceridwen.us>
 
-	* po/de.po: get German translation with manual in sync (Display name
+	* gramps/grampsapp.py, gramps/gui/aboutdialog.py,
-	editor)
+	gramps/gui/logger/_errorreportassistant.py,
+	gramps/plugins/db/bsddb/bsddbtxn.py,
+	gramps/plugins/db/bsddb/cursor.py, gramps/plugins/db/bsddb/read.py,
+	gramps/plugins/db/bsddb/summary.py,
+	gramps/plugins/db/bsddb/test/cursor_test.py,
+	gramps/plugins/db/bsddb/undoredo.py,
+	gramps/plugins/db/bsddb/upgrade.py,
+	gramps/plugins/db/bsddb/write.py, gramps/plugins/gramplet/leak.py,
+	mac/patches/gramps-berkeleydb.patch: Try to import berkeleydb if
+	bsddb3 isn't found.  berkelydb is usable for python >= 3.6 and required for python >=
+	3.10. See https://www.jcea.es/programacion/pybsddb.htm.
 
-2021-08-11  SNoiraud <Serge.Noiraud@free.fr>
+2023-02-12  Vincent Smeets <Vincent.VSmeets@GMail.com>
 
-	* gramps/gen/display/name.py: Incorrect grouping if no ma/patronymic
+	* gramps/plugins/docgen/htmldoc.py: HtmlDoc: Create a unique
-	surname
+	filename for cropped images
 
-2021-08-07  SNoiraud <Serge.Noiraud@free.fr>
+2022-10-24  D.A.Lordemann <LordemannD@gmail.com>
 
-	* gramps/gen/display/name.py: Group As override is ignored for
+	* gramps/plugins/export/exportgedcom.py: Fix corrupted NOTE tag in
-	ma/patronymic surnames Fixes #12395 discourse:
+	Gedcom export Remove Python2 code obsoleted by Python3, which was corrupting
+	GEDCOM export of Gramps Notes text that includes multi-byte utf-8
+	characters.  Fixes #12709.
 
-	https://gramps.discourse.group/t/patronymic-and-matronymic-name/1684/5
+2022-09-27  SNoiraud <Serge.Noiraud@free.fr>
 
-2021-07-29  SNoiraud <Serge.Noiraud@free.fr>
+	* gramps/gui/viewmanager.py: Fix IndexError that sometimes occurs
+	when changing view This occurs when restarting Gramps.  Fixes #12636, #12304, #12429, #12623, #12695.
 
-	* gramps/gui/editors/editplace.py: Add comments for the lat-lon
+2023-03-18  SNoiraud <Serge.Noiraud@free.fr>
-	field of editplace
 
-2021-07-28  SNoiraud <Serge.Noiraud@free.fr>
+	* gramps/gen/proxy/referencedbyselection.py,
+	gramps/gui/widgets/styledtexteditor.py,
+	gramps/plugins/lib/libhtmlbackend.py: Fix crash when invalid note
+	link Fixes #012854
 
-	* gramps/gui/editors/editplace.py,
+2023-04-17  SNoiraud <Serge.Noiraud@free.fr>
-	gramps/gui/editors/editplaceref.py: Place editor, lat and long text
-	are swapped Fixes #012374
 
-2021-07-28  prculley <paulr2787@gmail.com>
+	* gramps/gui/utils.py: Tags with color names don't work in pedigree
+	views Color tags work correctly in all views except in pedigree views.
+	These views modify colors: ...   context.set_source_rgba(*(self.bordercolor[:3] + (0.4,))) ... and  context.set_source_rgb(*self.bgcolor[:3]) As it works everywhere except in these views, I think it is a bug
+	even if we cannot enter color names in tags Fixes #012866
 
-	* gramps/gui/viewmanager.py: Fix Statusbar progress being shown
+2023-04-05  SNoiraud <Serge.Noiraud@free.fr>
-	before use Fixes #12373
 
-2021-07-26  prculley <paulr2787@gmail.com>
+	* gramps/gui/views/treemodels/eventmodel.py: Crash when invalid
+	event date
 
-	* gramps/plugins/db/dbapi/dbapi.py: Fix exception when removing a
+2023-04-04  SNoiraud <Serge.Noiraud@free.fr>
-	group name in Sqlite db when group name is already missing.  Fixes #12367
 
-2021-07-26  prculley <paulr2787@gmail.com>
+	* gramps/gui/listmodel.py: ListModel: Only the first level is
+	managed When we use checkboxes in columns.  The path was converted to int.
+	Why ? But when we have multiple level, the path format is "x:y" for
+	two levels, "x:y:z" for three levels, etc
 
-	* gramps/gui/editors/editname.py: Fix error when trying to close
+2023-03-07  Nick Hall <nick-h@gramps-project.org>
-	name editor during long name group mapping view rebuild.  Fixes #12328
 
-2021-07-19  SNoiraud <Serge.Noiraud@free.fr>
+	* .github/workflows/gramps-ci.yml: Update Gramps CI workflow to run
+	on Ubuntu 20.04 Ubuntu 18.04 became fully unsupported on 1 Dec 2022.
 
-	* gramps/plugins/lib/maps/geography.py,
+2022-12-27  John Ralls <jralls@ceridwen.us>
-	gramps/plugins/lib/maps/osmgps.py, gramps/plugins/view/geoclose.py,
-	gramps/plugins/view/geofamclose.py: OsmGpsMap-CRITICAL: Map source
-	setup called twice Fixes #012352
 
-2021-08-15  Ross Gammon <rossgammon@debian.org>
+	* mac/gramps.modules: mac: Patch bsddb to use berkeleydb instead of
+	bsddb3 module.
 
-	* gramps/gen/filters/rules/test/person_rules_test.py: Fix probably
+2022-12-27  John Ralls <jralls@ceridwen.us>
-	alive test The probably alive funtion was fixed just prior to the Gramps 5.1.4
-	release. It appears the relevant unit test was not updated to match.
-	The relevant commit:
 
-	https://github.com/gramps-project/gramps/commit/a685b96f700dcfc6b953413cb3adc8be61d87438
+	* mac/gramps.modules, mac/patches/berkeleydb-4.8-mutex.patch: Mac
+	build: Patch berkeleydb configure to work on Apple Silicon.
 
-2022-01-28  Nick Hall <nick-h@gramps-project.org>
+2022-12-26  John Ralls <jralls@ceridwen.us>
 
-	* .github/workflows/gramps-ci.yml, setup.py: Use GitHub Actions to
+	* mac/gramps.modules: [mac] Update Exiv2 download URL, moved to
-	run continuous integration checks
+	github.
 
-2022-01-27  John Ralls <jralls@ceridwen.us>
+2022-12-24  John Ralls <jralls@ceridwen.us>
 
-	* mac/gramps.modules: Update Exiv2, PYExiv2, and json-glib.
+	* mac/Info.plist, mac/gramps.bundle, mac/gramps.modules: Repackage
+	Gramps 5.1.5 with Gtk updates fixing use on macOS 13 Ventura.
 
-2021-08-15  Ross Gammon <rossgammon@debian.org>
+2022-03-08  Nick Hall <nick-h@gramps-project.org>
+
+	* gramps/plugins/lib/librecords.py: Fix spouse's name and underlined
+	call names in records Fixes #12391
+
+2022-03-16  Nick Hall <nick-h@gramps-project.org>
+
+	* .github/workflows/gramps-ci.yml: Fix package installation failures
+	in CI
+
+2019-12-09  Sam Manzi <manzi.sam@gmail.com>
+
+	* gramps/gen/utils/grampslocale.py: Update INCOMPLETE_TRANSLATIONS * Remove: he * Add: zh_HK, zh_TW
+
+2022-02-12  Ross Gammon <rossgammon@debian.org>
 
 	* debian/changelog, debian/copyright,
-	debian/patches/fix-probably_alive_test.patch,
+	debian/patches/fix-probably_alive_test.patch, debian/patches/series: 
-	debian/patches/series, debian/watch: Update Debian folder for Gramps
+	Update Debian folder after 5.1.5 release
-	5.1.4 release
 
-2022-01-25  pehlm <github1@m.pekholm.org>
+2022-02-05  John Ralls <jralls@ceridwen.us>
 
-	* po/sv.po: Minor update of Swedish translation
+	* mac/Info.plist, mac/gramps.modules: Package Gramps 5.1.5 for
+	macOS.
 
-2022-01-04  Tian Shixiong <tiansworld@fedoraproject.org>
+2022-02-05  Nick Hall <nick-h@gramps-project.org>
 
-	* po/zh_CN.po: Minor update to zh_CN translation
+	* Bump to 5.1.6
-
-2021-11-03  Mirko Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: small German translation fixes
-
-2021-11-01  Mirko Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: Fixed German translation error of "Character set
-	encoding"
-
-2021-10-25  Mirko Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: Fixed German translation error of "Graph generations"
-
-2021-10-16  John Ralls <jralls@ceridwen.us>
-
-	* mac/Info.plist: Repackage Gramps.app to work with macOS 12.
-
-2021-10-16  John Ralls <jralls@ceridwen.us>
-
-	* mac/gramps.bundle: [macOS]Add entitlements path to bundle-file so
-	Gramps.app is signed with it.
-
-2021-09-19  Mirko Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: Fixed German translation error of "filter person"
-
-2021-08-30  Mirko Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: fixed error in German translation found during manual
-	translation also fixed in master
-
-2021-08-11  Mirko Leonhaeuser <mirko@leonhaeuser.de>
-
-	* po/de.po: fixed German translation of 'Descendant families of'
-	already done in trunk Weblate
-
-2021-08-10  John Ralls <jralls@ceridwen.us>
-
-	* mac/gramps.modules, mac/patches/pyfontconfig-curexc.patch: Add
-	python-fontconfig to the macOS build.  Needed to enable using genealogical symbols.
-
-2021-07-29  John Ralls <jralls@ceridwen.us>
-
-	* mac/Info.plist, mac/gramps.bundle: Inlude fontconfig's etc/fonts
-	in macOS app bundle.  Graphviz now uses fontconfig to find its fonts.  Fixes #12370
-
-2021-07-26  John Ralls <jralls@ceridwen.us>
-
-	* mac/Info.plist, mac/gramps.bundle, mac/gramps.modules,
-	mac/gramps_launcher.py: Bundle release of Gramps 5.1.4.
-
-2021-07-26  Nick Hall <nick-h@gramps-project.org>
-
-	* Bump to 5.1.5
 

NEWS

@@ -1,3 +1,50 @@
+2023-06-29
+Version 5.1.6
+* Update copyright date.
+* Narrative web: problem with small pictures. Fixes #12884.
+* Implement the "<CTRL>J" for the family view. Fixes #12882.
+* Avoid application crash on invalid user input. If the user inputs an invalid
+  date this change keeps the application from crashing. The invalid date
+  information is reported to the user in the log. Fixes #12658.
+* Fix export where private citations are excluded.
+* Fix Event Compare tool to display enclosed places properly.
+* Check that view exists before calling post_create method. Avoids 'NoneType'
+  object has no attribute 'post_create' error. Fixes #12638.
+* Fix a wrong operator bug in the web calendar report.
+* Revert "Enclose tree report image path and file name in braces" due to reports
+  of regression where processing of the generated TeX file fails due to bad path
+  specificiation for image files. Fixes #12437 and #12697.
+* Geography View: Fix number of arguments in add_bookmark method. Fixes #12718.
+* Use date-specific place in report substitution variables. Fix place title in
+  graphical reports which have user-defined display formats to use date-specific
+  alternate name.  This impacts the Ancestor Tree, Descendant Tree, and Family
+  Descendant Tree reports. Fixes #12763.
+* Try to import berkeleydb if bsddb3 isn't found.  berkelydb is usable for
+  python >= 3.6 and required for python >= 3.10.
+  See https://www.jcea.es/programacion/pybsddb.htm.
+* HtmlDoc: Create a unique filename for cropped images.
+* Fix corrupted NOTE tag in Gedcom export. Remove Python2 code obsoleted by
+  Python3, which was corrupting Gedcom export of Gramps Notes text that includes
+  multi-byte utf-8 characters.  Fixes #12709.
+* Fix IndexError that sometimes occurs when changing view This occurs when
+  restarting Gramps.  Fixes #12636, #12304, #12429, #12623, #12695.
+* Fix crash when invalid note link. Fixes #12854.
+* Fix tags with color names in pedigree views. Fixes #12866.
+* Crash when invalid event date.
+* ListModel: Fix multiple level paths when we use checkboxes in columns.
+  The path was previously converted to int.
+* Update Gramps CI workflow to run on Ubuntu 20.04. Ubuntu 18.04 became fully
+  unsupported on 1 Dec 2022.
+* Fix package installation failures in CI.
+* Fix spouse's name and underlined call names in records. Fixes #12391.
+* Update INCOMPLETE_TRANSLATIONS list. Remove: he, Add: zh_HK, zh_TW.
+* Update Debian folder after 5.1.5 release.
+* Mac:
+  * Patch bsddb to use berkeleydb instead of bsddb3 module.
+  * Patch berkeleydb configure to work on Apple Silicon.
+  * Update Exiv2 download URL, moved to github.
+  * Repackage Gramps 5.1.5 with Gtk updates fixing use on macOS 13 Ventura.
+
 2022-02-05
 Version 5.1.5
 * Update translations: de, pl, sv, zh_CN.

docs/conf.py

@@ -57,7 +57,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Gramps'
-copyright = '2001-2019, The Gramps Project'
+copyright = '2001-2023, The Gramps Project'
 author = 'Donald N. Allingham'
 
 # The version info for the project you're documenting, acts as replacement for

gramps/gen/const.py

@@ -225,7 +225,7 @@ GTK_GETTEXT_DOMAIN = 'gtk30'
 #
 #-------------------------------------------------------------------------
 COPYRIGHT_MSG = "© 2001-2006 Donald N. Allingham\n" \
-                "© 2007-2022 The Gramps Developers"
+                "© 2007-2023 The Gramps Developers"
 COMMENTS = _("Gramps\n (Genealogical Research and Analysis "
              "Management Programming System)\n"
              "is a personal genealogy program.")

gramps/version.py

@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION_TUPLE = (5, 1, 6)
+VERSION_TUPLE = (5, 1, 7)
 VERSION_QUALIFIER = ""
 VERSION = '.'.join(map(str,VERSION_TUPLE)) + VERSION_QUALIFIER
 major_version = "%s.%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1])

mac/Info.plist

@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Gramps</string>
     <key>CFBundleGetInfoString</key>
-    <string>Gramps-5.1.5-2, (C) 1997-2022 The Gramps Team http://www.gramps-project.org</string>
+    <string>Gramps-5.1.6-1, (C) 1997-2023 The Gramps Team http://www.gramps-project.org</string>
     <key>CFBundleIconFile</key>
     <string>gramps.icns</string>
     <key>CFBundleIdentifier</key>
@@ -17,13 +17,13 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>Gramps-5.1.5-2</string>
+    <string>Gramps-5.1.6-1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>Gramps-5.1.5-2</string>
+    <string>Gramps-5.1.6-1</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright 1997 - 2022 The Gramps Team, GNU General Public License.</string>
+    <string>Copyright 1997 - 2023 The Gramps Team, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.13</string>
     <key>GtkOSXLaunchScriptFile</key>

mac/gramps.bundle

@@ -14,7 +14,7 @@
   <plist>${project}/Info.plist</plist>
   <entitlements>${project}/release.entitlements.plist</entitlements>
   <!-- Build gramps-launcher with:
-          gcc -L$PREFIX/lib `python-config -\-cflags -\-ldflags -\-embed` \
+          gcc -L$PREFIX/lib `python3-config -\-cflags -\-ldflags -\-embed` \
               -o $PREFIX/bin/gramps-launcher \
 	      path/to/gtk-mac-bundler/examples/python-launcher.c
        with the obvious substitution.
@@ -42,7 +42,7 @@
   </binary>
 
   <binary recurse="True">
-    ${prefix}/lib/python3.10/*.so
+    ${prefix}/lib/python3.11/*.so
   </binary>
 
   <binary>
@@ -78,7 +78,7 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/libtiff.5.dylib
+    ${prefix}/lib/libtiff.6.dylib
   </binary>
 
   <binary dest="${bundle}/Contents/MacOS/">
@@ -153,19 +153,19 @@
   <!-- We have to pull in the python modules, which are mixed python
        and loadable modules.  -->
   <data recurse="True">
-    ${prefix}/lib/python3.10/*.py
+    ${prefix}/lib/python3.11/*.py
   </data>
 
   <data>
-    ${prefix}/lib/python3.10/config-3.10-darwin/
+    ${prefix}/lib/python3.11/config-3.11-darwin/
   </data>
 
   <data>
-    ${prefix}/lib/python3.10/site-packages/gramps/gen/utils/resource-path
+    ${prefix}/lib/python3.11/site-packages/gramps/gen/utils/resource-path
   </data>
 
   <data>
-    ${prefix}/include/python3.10/pyconfig.h
+    ${prefix}/include/python3.11/pyconfig.h
   </data>
 
 
@@ -182,7 +182,7 @@
   </data>
 
   <data recurse="True">
-    ${prefix}/lib/python3.10/site-packages/gramps/*.glade
+    ${prefix}/lib/python3.11/site-packages/gramps/*.glade
   </data>
 
   <data>

mac/gramps.modules

@@ -55,10 +55,10 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </distutils>
 
  <distutils id="gramps" supports-non-srcdir-builds="no">
-    <branch module="gramps-project/gramps/archive/v5.1.5.tar.gz"
+    <branch module="gramps-project/gramps/archive/v5.1.6.tar.gz"
-	    repo="github-tarball" version="5.1.5"
+	    repo="github-tarball" version="5.1.6"
-            checkoutdir="gramps-gramps-5.1.5">
+            checkoutdir="gramps-gramps-5.1.6">
-      <patch file="gramps-berkeleydb.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="meta-gramps-modules"/>
     </dependencies>
@@ -82,9 +82,9 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
   </meson>
 
   <meson id="geocode-glib" mesonargs="-Denable-gtk-doc=false">
-    <branch module="geocode-glib/3.26/geocode-glib-3.26.2.tar.xz"
+    <branch module="geocode-glib/3.26/geocode-glib-3.26.4.tar.xz"
-            version="3.26.2" repo="ftp.gnome.org"
+            version="3.26.4" repo="ftp.gnome.org"
-            hash="sha256:01fe84cfa0be50c6e401147a2bc5e2f1574326e2293b55c69879be3e82030fd1"/>
+            hash="sha256:2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa"/>
     <dependencies>
       <dep package="json-glib"/>
       <dep package="libsoup"/>
@@ -101,10 +101,15 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     </dependencies>
   </autotools>
 
-  <cmake id="exiv2" cmakeargs="-DEXIV2_ENABLE_PNG=ON">
+<!-- Exiv v0.28 requires std::filesystem, not available on macOS until v10.15. -->
+<cmake id="exiv2"
+       cmakeargs="-DEXIV2_ENABLE_PNG=ON -DCMAKE_CXX_STANDARD=14">
     <branch module="Exiv2/exiv2/releases/download/v0.27.4/exiv2-0.27.4-Source.tar.gz" repo="github-tarball"
             checkoutdir="exiv2-0.27.4-Source" version="0.27.4"
-            hash="sha256:84366dba7c162af9a7603bcd6c16f40fe0e9af294ba2fd2f66ffffb9fbec904e"/>
+            >
+      <!-- patch file="exiv-2.27-autoptr.patch"
+             strip="1"/ -->
+    </branch>
   </cmake>
 
   <meson id="gexiv2" mesonargs="-Dvapi=false">
@@ -117,11 +122,11 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
       <dep package="pygobject3"/>
     </dependencies>
   </meson>
-https://files.pythonhosted.org/packages/
   <distutils id="pillow">
-    <branch module="21/23/af6bac2a601be6670064a817273d4190b79df6f74d8012926a39bc7aa77f/Pillow-8.2.0.tar.gz" version="8.2.0"
+    <branch module="00/d5/4903f310765e0ff2b8e91ffe55031ac6af77d982f0156061e20a4d1a8b2d/Pillow-9.5.0.tar.gz"
+            version="9.5.0"
 	    repo="pymodules"
-	    hash="sha256:a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1">
+	    hash="sha256:bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1">
     </branch>
     <dependencies>
       <!--dep package="setuptools"/-->
@@ -129,9 +134,9 @@ https://files.pythonhosted.org/packages/
   </distutils>
 
  <distutils id='pyicu'>
-    <branch version='2.7.2' repo='pymodules'
+    <branch version='2.11' repo='pymodules'
-            module='17/0f/9d6b7eb01650960239a5d4dc21cd6e7a96921807c043d287bae4b2f440e1/PyICU-2.7.2.tar.gz'
+            module="03/1b/800fce0236be0b8a99b3ccbb797786dd178028960b3fd65544e2d8bad5ac/PyICU-2.11.tar.gz"
-            hash="sha256:1382869b22d91cc99274f9b525fa7d9199b44d9007ff0036a09747839a01e9dc"/>
+            hash="sha256:3ab531264cfe9132b3d2ac5d708da9a4649d25f6e6813730ac88cf040a08a844"/>
 
     <dependencies>
       <dep package='icu'/>
@@ -208,7 +213,7 @@ https://files.pythonhosted.org/packages/
       <dep package="osmgpsmap"/>
       <dep package="graphviz"/>
       <dep package="gexiv2"/>
-      <dep package="berkeleydb"/>
+      <dep package="pybsddb"/>
       <dep package="gtk-mac-integration-python"/>
       <dep package="pycairo"/>
       <dep package="pygobject3"/>