Skip to content

Commit

Permalink
Update gramps.modules.
Browse files Browse the repository at this point in the history
Remove obsolete comment and comment out the private include.
Update the branch in gramps-git
Remove BerkeleyDB and pybsddb dependencies.
Remove unused patches.
  • Loading branch information
jralls committed Jun 25, 2024
1 parent 7f56d13 commit 7b92a1a
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 515 deletions.
15 changes: 0 additions & 15 deletions mac/gexiv2-libtool.patch

This file was deleted.

76 changes: 4 additions & 72 deletions mac/gramps.modules
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,13 @@
href="http://www.exiv2.org/releases/"/>
<repository type="tarball" name="pythonware"
href="http://effbot.org/downloads/"/>
<!--
Special instructions:
Gramps uses BerkeleyDB (BDB) via Python. BDB is normally included in Linux systems, but Apple prefers other mechanisms for data storage, so it isn't included on Macs.
jhbuild bootstrap && jhbuild &double-hyphen;moduleset=http://raw.github.com/jralls/gtk-osx-build/master/projects/gramps/gramps.modules build meta-gtk-osx-bootstrap gramps

If you're going to bundle GRAMPS, you'll need to add
_gtk_osx_use_jhbuild_python = True
to your .jhbuildrc-custom and pass the &double-hyphen;ignore-system argument to jhbuild bootstrap. (That &double-hyphen; entity is fake because double-hyphens aren't allowed in xml comments. Just substitute a real double-hyphen when you type it on the command line.)
Open a jhbuild shell.
For reasons known only to themselves, the Python project have set up their makefiles to create libpython without write privs, so you need to
chmod +w $PREFIX/lib/libpython2.7.dylib
before running
gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
-->

<!--include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules"/-->
<include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules"/>
<!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->

<distutils id="gramps-git" supports-non-srcdir-builds="no">
<branch module="gramps-project/gramps.git" repo="github"
revision="maintenance/gramps51"
revision="maintenance/gramps52"
checkoutdir="gramps-git"/>
<dependencies>
<dep package="meta-gramps-modules"/>
Expand Down Expand Up @@ -116,7 +94,7 @@ 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"
repo="pymodules"
Expand All @@ -137,51 +115,6 @@ https://files.pythonhosted.org/packages/
</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="berkeleydb-4.8-atomic.patch" strip='1'/>
<patch file="berkeleydb-4.8-mutex.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="berkeleydb-4.8-atomic.patch" strip='1'/>
<patch file="berkeleydb-4.8-mutex.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>

<distutils id='pyfontconfig'>
<branch repo='pymodules' version="0.5.1"
module="e6/01/a28b0160f82ca5e946e315251c797f07c74e5c5a53f2a9e706eebc680191/Python-fontconfig-0.5.1.tar.gz"
Expand Down Expand Up @@ -212,7 +145,6 @@ https://files.pythonhosted.org/packages/
<dep package="pygobject3"/>
<dep package='pyicu'/>
<dep package="pillow"/>
<dep package="pybsddb"/>
</dependencies>
</metamodule>

Expand Down
40 changes: 0 additions & 40 deletions mac/patches/berkeleydb-4.8-atomic.patch

This file was deleted.

115 changes: 0 additions & 115 deletions mac/patches/berkeleydb-4.8-mutex.patch

This file was deleted.

Loading

0 comments on commit 7b92a1a

Please sign in to comment.