File bsddb3-db6.diff of Package python-bsddb3

Overview Repositories Revisions Requests Users Attributes Meta

File bsddb3-db6.diff of Package python-bsddb3 (Revision b47a73d24d40f231ff6580baa9319122)

Currently displaying revision b47a73d24d40f231ff6580baa9319122 , Show latest

From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-06-16 01:28:54.291797887 +0200

Have bsddb3 support BDB 6.0.

---
 Modules/_bsddb.c |   10 ++++++++++
 setup2.py        |    2 +-
 setup3.py        |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

Index: bsddb3-5.3.0/Modules/_bsddb.c
===================================================================
--- bsddb3-5.3.0.orig/Modules/_bsddb.c
+++ bsddb3-5.3.0/Modules/_bsddb.c
@@ -2659,10 +2659,15 @@ _default_cmp(const DBT *leftKey,
   return res;
 }
 
+#if DB_VERSION_MAJOR >= 6
+static int _db_compareCallback(DB *db, const DBT *leftKey, const DBT *rightKey,
+                               size_t *locp)
+#else
 static int
 _db_compareCallback(DB* db,
 		    const DBT *leftKey,
 		    const DBT *rightKey)
+#endif
 {
     int res = 0;
     PyObject *args;
@@ -2773,10 +2778,15 @@ DB_set_bt_compare(DBObject* self, PyObje
     RETURN_NONE();
 }
 
+#if DB_VERSION_MAJOR >= 6
+static int _db_dupCompareCallback(DB *db, const DBT *leftKey,
+                                  const DBT *rightKey, size_t *locp)
+#else
 static int
 _db_dupCompareCallback(DB* db,
 		    const DBT *leftKey,
 		    const DBT *rightKey)
+#endif
 {
     int res = 0;
     PyObject *args;
Index: bsddb3-5.3.0/setup2.py
===================================================================
--- bsddb3-5.3.0.orig/setup2.py
+++ bsddb3-5.3.0/setup2.py
@@ -128,7 +128,7 @@ if os.name == 'posix':
     incdir = libdir = None
     if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR:
         # Supported Berkeley DB versions, in order of preference.
-        db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0),
+        db_ver_list = ((6, 0), (5, 3), (5, 2), (5, 1), (5, 0),
                 (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3))
 
         # construct a list of paths to look for the header file in on
Index: bsddb3-5.3.0/setup3.py
===================================================================
--- bsddb3-5.3.0.orig/setup3.py
+++ bsddb3-5.3.0/setup3.py
@@ -128,7 +128,7 @@ if os.name == 'posix':
     incdir = libdir = None
     if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR:
         # Supported Berkeley DB versions, in order of preference.
-        db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0),
+        db_ver_list = ((6, 0), (5, 3), (5, 2), (5, 1), (5, 0),
                 (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3))
 
         # construct a list of paths to look for the header file in on

Places

File bsddb3-db6.diff of Package python-bsddb3 (Revision b47a73d24d40f231ff6580baa9319122)

Places