[121871] users/devans/dports/genealogy/gramps

[devans at macports.org]

Revision: 121871
          https://trac.macports.org/changeset/121871
Author:   devans at macports.org
Date:     2014-07-09 14:42:08 -0700 (Wed, 09 Jul 2014)
Log Message:
-----------
devans/dports: gramps, merge changes from trunk and update to version 4.1.0 for testing.

Modified Paths:
--------------
    users/devans/dports/genealogy/gramps/Portfile
    users/devans/dports/genealogy/gramps/files/patch-gramps-gen-utils-resourcepath.py.diff

Property Changed:
----------------
    users/devans/dports/genealogy/gramps/


Property changes on: users/devans/dports/genealogy/gramps
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/genealogy/gramps:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
   + /branches/mld-qt-481/dports/genealogy/gramps:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/genealogy/gramps:121869-121870

Modified: users/devans/dports/genealogy/gramps/Portfile
===================================================================
--- users/devans/dports/genealogy/gramps/Portfile	2014-07-09 21:36:36 UTC (rev 121870)
+++ users/devans/dports/genealogy/gramps/Portfile	2014-07-09 21:42:08 UTC (rev 121871)
@@ -8,7 +8,7 @@
 
 PortGroup               python 1.0
 
-version                 4.0.3
+version                 4.1.0
 license                 GPL-2
 categories              genealogy python
 platforms               darwin
@@ -27,8 +27,8 @@
 homepage                http://www.gramps-project.org/
 master_sites            sourceforge:gramps
 
-checksums               rmd160  f03a316a0749a3a589edbda95e786a15b21b342c \
-                        sha256  13985235d27332af461311399a90a5280a7aa516d08bcb4979d3d9edc9c7d7bf
+checksums               rmd160  f3641db2a247826442ad8cd7e8faf1e372e44175 \
+                        sha256  50bdcd954937bd3ea24b7199a6950e15dac1c332980b18d25996c0db847b8ff4
 
 depends_build-append    port:intltool
 

Modified: users/devans/dports/genealogy/gramps/files/patch-gramps-gen-utils-resourcepath.py.diff
===================================================================
--- users/devans/dports/genealogy/gramps/files/patch-gramps-gen-utils-resourcepath.py.diff	2014-07-09 21:36:36 UTC (rev 121870)
+++ users/devans/dports/genealogy/gramps/files/patch-gramps-gen-utils-resourcepath.py.diff	2014-07-09 21:42:08 UTC (rev 121871)
@@ -1,11 +1,11 @@
---- gramps/gen/utils/resourcepath.py.orig	2013-10-05 00:29:32.000000000 -0700
-+++ gramps/gen/utils/resourcepath.py	2013-10-05 00:30:14.000000000 -0700
-@@ -66,7 +66,7 @@
+--- gramps/gen/utils/resourcepath.py.orig	2014-06-15 04:32:07.000000000 -0700
++++ gramps/gen/utils/resourcepath.py	2014-07-09 14:17:21.000000000 -0700
+@@ -65,7 +65,7 @@
              try:
                  with io.open(resource_file, encoding='utf-8',
                                  errors='strict') as fp:
--                    resource_path = fp.readline()
-+                    resource_path = fp.readline().rstrip('\n')
+-                    resource_path = conv_to_unicode(fp.readline())
++                    resource_path = conv_to_unicode(fp.readline().rstrip('\n'))
              except UnicodeError as err:
                  LOG.exception("Encoding error while parsing resource path", err)
                  sys.exit(1)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140709/b3b6802d/attachment.html>