<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/b71b0482f7ee550f0be0f204c109d905dc21db4d">https://github.com/macports/macports-ports/commit/b71b0482f7ee550f0be0f204c109d905dc21db4d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b71b048 gramps: update to version 5.0.1, livecheck
</span>b71b048 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b71b0482f7ee550f0be0f204c109d905dc21db4d
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri Feb 15 17:48:17 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> gramps: update to version 5.0.1, livecheck
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Based on https://github.com/macports/macports-ports/pull/3656.
</span><span style='display:block; white-space:pre;color:#404040;'> Thanks to @giansalvo for the update.
</span>---
genealogy/gramps/Portfile | 54 ++++++++++------------
.../patch-gramps-gen-utils-resourcepath.py.diff | 12 ++---
2 files changed, 31 insertions(+), 35 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 a15ae38..472e700 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,8 +3,8 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gramps-project gramps 4.2.8 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gramps-project gramps 5.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,28 +19,26 @@ description Gramps is a genealogy program
</span> long_description Gramps is a genealogy program to store, edit, \
and research genealogical data. It provides \
advanced capabilities for research, analysis, and \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- correlation to potentially fill relationship gaps. This \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version is based on gtk3 and supports both python 2 and 3. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- To use the legacy gtk2 version, install port gramps3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ correlation to potentially fill relationship gaps.
</span>
homepage https://www.gramps-project.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c8f41d39e16665ae4327dfacfe154ec451285e79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 924bd2418ebd6676ea61b639ae4bc5a21b12ac7044a9b5a669eea4ed373a97af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18704782
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 17440bcaafaf34f573777b65cb388ddc2fc07391 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c4ff143dc3132b0227328edb94458b1b70b87d7a7fb1452bafefbe174d220328 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 16718002
</span>
depends_build-append port:intltool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:shared-mime-info \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xdg-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:bin/dot:graphviz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gexiv2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ghostscript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:goocanvas2 \
</span> port:gtk3 \
port:gtkspell3 \
port:osm-gps-map \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gexiv2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/dot:graphviz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ghostscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:goocanvas2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:shared-mime-info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xdg-utils
</span>
depends_run port:adwaita-icon-theme
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,26 +48,26 @@ patchfiles patch-gramps-gen-utils-resourcepath.py.diff
</span>
variant python35 conflicts python36 python37 description {Use Python 3.5} {
python.default_version 35
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py35-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py35-pyicu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py35-bsddb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py35-gobject3 \
</span> port:py35-Pillow \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py35-bsddb3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py35-pyicu
</span> }
variant python36 conflicts python35 python37 description {Use Python 3.6} {
python.default_version 36
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py36-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-pyicu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-bsddb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-gobject3 \
</span> port:py36-Pillow \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py36-bsddb3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py36-pyicu
</span> }
variant python37 conflicts python35 python36 description {Use Python 3.7} {
python.default_version 37
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py37-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py37-pyicu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py37-bsddb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-gobject3 \
</span> port:py37-Pillow \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py37-bsddb3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py37-pyicu
</span> }
if {![variant_isset python35] && ![variant_isset python37]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,9 +104,9 @@ copying to another user on the same machine -- all of these cases should use XML
</span>
***** IMPORTANT *****
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Beginning with Gramps 4.2, Gramps only supports python3. Please MAKE A BACKUP of your data using your old python2 version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-before attempting to load your family tree in Gramps 4.2 with python3. The python3 versions use a different database
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-interface with a new database format that is not compatible with the python2 versions. On startup, Gramps 4.2 will ask you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Beginning with Gramps 4.2, Gramps only supports python3. Please MAKE A BACKUP of your data using your old python2 version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+before attempting to load your family tree in Gramps 4.2 with python3. The python3 versions use a different database
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+interface with a new database format that is not compatible with the python2 versions. On startup, Gramps will ask you
</span> if you want to reformat your database. Once this has been done, your database will no longer be usable with python2 versions of Gramps.
***** MAKE A BACKUP! *****
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,5 +114,3 @@ if you want to reformat your database. Once this has been done, your database w
</span> For detailed backup instructions, see the online Gramps documentation at https://www.gramps-project.org/wiki/index.php?title=How_to_make_a_backup
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "archive/v(4\[^\"\]+).tar.gz"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/genealogy/gramps/files/patch-gramps-gen-utils-resourcepath.py.diff b/genealogy/gramps/files/patch-gramps-gen-utils-resourcepath.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e540744..c4b4ca5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/genealogy/gramps/files/patch-gramps-gen-utils-resourcepath.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/genealogy/gramps/files/patch-gramps-gen-utils-resourcepath.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gramps/gen/utils/resourcepath.py.orig 2014-06-15 04:32:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gramps/gen/utils/resourcepath.py 2014-07-09 14:17:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gramps/gen/utils/resourcepath.py.orig 2019-02-14 23:31:55.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gramps/gen/utils/resourcepath.py 2019-02-14 23:34:47.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,7 @@
</span> try:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- with io.open(resource_file, encoding='utf-8',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with open(resource_file, encoding='utf-8',
</span> errors='strict') as fp:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- resource_path = conv_to_unicode(fp.readline())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ resource_path = conv_to_unicode(fp.readline().rstrip('\n'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- resource_path = fp.readline()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ resource_path = fp.readline().rstrip('\n')
</span> except UnicodeError as err:
LOG.exception("Encoding error while parsing resource path", err)
sys.exit(1)
</pre><pre style='margin:0'>
</pre>