[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (74dbb8b2bc38e8b72f2ddc2ffdd8ccd6de46a984)

Treeve Jelbert scm at mail.sourcemage.org
Sun Nov 12 10:54:52 EST 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 devel/gambas2/DETAILS                |    4 +-
 devel/gambas2/HISTORY                |    3 +
 devel/python/BUILD                   |    2 -
 devel/python/DEPENDS                 |   10 +++++-
 devel/python/DETAILS                 |    1 
 devel/python/HISTORY                 |    9 +++++
 devel/python/PRE_BUILD               |    4 ++
 devel/python/python-2.5.0-db45.patch |   53 +++++++++++++++++++++++++++++++++++
 devel/python/setup.patch             |   20 +++++++++++++
 9 files changed, 102 insertions(+), 4 deletions(-)

New commits:
commit e16ef859964f51b6dad0af6ef36bf4bb93794f24
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    python - fix db support

commit a2628c01b838d1ee768576074234ec8fd4cea462
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    gambas2-1.9.4

diff --git a/devel/gambas2/DETAILS b/devel/gambas2/DETAILS
index ec3a700..dfe15cd 100755
--- a/devel/gambas2/DETAILS
+++ b/devel/gambas2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gambas2
-         VERSION=1.9.45
-     SOURCE_HASH=sha512:b2fadf7d468b4ddc76e54c6ff4883026f9dfc909134641639c4ce588d18300b0fed7abc061e0d4ee34bc2f89119eb730238f6136d17e8e1fa7c4d5f52b2b1487
+         VERSION=1.9.46
+     SOURCE_HASH=sha512:f337f72d3ad6a9b9cb435daaa1febee6bd374f7682913b817338d66cfc8be57ef5e2933b4db9575711ca838d8b5fa9d5203ccc875ab8a99e1fbb46b508b6a2d9
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL//2/}/$SOURCE
diff --git a/devel/gambas2/HISTORY b/devel/gambas2/HISTORY
index ceb0486..8675cbe 100644
--- a/devel/gambas2/HISTORY
+++ b/devel/gambas2/HISTORY
@@ -1,3 +1,6 @@
+2006-11-12 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 1.9.46
+
 2006-10-29 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 1.9.45
 
diff --git a/devel/python/BUILD b/devel/python/BUILD
index d9a0b21..19eccba 100755
--- a/devel/python/BUILD
+++ b/devel/python/BUILD
@@ -1,6 +1,6 @@
 export OPT="$CFLAGS"
 export OPTS="$OPTS --enable-shared --enable-unicode"
-sedit "s/\['ndbm'\]/\['ndbm', 'gdbm_compat'\]/g" setup.py &&
+#sedit "s/\['ndbm'\]/\['ndbm', 'gdbm_compat'\]/g" setup.py &&
 
 # The following file from kdebindings has a syntax error that
 # makes Python compilation fail
diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index 94591d0..4b19b76 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -1,4 +1,12 @@
-depends  db  &&
+optional_depends  db                \
+                  ""                \
+                  ""                \
+                  "Sleepcat db support" &&
+
+optional_depends  sqlite            \
+                  ""                \
+                  ""                \
+                  "sqlite db support"&&
 
 optional_depends  tk                \
                   ""                \
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index 8f3a3fb..6638edc 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Python
          ENTERED=20010922
       LICENSE[0]=PYTHON
   SECURITY_PATCH=1
+      PATCHLEVEL=1
         KEYWORDS="devel"
            SHORT="Interpreted, interactive, object-oriented language"
 cat << EOF
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 0ed9b04..1d973be 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,12 @@
+2006-11-12 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD, python-2.5.0-db45.patch, setup.patch: added
+	  fix build of db interface for db-4.5.20
+	  see python bug #1571754
+	* BUILD: remove sedit for ndbm
+	* DEPENDS: db is optional
+	  add sqlite
+
 2006-11-08 Flavien Bridault <vlaaad at sourcemage.org>
 	* UP_TRIGGERS: added, recompiles dependent spells on minor upgrades
 	* INSTALL: Fix destination path
diff --git a/devel/python/PRE_BUILD b/devel/python/PRE_BUILD
new file mode 100755
index 0000000..8e771a6
--- /dev/null
+++ b/devel/python/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+patch  -p0 < $SPELL_DIRECTORY/setup.patch             &&
+patch  -p1 < $SPELL_DIRECTORY/python-2.5.0-db45.patch
diff --git a/devel/python/python-2.5.0-db45.patch b/devel/python/python-2.5.0-db45.patch
new file mode 100644
index 0000000..8c1cd3e
--- /dev/null
+++ b/devel/python/python-2.5.0-db45.patch
@@ -0,0 +1,53 @@
+Patch by Robert Scheck <robert-scheck at users.sourceforge.net> for python >= 2.5.0,
+which fixes python for building using Oracle/Sleepycat db 4.5.20.
+
+--- Python-2.5/Modules/_bsddb.c			2006-10-05 23:06:30.000000000 +0200
++++ Python-2.5/Modules/_bsddb.c.db45		2006-10-07 20:55:45.000000000 +0200
+@@ -4129,6 +4129,8 @@
+ }
+ 
+ 
++#if (DBVER < 45)
++
+ static PyObject*
+ DBEnv_set_lk_max(DBEnvObject* self, PyObject* args)
+ {
+@@ -4145,6 +4147,8 @@
+     RETURN_NONE();
+ }
+ 
++#endif
++
+ 
+ #if (DBVER >= 32)
+ 
+@@ -5233,7 +5237,9 @@
+     {"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS},
+ #endif
+     {"set_lk_detect",   (PyCFunction)DBEnv_set_lk_detect,    METH_VARARGS},
++#if (DBVER < 45)
+     {"set_lk_max",      (PyCFunction)DBEnv_set_lk_max,       METH_VARARGS},
++#endif
+ #if (DBVER >= 32)
+     {"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS},
+     {"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS},
+@@ -5835,7 +5841,9 @@
+     ADD_INT(d, DB_AFTER);
+     ADD_INT(d, DB_APPEND);
+     ADD_INT(d, DB_BEFORE);
++#if (DBVER < 45)
+     ADD_INT(d, DB_CACHED_COUNTS);
++#endif
+ #if (DBVER >= 41)
+     _addIntToDict(d, "DB_CHECKPOINT", 0);
+ #else
+@@ -5870,7 +5878,9 @@
+     ADD_INT(d, DB_POSITION);
+     ADD_INT(d, DB_PREV);
+     ADD_INT(d, DB_PREV_NODUP);
++#if (DBVER < 45)
+     ADD_INT(d, DB_RECORDCOUNT);
++#endif
+     ADD_INT(d, DB_SET);
+     ADD_INT(d, DB_SET_RANGE);
+     ADD_INT(d, DB_SET_RECNO);
diff --git a/devel/python/setup.patch b/devel/python/setup.patch
new file mode 100644
index 0000000..345c71e
--- /dev/null
+++ b/devel/python/setup.patch
@@ -0,0 +1,20 @@
+--- setup.py	2006-08-10 01:42:18.000000000 +0200
++++ setup.py.cp	2006-11-12 16:28:45.000000000 +0100
+@@ -606,7 +606,7 @@
+         # a release.  Most open source OSes come with one or more
+         # versions of BerkeleyDB already installed.
+ 
+-        max_db_ver = (4, 4)
++        max_db_ver = (4, 5)
+         min_db_ver = (3, 3)
+         db_setup_debug = False   # verbose debug prints from this script?
+ 
+@@ -623,7 +623,7 @@
+             '/sw/include/db3',
+         ]
+         # 4.x minor number specific paths
+-        for x in (0,1,2,3,4):
++        for x in (0,1,2,3,4,5):
+             db_inc_paths.append('/usr/include/db4%d' % x)
+             db_inc_paths.append('/usr/include/db4.%d' % x)
+             db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)



More information about the SM-Commit mailing list