<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141448] trunk/dports/genealogy/gramps</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141448">141448</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-10-18 18:52:26 -0700 (Sun, 18 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gramps: switch to github and update to version 4.2.1, dependencies, no longer supports python27, update notes, use default livecheck.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgenealogygrampsPortfile">trunk/dports/genealogy/gramps/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgenealogygrampsfilespatchpygirequireversiondiff">trunk/dports/genealogy/gramps/files/patch-pygi-require-version.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgenealogygrampsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/genealogy/gramps/Portfile (141447 => 141448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/genealogy/gramps/Portfile 2015-10-18 23:46:31 UTC (rev 141447)
+++ trunk/dports/genealogy/gramps/Portfile 2015-10-19 01:52:26 UTC (rev 141448)
</span><span class="lines">@@ -2,13 +2,13 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx">
</span><del>-name gramps
-conflicts gramps3
</del><ins>+github.setup gramps-project gramps 4.2.1 v
</ins><span class="cx">
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx">
</span><del>-version 4.2.0
</del><ins>+conflicts gramps3
</ins><span class="cx"> license GPL-2
</span><span class="cx"> categories genealogy python
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -25,10 +25,9 @@
</span><span class="cx"> To use the legacy gtk2 version, install port gramps3.
</span><span class="cx">
</span><span class="cx"> homepage http://www.gramps-project.org/
</span><del>-master_sites sourceforge:gramps
</del><span class="cx">
</span><del>-checksums rmd160 72c32171fe6724d9627d83d66a39567e42574668 \
- sha256 b77e09580645858c439f6d803d6f121110a41e2c484a1292f2e39a6b1aea87dd
</del><ins>+checksums rmd160 0d162899c41266e8ca8d37e10af44c5e23bc6a12 \
+ sha256 be4d342e7a6b1dd72ba142ada8756ed6fb60d9bdec30bcbb24fbbff798020176
</ins><span class="cx">
</span><span class="cx"> depends_build-append port:intltool
</span><span class="cx">
</span><span class="lines">@@ -39,34 +38,20 @@
</span><span class="cx"> port:gtkspell3 \
</span><span class="cx"> port:osm-gps-map \
</span><span class="cx"> port:gexiv2 \
</span><del>- path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
</del><span class="cx"> path:bin/dot:graphviz \
</span><span class="cx"> port:ghostscript \
</span><span class="cx"> port:goocanvas2
</span><span class="cx">
</span><span class="cx"> depends_run port:gnome-themes-standard
</span><span class="cx">
</span><del>-patchfiles patch-gramps-gen-utils-resourcepath.py.diff
</del><ins>+patchfiles patch-gramps-gen-utils-resourcepath.py.diff \
+ patch-pygi-require-version.diff
</ins><span class="cx">
</span><del>-platform darwin {
- if {${configure.cxx_stdlib} eq "libstdc++"} {
- depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
- depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
- }
-}
-
</del><span class="cx"> #
</span><del>-# supports python27 and python3 >= 3.2
-# python 3 versions require py-bsddb3 for database access
-#
</del><ins>+# versions 4.2.0+ only support python 3
+# TODO
+# Add python35 variant when possible
</ins><span class="cx">
</span><del>-variant python27 conflicts python34 description {Use Python 2.7} {
- python.default_version 27
- depends_lib-append port:py27-gobject3 \
- port:py27-pyicu \
- port:py27-Pillow
-}
-
</del><span class="cx"> variant python34 conflicts python27 description {Use Python 3.4} {
</span><span class="cx"> python.default_version 34
</span><span class="cx"> depends_lib-append port:py34-gobject3 \
</span><span class="lines">@@ -75,9 +60,7 @@
</span><span class="cx"> port:py34-bsddb3
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset python27]} {
- default_variants +python34
-}
</del><ins>+default_variants +python34
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> reinplace "s|${destroot}${python.prefix}|${prefix}|" ${destroot}${python.pkgd}/gramps/gen/utils/resource-path
</span><span class="lines">@@ -109,17 +92,13 @@
</span><span class="cx">
</span><span class="cx"> ***** IMPORTANT *****
</span><span class="cx">
</span><del>-Beginning with GRAMPS 4.0, GRAMPS supports either python2 or python3. If you plan to use python3, please MAKE A BACKUP
-of your data using your old python2 version before attempting to load your family tree in GRAMPS 4.0 with python3. The python3 versions use a different database interface with a new database format that is not compatible with the python2 versions. On startup, GRAMPS 4.0 python3 will ask you if you want to reformat your database. Once this has been done, your database will no longer be usable with python2 versions of GRAMPS.
</del><ins>+Beginning with GRAMPS 4.2, GRAMPS only supports python3. Please MAKE A BACKUP of your data using your old python2 version
+before attempting to load your family tree in GRAMPS 4.2 with python3. The python3 versions use a different database
+interface with a new database format that is not compatible with the python2 versions. On startup, GRAMPS 4.2 will ask you
+if you want to reformat your database. Once this has been done, your database will no longer be usable with python2 versions of GRAMPS.
</ins><span class="cx">
</span><del>-Beginning with GRAMPS 4.2, a new GRAMPS database format is in use for all python versions. On startup, GRAMPS 4.2 will ask you if you want to reformat your database. Once this has been done, your database will no longer be usable with previous versions of GRAMPS.
-
</del><span class="cx"> ***** MAKE A BACKUP! *****
</span><span class="cx">
</span><span class="cx"> For detailed backup instructions, see the online GRAMPS documentation at http://www.gramps-project.org/wiki/index.php?title=How_to_make_a_backup
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-livecheck.type regex
-livecheck.url http://sourceforge.net/projects/gramps/files/Stable/
-livecheck.regex "/Stable/(\[0-9.\]+)"
</del></span></pre></div>
<a id="trunkdportsgenealogygrampsfilespatchpygirequireversiondiff"></a>
<div class="addfile"><h4>Added: trunk/dports/genealogy/gramps/files/patch-pygi-require-version.diff (0 => 141448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/genealogy/gramps/files/patch-pygi-require-version.diff (rev 0)
+++ trunk/dports/genealogy/gramps/files/patch-pygi-require-version.diff 2015-10-19 01:52:26 UTC (rev 141448)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+--- gramps/gui/spell.py.orig 2015-10-18 16:58:59.000000000 -0700
++++ gramps/gui/spell.py 2015-10-18 17:02:07.000000000 -0700
+@@ -58,12 +58,16 @@
+ repository = Repository.get_default()
+ if repository.enumerate_versions("GtkSpell"):
+ try:
++ import gi
++ gi.require_version('GtkSpell', '3.0')
+ from gi.repository import GtkSpell as Gtkspell
+ HAVE_GTKSPELL = True
+ except:
+ pass
+ elif repository.enumerate_versions("Gtkspell"):
+ try:
++ import gi
++ gi.require_version('GtkSpell', '3.0')
+ from gi.repository import Gtkspell
+ HAVE_GTKSPELL = True
+ except:
+--- gramps/grampsapp.py.orig 2015-10-18 17:06:18.000000000 -0700
++++ gramps/grampsapp.py 2015-10-18 17:11:32.000000000 -0700
+@@ -220,6 +220,8 @@
+ from gi import Repository
+ repository = Repository.get_default()
+ if repository.enumerate_versions("OsmGpsMap"):
++ import gi
++ gi.require_version('OsmGpsMap', '1.0')
+ from gi.repository import OsmGpsMap as osmgpsmap
+ try:
+ osmgpsmap_str = osmgpsmap._version
+@@ -235,7 +237,9 @@
+ from gi import Repository
+ repository = Repository.get_default()
+ if repository.enumerate_versions("GExiv2"):
+- from gi.repository import GExiv2
++ import gi
++ gi.require_version('GExiv2', '0.10')
++ from gi.repository import GExiv2
+ try:
+ gexiv2_str = GExiv2._version
+ except: # any failure to 'get' the version
+--- gramps/plugins/gramplet/gramplet.gpr.py.orig 2015-10-18 17:31:22.000000000 -0700
++++ gramps/plugins/gramplet/gramplet.gpr.py 2015-10-18 17:32:37.000000000 -0700
+@@ -384,6 +384,8 @@
+ from gi import Repository
+ repository = Repository.get_default()
+ if repository.enumerate_versions("GExiv2"):
++ import gi
++ gi.require_version('GExiv2', '0.10')
+ from gi.repository import GExiv2
+ available = True
+ else:
+--- gramps/plugins/lib/libmetadata.py.orig 2015-10-18 17:35:15.000000000 -0700
++++ gramps/plugins/lib/libmetadata.py 2015-10-18 17:36:46.000000000 -0700
+@@ -32,6 +32,9 @@
+ #
+ #-------------------------------------------------------------------------
+ from gi.repository import Gtk
++
++import gi
++gi.require_version('GExiv2', '0.10')
+ from gi.repository import GExiv2
+
+ #-------------------------------------------------------------------------
+--- gramps/plugins/view/geography.gpr.py.orig 2015-10-18 18:02:51.000000000 -0700
++++ gramps/plugins/view/geography.gpr.py 2015-10-18 18:03:59.000000000 -0700
+@@ -44,6 +44,8 @@
+ if repository.enumerate_versions("OsmGpsMap"):
+ try :
+ # current osmgpsmap support GTK3
++ import gi
++ gi.require_version('OsmGpsMap', '1.0')
+ from gi.repository import OsmGpsMap as osmgpsmap
+ if osmgpsmap._version < '0.8':
+ _LOG.warning( _("OsmGpsMap module not loaded. "
</ins></span></pre>
</div>
</div>
</body>
</html>