update to 3.3.2

changes: many fixes and improvements, most visibly: the use of py-bsddb3
is now officially supported
This commit is contained in:
drochner 2012-06-01 20:28:26 +00:00
parent 149c1769b5
commit 5b3dca13a5
18 changed files with 434 additions and 377 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.27 2012/04/08 19:08:46 wiz Exp $
# $NetBSD: Makefile,v 1.28 2012/06/01 20:28:26 drochner Exp $
#
DISTNAME= gramps-3.2.6
PKGREVISION= 6
DISTNAME= gramps-3.3.2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/}

File diff suppressed because it is too large Load diff

View file

@ -1,19 +1,6 @@
$NetBSD: distinfo,v 1.10 2011/06/09 11:54:58 drochner Exp $
$NetBSD: distinfo,v 1.11 2012/06/01 20:28:26 drochner Exp $
SHA1 (gramps-3.2.6.tar.gz) = 0e3343921400758668158bbfa072b37a702ea1b9
RMD160 (gramps-3.2.6.tar.gz) = dcea12b7adb86cd4c213eb10afcb1c4649281433
Size (gramps-3.2.6.tar.gz) = 7340674 bytes
SHA1 (patch-aa) = 7de4ac7901f647b910833881ed4825e49773ac69
SHA1 (patch-ab) = a70c9ee5706e6028230492e87946de5fc0514e21
SHA1 (patch-ac) = 982702e3c36246da35e0f016f696d52f3af37f24
SHA1 (patch-ad) = 1e1059359b07d5a63d96d1d0528969c23cea0691
SHA1 (patch-ae) = 933d5ca25274d76bb5e0826df5fe2661352f450f
SHA1 (patch-ag) = 41a74f38b33d05bf3c42fae1b4bc836df963972e
SHA1 (patch-ah) = 3b79020f44a313924156a9a3220e9afc95e7be71
SHA1 (patch-ai) = cf12741a4bfa24465bb1f7dfb98910ca49d23a7f
SHA1 (patch-aj) = 6f6be0045e94b7f95200a389dbff591e5006315c
SHA1 (patch-ak) = 6920c334b14a4d7b2ce46910978e9c10f35a9507
SHA1 (patch-al) = 9c0c39c6ecf20d0066ff4b887a3248ced34178a4
SHA1 (patch-am) = 3a39556ea040ee98ffd274f8daa8bc0af62b0909
SHA1 (patch-an) = 1f6f0625c206d2f4a8420d985a8608d444a82597
SHA1 (patch-ao) = 1fb147c041ba0b21bfa0eb01fbf288c02ec20ce3
SHA1 (gramps-3.3.2.tar.gz) = ae72c9b5e4ad932635388da392ddcaa22d859f17
RMD160 (gramps-3.3.2.tar.gz) = b099566314cd3b3733d4d8b3390a16b8f52b6de2
Size (gramps-3.3.2.tar.gz) = 8860068 bytes
SHA1 (patch-ba) = 41e2238c2de95272e5996098d16f508b0fea96fb

View file

@ -1,13 +0,0 @@
$NetBSD: patch-aa,v 1.3 2010/05/18 16:38:53 drochner Exp $
--- src/gui/editors/editfamily.py.orig 2010-03-15 07:21:30.000000000 +0000
+++ src/gui/editors/editfamily.py
@@ -26,7 +26,7 @@
# python modules
#
#-------------------------------------------------------------------------
-from bsddb import db as bsddb_db
+from bsddb3 import db as bsddb_db
from gen.ggettext import gettext as _
from DdTargets import DdTargets
import cPickle as pickle

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ab,v 1.4 2010/05/18 16:38:53 drochner Exp $
--- src/cli/clidbman.py.orig 2010-03-15 07:21:31.000000000 +0000
+++ src/cli/clidbman.py
@@ -109,7 +109,7 @@ class CLIDbManager(object):
Returns (people_count, version_number) of current DB.
Returns ("Unknown", "Unknown") if invalid DB or other error.
"""
- from bsddb import dbshelve, db
+ from bsddb3 import dbshelve, db
from gen.db import META, PERSON_TBL
env = db.DBEnv()
flags = db.DB_CREATE | db.DB_PRIVATE |\

View file

@ -1,14 +0,0 @@
$NetBSD: patch-ac,v 1.3 2010/05/18 16:38:53 drochner Exp $
--- src/GrampsLogger/_ErrorReportAssistant.py.orig 2010-05-17 05:30:59.000000000 +0000
+++ src/GrampsLogger/_ErrorReportAssistant.py
@@ -5,7 +5,8 @@ import gtk
import pygtk
import gobject
import cairo
-import sys, os,bsddb
+import sys, os
+import bsddb3 as bsddb
class ErrorReportAssistant(object):

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ad,v 1.3 2010/05/18 16:38:53 drochner Exp $
--- src/gen/db/write.py.orig 2010-03-18 15:38:37.000000000 +0000
+++ src/gen/db/write.py
@@ -39,7 +39,7 @@ import bisect
from functools import wraps
from gen.ggettext import gettext as _
-from bsddb import dbshelve, db
+from bsddb3 import dbshelve, db
import logging
from sys import maxint

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ae,v 1.5 2010/05/18 16:38:53 drochner Exp $
--- src/gen/db/read.py.orig 2010-03-18 15:39:23.000000000 +0000
+++ src/gen/db/read.py
@@ -35,7 +35,7 @@ import random
import locale
import os
from sys import maxint
-from bsddb import db
+from bsddb3 import db
from gen.ggettext import gettext as _
import logging

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ag,v 1.2 2010/05/04 11:05:00 drochner Exp $
--- src/plugins/import/ImportGrdb.py.orig 2010-03-15 07:21:24.000000000 +0000
+++ src/plugins/import/ImportGrdb.py
@@ -36,7 +36,7 @@ import tempfile
from gen.ggettext import gettext as _
import cPickle as pickle
import time
-from bsddb import dbshelve, db
+from bsddb3 import dbshelve, db
import logging
LOG = logging.getLogger(".Db")

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ah,v 1.1 2010/05/04 11:05:00 drochner Exp $
--- src/gen/db/cursor.py.orig 2010-03-18 15:40:28.000000000 +0000
+++ src/gen/db/cursor.py
@@ -24,7 +24,7 @@
#
#-------------------------------------------------------------------------
from cPickle import dumps, loads
-from bsddb import db
+from bsddb3 import db
#-------------------------------------------------------------------------
#

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ai,v 1.1 2010/05/04 11:05:00 drochner Exp $
--- src/gen/db/undoredo.py.orig 2010-03-18 15:41:16.000000000 +0000
+++ src/gen/db/undoredo.py
@@ -33,7 +33,7 @@ undos and redos.
from __future__ import with_statement
import time, os
import cPickle as pickle
-from bsddb import db
+from bsddb3 import db
from gen.ggettext import gettext as _
#-------------------------------------------------------------------------

View file

@ -1,13 +0,0 @@
$NetBSD: patch-aj,v 1.1 2010/05/04 11:05:00 drochner Exp $
--- src/gen/db/txn.py.orig 2010-03-18 15:41:57.000000000 +0000
+++ src/gen/db/txn.py
@@ -32,7 +32,7 @@ database.
#-------------------------------------------------------------------------
from __future__ import with_statement
import cPickle as pickle
-from bsddb import dbshelve, db
+from bsddb3 import dbshelve, db
import logging
from collections import defaultdict

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ak,v 1.1 2010/05/04 11:05:00 drochner Exp $
--- src/plugins/lib/libgrdb.py.orig 2010-03-18 15:42:36.000000000 +0000
+++ src/plugins/lib/libgrdb.py
@@ -36,7 +36,7 @@ import random
import locale
import os
from sys import maxint
-from bsddb import db
+from bsddb3 import db
from gen.ggettext import gettext as _
import logging

View file

@ -1,13 +0,0 @@
$NetBSD: patch-al,v 1.1 2010/05/04 11:05:00 drochner Exp $
--- src/gen/db/dbconst.py.orig 2010-03-15 07:21:14.000000000 +0000
+++ src/gen/db/dbconst.py
@@ -63,7 +63,7 @@ DBLOCKS = 25000 # Maximum nu
DBOBJECTS = 25000 # Maximum number of simultaneously locked objects
DBUNDO = 1000 # Maximum size of undo buffer
-from bsddb.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
+from bsddb3.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
DBFLAGS_O = DB_CREATE | DB_AUTO_COMMIT # Default flags for database open
DBFLAGS_R = DB_RDONLY # Flags to open a database read-only
DBFLAGS_D = DB_DUP | DB_DUPSORT # Default flags for duplicate keys

View file

@ -1,13 +0,0 @@
$NetBSD: patch-am,v 1.1 2010/05/04 11:05:00 drochner Exp $
--- src/plugins/tool/Leak.py.orig 2010-03-15 07:21:27.000000000 +0000
+++ src/plugins/tool/Leak.py
@@ -31,7 +31,7 @@ Show uncollected objects in a window.
#
#------------------------------------------------------------------------
from gen.ggettext import gettext as _
-from bsddb.db import DBError
+from bsddb3.db import DBError
#------------------------------------------------------------------------
#

View file

@ -1,13 +0,0 @@
$NetBSD: patch-an,v 1.2 2010/05/18 16:38:53 drochner Exp $
--- src/GrampsAboutDialog.py.orig 2010-05-17 05:31:23.000000000 +0000
+++ src/GrampsAboutDialog.py
@@ -30,7 +30,7 @@
from gen.ggettext import gettext as _
import os
import sys
-import bsddb
+import bsddb3 as bsddb
##import logging
##_LOG = logging.getLogger(".GrampsAboutDialog")

View file

@ -1,32 +0,0 @@
$NetBSD: patch-ao,v 1.3 2011/06/09 11:54:59 drochner Exp $
--- src/plugins/lib/libhtml.py.orig 2011-05-01 06:54:17.000000000 +0000
+++ src/plugins/lib/libhtml.py
@@ -26,8 +26,6 @@
#
#------------------------------------------------------------------------
-from __future__ import print_function
-
"""
HTML operations.
@@ -103,6 +101,9 @@ _START_CLOSE = set([
#
#------------------------------------------------------------------------
+def myprint(txt):
+ print txt
+
class Html(list):
"""
HTML class: Manages a rooted tree of HTML objects
@@ -373,7 +374,7 @@ class Html(list):
#
iterkeys = itervalues = iteritems = __iter__
#
- def write(self, method=print, indent='\t', tabs=''):
+ def write(self, method=myprint, indent='\t', tabs=''):
"""
Output function: performs an insertion-order tree traversal
and calls supplied method for each item found.

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ba,v 1.3 2012/06/01 20:28:27 drochner Exp $
--- src/config.py.orig 2012-02-25 16:06:52.000000000 +0000
+++ src/config.py
@@ -292,7 +292,7 @@ register('preferences.sprefix', 'S%04d')
register('preferences.use-last-view', True)
register('preferences.last-view', '')
register('preferences.last-views', [])
-register('preferences.use-bsddb3', False)
+register('preferences.use-bsddb3', True)
register('researcher.researcher-addr', '')
register('researcher.researcher-locality', '')