[pkgsrc/trunk]: pkgsrc/databases/gramps3 try to deal with incompatible change...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c667a969099
branches:  trunk
changeset: 547527:7c667a969099
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Sep 18 17:11:01 2008 +0000

description:
try to deal with incompatible changes in py-bsddb3-4.7.2
(I'm not sure commenting out DB_TXN_NOSYNC is the best solution, but
it seems to work for me at least.)
approved by gdt

diffstat:

 databases/gramps3/distinfo         |   4 +-
 databases/gramps3/patches/patch-ae |  40 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 4 deletions(-)

diffs (70 lines):

diff -r 91fc2c60a9e0 -r 7c667a969099 databases/gramps3/distinfo
--- a/databases/gramps3/distinfo        Thu Sep 18 16:58:01 2008 +0000
+++ b/databases/gramps3/distinfo        Thu Sep 18 17:11:01 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2008/06/23 15:44:14 drochner Exp $
+$NetBSD: distinfo,v 1.3 2008/09/18 17:11:01 drochner Exp $
 
 SHA1 (gramps-3.0.1.tar.gz) = 371ffba136fe596a3a1a853cd63fd8cd68d0d02b
 RMD160 (gramps-3.0.1.tar.gz) = a76e88bc51e50ae52440cde0779e5b04657a8524
@@ -7,7 +7,7 @@
 SHA1 (patch-ab) = d10c2b4627c8566d2bc3a24a422daf49c367c123
 SHA1 (patch-ac) = b20d68c4626ec4699880b2932728ddd713582ab5
 SHA1 (patch-ad) = 1eaaf42ecc527b797a1889945740a3fd1511aa12
-SHA1 (patch-ae) = c7ff88174e0823cde52ebbdc47e847ef54f90493
+SHA1 (patch-ae) = b2d05c9a27d5f9d6e354db126c13b5ccf389ce0e
 SHA1 (patch-af) = fca8975e8db9841b23065a52b90e92a958077021
 SHA1 (patch-ba) = 5e64b42eda21faec1fdd5fdd1020f5e73eea73ea
 SHA1 (patch-bb) = 74f6c13b93618ba7e6d80ca0560f950da4ee476d
diff -r 91fc2c60a9e0 -r 7c667a969099 databases/gramps3/patches/patch-ae
--- a/databases/gramps3/patches/patch-ae        Thu Sep 18 16:58:01 2008 +0000
+++ b/databases/gramps3/patches/patch-ae        Thu Sep 18 17:11:01 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/06/18 22:21:13 gdt Exp $
+$NetBSD: patch-ae,v 1.2 2008/09/18 17:11:01 drochner Exp $
 
---- src/gen/db/dbdir.py.orig   2008-05-17 16:14:29.000000000 -0400
+--- src/gen/db/dbdir.py.orig   2008-05-17 22:14:29.000000000 +0200
 +++ src/gen/db/dbdir.py
 @@ -36,7 +36,7 @@ import time
  from types import InstanceType
@@ -11,3 +11,39 @@
  import logging
  
  _LOG = logging.getLogger(".GrampsDb")
+@@ -480,7 +480,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCa
+         # These env settings are only needed for Txn environment
+         self.env.set_lk_max_locks(25000)
+         self.env.set_lk_max_objects(25000)
+-        self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1)  # clean up unused logs
++        self.env.set_flags(db.DB_LOG_AUTO_REMOVE, 1)  # clean up unused logs
+ 
+         # The DB_PRIVATE flag must go if we ever move to multi-user setup
+         env_flags = db.DB_CREATE | db.DB_PRIVATE |\
+@@ -1556,7 +1556,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCa
+         transaction = BdbTransaction(msg, self.undodb, batch, no_magic)
+         if transaction.batch:
+             self.env.txn_checkpoint()
+-            self.env.set_flags(db.DB_TXN_NOSYNC, 1)      # async txn
++#            self.env.set_flags(db.DB_TXN_NOSYNC, 1)      # async txn
+ 
+             if self.secondary_connected and not transaction.no_magic:
+                 # Disconnect unneeded secondary indices
+@@ -1594,7 +1594,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCa
+         self.txn.commit()
+         if transaction.batch:
+             self.env.txn_checkpoint()
+-            self.env.set_flags(db.DB_TXN_NOSYNC, 0)      # sync txn
++#            self.env.set_flags(db.DB_TXN_NOSYNC, 0)      # sync txn
+ 
+             if not transaction.no_magic:
+                 # create new secondary indices to replace the ones removed
+@@ -1697,7 +1697,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCa
+         # These env settings are only needed for Txn environment
+         self.env.set_lk_max_locks(25000)
+         self.env.set_lk_max_objects(25000)
+-        self.env.set_flags(db.DB_LOG_AUTOREMOVE, 1)  # clean up unused logs
++        self.env.set_flags(db.DB_LOG_AUTO_REMOVE, 1)  # clean up unused logs
+ 
+         # The DB_PRIVATE flag must go if we ever move to multi-user setup
+         env_flags = db.DB_CREATE | db.DB_PRIVATE |\