From 6f98fa07fcea15f9bcaaaacba6860b3382646294 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Wed, 2 Aug 2023 20:50:12 -0700
Subject: [PATCH] Package release of Gramps-5.2.0-beta1.

---
 mac/Info.plist     |  8 ++++----
 mac/gramps.bundle  | 19 ++++++-------------
 mac/gramps.modules | 10 ++++------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/mac/Info.plist b/mac/Info.plist
index 5de0fbc913e..04eddd900fd 100755
--- a/mac/Info.plist
+++ b/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.2.0-beta1-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.2.0-beta1-1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>Gramps-5.1.5-2</string>
+    <string>Gramps-5.2.0-beta1-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>
diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index b21bc9b46c1..60e763823be 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -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,15 @@
   <!-- 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
-  </data>
-
-  <data>
-    ${prefix}/include/python3.10/pyconfig.h
+    ${prefix}/include/python3.11/pyconfig.h
   </data>
 
 
@@ -182,7 +178,7 @@
   </data>
 
   <data recurse="True">
-    ${prefix}/lib/python3.10/site-packages/gramps/*.glade
+    ${prefix}/lib/python3.11/site-packages/gramps/*.glade
   </data>
 
   <data>
@@ -197,9 +193,6 @@
     ${prefix}/share/gramps/images/splash.jpg
   </data>
 
-  <data>
-    ${prefix}/share/mime-info/
-  </data>
 <!-- Note that you must run `dot -c` to create this file -->
   <data>
     ${prefix}/lib/graphviz/config6
diff --git a/mac/gramps.modules b/mac/gramps.modules
index ffff118f3d0..935ece2d212 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -53,12 +53,10 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
       <dep package="meta-gramps-modules"/>
     </dependencies>
   </distutils>
-
  <distutils id="gramps" supports-non-srcdir-builds="no">
-    <branch module="gramps-project/gramps/archive/v5.1.5.tar.gz"
-	    repo="github-tarball" version="5.1.5"
-            checkoutdir="gramps-gramps-5.1.5">
-      <patch file="gramps-berkeleydb.patch" strip="1"/>
+    <branch module="gramps-project/gramps/archive/v5.2.0-beta1.tar.gz"
+	    repo="github-tarball" version="5.2.0-beta1"
+            checkoutdir="gramps-gramps-5.2.0-beta1" />
     <dependencies>
       <dep package="meta-gramps-modules"/>
     </dependencies>
@@ -209,12 +207,12 @@ https://files.pythonhosted.org/packages/
       <dep package="osmgpsmap"/>
       <dep package="graphviz"/>
       <dep package="gexiv2"/>
-      <dep package="berkeleydb"/>
       <dep package="gtk-mac-integration-python"/>
       <dep package="pycairo"/>
       <dep package="pygobject3"/>
       <dep package='pyicu'/>
       <dep package="pillow"/>
+      <dep package="pybsddb"/>
     </dependencies>
   </metamodule>