From 2cde1f0cdb545c6c716d19b3f1515d523e9c8d47 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sat, 24 Dec 2022 14:26:07 -0800 Subject: [PATCH 1/5] Repackage Gramps 5.1.5 with Gtk updates fixing use on macOS 13 Ventura. --- mac/Info.plist | 8 ++++---- mac/gramps.bundle | 12 ++++++------ mac/gramps.modules | 3 +-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/mac/Info.plist b/mac/Info.plist index 0148e6ed264..5de0fbc913e 100755 --- a/mac/Info.plist +++ b/mac/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable Gramps CFBundleGetInfoString - Gramps-5.1.5-1, (C) 1997-2022 The Gramps Team http://www.gramps-project.org + Gramps-5.1.5-2, (C) 1997-2022 The Gramps Team http://www.gramps-project.org CFBundleIconFile gramps.icns CFBundleIdentifier @@ -17,15 +17,15 @@ CFBundlePackageType APPL CFBundleShortVersionString - Gramps-5.1.5-1 + Gramps-5.1.5-2 CFBundleSignature ???? CFBundleVersion - Gramps-5.1.5-1 + Gramps-5.1.5-2 NSHumanReadableCopyright Copyright 1997 - 2022 The Gramps Team, GNU General Public License. LSMinimumSystemVersion - 10.12 + 10.13 GtkOSXLaunchScriptFile gramps_launcher.py NSHighResolutionCapable diff --git a/mac/gramps.bundle b/mac/gramps.bundle index 3d757c91483..b21bc9b46c1 100644 --- a/mac/gramps.bundle +++ b/mac/gramps.bundle @@ -42,7 +42,7 @@ - ${prefix}/lib/python3.9/*.so + ${prefix}/lib/python3.10/*.so @@ -153,19 +153,19 @@ - ${prefix}/lib/python3.9/*.py + ${prefix}/lib/python3.10/*.py - ${prefix}/lib/python3.9/config-3.9-darwin/ + ${prefix}/lib/python3.10/config-3.10-darwin/ - ${prefix}/lib/python3.9/site-packages/gramps/gen/utils/resource-path + ${prefix}/lib/python3.10/site-packages/gramps/gen/utils/resource-path - ${prefix}/include/python3.9/pyconfig.h + ${prefix}/include/python3.10/pyconfig.h @@ -182,7 +182,7 @@ - ${prefix}/lib/python3.9/site-packages/gramps/*.glade + ${prefix}/lib/python3.10/site-packages/gramps/*.glade diff --git a/mac/gramps.modules b/mac/gramps.modules index 54babe357c8..bb8605c7327 100644 --- a/mac/gramps.modules +++ b/mac/gramps.modules @@ -13,7 +13,7 @@ href="http://download.oracle.com/"/> - + @@ -210,7 +210,6 @@ https://files.pythonhosted.org/packages/ - From e3e89e6592f8b8671e6f4083478055783b1ccc16 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 26 Dec 2022 13:56:57 -0800 Subject: [PATCH 2/5] [mac] Update Exiv2 download URL, moved to github. --- mac/gramps.modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mac/gramps.modules b/mac/gramps.modules index bb8605c7327..a9d152a79ba 100644 --- a/mac/gramps.modules +++ b/mac/gramps.modules @@ -101,7 +101,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle - From e0ee86c36aaa4a7d64eee7394446e3c15f4e9db5 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 27 Dec 2022 11:45:08 -0800 Subject: [PATCH 3/5] Mac build: Patch berkeleydb configure to work on Apple Silicon. --- mac/gramps.modules | 2 + mac/patches/berkeleydb-4.8-mutex.patch | 115 +++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 mac/patches/berkeleydb-4.8-mutex.patch diff --git a/mac/gramps.modules b/mac/gramps.modules index a9d152a79ba..01ca740f530 100644 --- a/mac/gramps.modules +++ b/mac/gramps.modules @@ -147,6 +147,7 @@ https://files.pythonhosted.org/packages/ repo="oracle" hash="sha256:12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef" > + @@ -163,6 +164,7 @@ https://files.pythonhosted.org/packages/ repo="oracle" hash="sha256:12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef"> + diff --git a/mac/patches/berkeleydb-4.8-mutex.patch b/mac/patches/berkeleydb-4.8-mutex.patch new file mode 100644 index 00000000000..bb31dd23f1b --- /dev/null +++ b/mac/patches/berkeleydb-4.8-mutex.patch @@ -0,0 +1,115 @@ +--- a/dist/configure 2022-12-26 13:46:24.000000000 -0800 ++++ b/dist/configure 2022-12-27 11:35:26.000000000 -0800 +@@ -18756,6 +18756,7 @@ + /* end confdefs.h. */ + + #include ++#include + int + main () + { +@@ -18792,7 +18793,8 @@ + /* end confdefs.h. */ + + #include +-main() { ++#include ++int main() { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -18828,6 +18830,7 @@ + /* end confdefs.h. */ + + #include ++#include + int + main () + { +@@ -18864,7 +18867,7 @@ + /* end confdefs.h. */ + + #include +-main() { ++int main() { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -18899,6 +18902,7 @@ + /* end confdefs.h. */ + + #include ++#include + int + main () + { +@@ -18933,7 +18937,8 @@ + /* end confdefs.h. */ + + #include +-main() { ++#include ++int main() { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -18967,6 +18972,7 @@ + /* end confdefs.h. */ + + #include ++#include + int + main () + { +@@ -19001,7 +19007,8 @@ + /* end confdefs.h. */ + + #include +-main() { ++#include ++int main() { + pthread_cond_t cond; + pthread_mutex_t mutex; + pthread_condattr_t condattr; +@@ -19038,6 +19045,7 @@ + /* end confdefs.h. */ + + #include ++#include + int + main () + { +@@ -19069,6 +19077,7 @@ + + #include + #include ++#include + int + main () + { +@@ -19099,6 +19108,7 @@ + + #include + #include ++#include + int + main () + { +@@ -20743,7 +20753,7 @@ + /* end confdefs.h. */ + + #include +-main() { ++int main() { + struct timespec t; + return (clock_gettime(CLOCK_MONOTONIC, &t) != 0); + } +@@ -21634,7 +21644,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +- main() { ++ int main() { + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf[100]; From aae38a6861c634343ddeccc468129f31861d1ce7 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 27 Dec 2022 15:25:07 -0800 Subject: [PATCH 4/5] mac: Patch bsddb to use berkeleydb instead of bsddb3 module. --- mac/gramps.modules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mac/gramps.modules b/mac/gramps.modules index 01ca740f530..58b30c9ffc0 100644 --- a/mac/gramps.modules +++ b/mac/gramps.modules @@ -57,7 +57,8 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle + checkoutdir="gramps-gramps-5.1.5"> + From b97facb66fb9b6dd3da89fa9d05a2f23333c4b24 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Tue, 7 Mar 2023 21:43:37 +0000 Subject: [PATCH 5/5] Update Gramps CI workflow to run on Ubuntu 20.04 Ubuntu 18.04 became fully unsupported on 1 Dec 2022. --- .github/workflows/gramps-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gramps-ci.yml b/.github/workflows/gramps-ci.yml index a75def62d0a..afc3377dcee 100644 --- a/.github/workflows/gramps-ci.yml +++ b/.github/workflows/gramps-ci.yml @@ -28,7 +28,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2