Skip to content

[Feature Request]: relational graph with circle #1423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pacles82 wants to merge 5 commits into from
Closed

[Feature Request]: relational graph with circle #1423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2cde1f0
Repackage Gramps 5.1.5 with Gtk updates fixing use on macOS 13 Ventura.
jralls Dec 24, 2022
e3e89e6
[mac] Update Exiv2 download URL, moved to github.
jralls Dec 26, 2022
e0ee86c
Mac build: Patch berkeleydb configure to work on Apple Silicon.
jralls Dec 27, 2022
aae38a6
mac: Patch bsddb to use berkeleydb instead of bsddb3 module.
jralls Dec 27, 2022
b97facb
Update Gramps CI workflow to run on Ubuntu 20.04
Nick-Hall Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/gramps-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions mac/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gramps</string>
<key>CFBundleGetInfoString</key>
<string>Gramps-5.1.5-1, (C) 1997-2022 The Gramps Team http://www.gramps-project.org</string>
<string>Gramps-5.1.5-2, (C) 1997-2022 The Gramps Team http://www.gramps-project.org</string>
<key>CFBundleIconFile</key>
<string>gramps.icns</string>
<key>CFBundleIdentifier</key>
Expand All @@ -17,15 +17,15 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>Gramps-5.1.5-1</string>
<string>Gramps-5.1.5-2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>Gramps-5.1.5-1</string>
<string>Gramps-5.1.5-2</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 1997 - 2022 The Gramps Team, GNU General Public License.</string>
<key>LSMinimumSystemVersion</key>
<string>10.12</string>
<string>10.13</string>
<key>GtkOSXLaunchScriptFile</key>
<string>gramps_launcher.py</string>
<key>NSHighResolutionCapable</key>
Expand Down
12 changes: 6 additions & 6 deletions mac/gramps.bundle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</binary>

<binary recurse="True">
${prefix}/lib/python3.9/*.so
${prefix}/lib/python3.10/*.so
</binary>

<binary>
Expand Down Expand Up @@ -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.9/*.py
${prefix}/lib/python3.10/*.py
</data>

<data>
${prefix}/lib/python3.9/config-3.9-darwin/
${prefix}/lib/python3.10/config-3.10-darwin/
</data>

<data>
${prefix}/lib/python3.9/site-packages/gramps/gen/utils/resource-path
${prefix}/lib/python3.10/site-packages/gramps/gen/utils/resource-path
</data>

<data>
${prefix}/include/python3.9/pyconfig.h
${prefix}/include/python3.10/pyconfig.h
</data>


Expand All @@ -182,7 +182,7 @@
</data>

<data recurse="True">
${prefix}/lib/python3.9/site-packages/gramps/*.glade
${prefix}/lib/python3.10/site-packages/gramps/*.glade
</data>

<data>
Expand Down
10 changes: 6 additions & 4 deletions mac/gramps.modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
href="http://download.oracle.com/"/>
<repository type="tarball" name="pymodules"
href="https://pypi.python.org/packages/"/>
<repository type="git" name="github" href="git://github.com/"/>
<repository type="git" name="github" href="https://github.com/"/>
<repository type="tarball" name="github-tarball" href="https://github.com/"/>
<repository type="tarball" name="exiv2.org"
href="http://www.exiv2.org/releases/"/>
Expand Down Expand Up @@ -57,7 +57,8 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<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"/>
checkoutdir="gramps-gramps-5.1.5">
<patch file="gramps-berkeleydb.patch" strip="1"/>
<dependencies>
<dep package="meta-gramps-modules"/>
</dependencies>
Expand Down Expand Up @@ -101,7 +102,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
</autotools>

<cmake id="exiv2" cmakeargs="-DEXIV2_ENABLE_PNG=ON">
<branch module="exiv2-0.27.4-Source.tar.gz" repo="exiv2.org"
<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"/>
</cmake>
Expand Down Expand Up @@ -147,6 +148,7 @@ https://files.pythonhosted.org/packages/
repo="oracle"
hash="sha256:12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef" >
<patch file="berkeleydb-4.8-atomic.patch" strip='1'/>
<patch file="berkeleydb-4.8-mutex.patch" strip='1'/>
</branch>
</autotools>

Expand All @@ -163,6 +165,7 @@ https://files.pythonhosted.org/packages/
repo="oracle"
hash="sha256:12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef">
<patch file="berkeleydb-4.8-atomic.patch" strip='1'/>
<patch file="berkeleydb-4.8-mutex.patch" strip='1'/>
</branch>
</autotools>

Expand Down Expand Up @@ -210,7 +213,6 @@ https://files.pythonhosted.org/packages/
<dep package="pycairo"/>
<dep package="pygobject3"/>
<dep package='pyicu'/>
<dep package='pybsddb'/>
<dep package="pillow"/>
</dependencies>
</metamodule>
Expand Down
115 changes: 115 additions & 0 deletions mac/patches/berkeleydb-4.8-mutex.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <pthread.h>
+#include <stdlib.h>
int
main ()
{
@@ -18792,7 +18793,8 @@
/* end confdefs.h. */

#include <pthread.h>
-main() {
+#include <stdlib.h>
+int main() {
pthread_cond_t cond;
pthread_mutex_t mutex;
pthread_condattr_t condattr;
@@ -18828,6 +18830,7 @@
/* end confdefs.h. */

#include <pthread.h>
+#include <stdlib.h>
int
main ()
{
@@ -18864,7 +18867,7 @@
/* end confdefs.h. */

#include <pthread.h>
-main() {
+int main() {
pthread_cond_t cond;
pthread_mutex_t mutex;
pthread_condattr_t condattr;
@@ -18899,6 +18902,7 @@
/* end confdefs.h. */

#include <pthread.h>
+#include <stdlib.h>
int
main ()
{
@@ -18933,7 +18937,8 @@
/* end confdefs.h. */

#include <pthread.h>
-main() {
+#include <stdlib.h>
+int main() {
pthread_cond_t cond;
pthread_mutex_t mutex;
pthread_condattr_t condattr;
@@ -18967,6 +18972,7 @@
/* end confdefs.h. */

#include <pthread.h>
+#include <stdlib.h>
int
main ()
{
@@ -19001,7 +19007,8 @@
/* end confdefs.h. */

#include <pthread.h>
-main() {
+#include <stdlib.h>
+int main() {
pthread_cond_t cond;
pthread_mutex_t mutex;
pthread_condattr_t condattr;
@@ -19038,6 +19045,7 @@
/* end confdefs.h. */

#include <synch.h>
+#include <stdlib.h>
int
main ()
{
@@ -19069,6 +19077,7 @@

#include <thread.h>
#include <synch.h>
+#include <stdlib.h>
int
main ()
{
@@ -19099,6 +19108,7 @@

#include <thread.h>
#include <synch.h>
+#include <stdlib.h>
int
main ()
{
@@ -20743,7 +20753,7 @@
/* end confdefs.h. */

#include <sys/time.h>
-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];