<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d5089145f5a88e4ab395e3dbe207032a890c61f2">https://github.com/macports/macports-ports/commit/d5089145f5a88e4ab395e3dbe207032a890c61f2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d5089145f5a88e4ab395e3dbe207032a890c61f2
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Jan 1 02:14:03 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> gramps: update to version 4.2.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove outdated patch now incorporated upstream.
</span>---
genealogy/gramps/Portfile | 9 ++-
.../gramps/files/patch-pygi-require-version.diff | 75 ----------------------
2 files changed, 4 insertions(+), 80 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/genealogy/gramps/Portfile b/genealogy/gramps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d6c0fd1..3441f1c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/genealogy/gramps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/genealogy/gramps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gramps-project gramps 4.2.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gramps-project gramps 4.2.5 v
</span>
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,8 @@ long_description GRAMPS is a genealogy program to store, edit, \
</span>
homepage http://www.gramps-project.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f635dc0604101c439472efc34159d58c82b3ec78 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 222b3555114de6b8bdd4579782333dd0afe196298e520514a29ee0ea4efcb689
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 08c88b4e7b21d3c7f485424b7f59f35574899fa0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8e450b54f81049555c270bbce453f873b8e251f71979f529cd68b044c2238bb7
</span>
depends_build-append port:intltool
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +43,7 @@ depends_lib-append port:desktop-file-utils \
</span>
depends_run port:gnome-themes-standard
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-gramps-gen-utils-resourcepath.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pygi-require-version.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gramps-gen-utils-resourcepath.py.diff
</span>
# versions 4.2.0+ only support python 3
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/genealogy/gramps/files/patch-pygi-require-version.diff b/genealogy/gramps/files/patch-pygi-require-version.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e62123b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/genealogy/gramps/files/patch-pygi-require-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gramps/gui/spell.py.orig 2015-10-18 16:58:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gramps/gui/spell.py 2015-10-18 17:02:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,12 +58,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- repository = Repository.get_default()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if repository.enumerate_versions("GtkSpell"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import gi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gi.require_version('GtkSpell', '3.0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import GtkSpell as Gtkspell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_GTKSPELL = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif repository.enumerate_versions("Gtkspell"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import gi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gi.require_version('GtkSpell', '3.0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import Gtkspell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_GTKSPELL = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gramps/grampsapp.py.orig 2015-10-18 17:06:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gramps/grampsapp.py 2015-10-18 17:11:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -244,6 +244,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi import Repository
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- repository = Repository.get_default()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if repository.enumerate_versions("OsmGpsMap"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import gi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gi.require_version('OsmGpsMap', '1.0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import OsmGpsMap as osmgpsmap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- osmgpsmap_str = osmgpsmap._version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,7 +261,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi import Repository
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- repository = Repository.get_default()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if repository.enumerate_versions("GExiv2"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- from gi.repository import GExiv2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import gi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gi.require_version('GExiv2', '0.10')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ from gi.repository import GExiv2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gexiv2_str = GExiv2._version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except: # any failure to 'get' the version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gramps/plugins/gramplet/gramplet.gpr.py.orig 2015-10-18 17:31:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gramps/plugins/gramplet/gramplet.gpr.py 2015-10-18 17:32:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -384,6 +384,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi import Repository
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- repository = Repository.get_default()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if repository.enumerate_versions("GExiv2"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import gi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gi.require_version('GExiv2', '0.10')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import GExiv2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- available = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gramps/plugins/lib/libmetadata.py.orig 2015-10-18 17:35:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gramps/plugins/lib/libmetadata.py 2015-10-18 17:36:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import Gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import gi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+gi.require_version('GExiv2', '0.10')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import GExiv2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gramps/plugins/view/geography.gpr.py.orig 2015-10-18 18:02:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gramps/plugins/view/geography.gpr.py 2015-10-18 18:03:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,6 +44,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if repository.enumerate_versions("OsmGpsMap"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # current osmgpsmap support GTK3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import gi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gi.require_version('OsmGpsMap', '1.0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from gi.repository import OsmGpsMap as osmgpsmap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if osmgpsmap._version < '0.8':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _LOG.warning( _("OsmGpsMap module not loaded. "
</span></pre><pre style='margin:0'>
</pre>