[arch-commits] CVS update of extra/devel/python24 (3 files)

[andyrtr at archlinux.org]

    Date: Saturday, September 29, 2007 @ 08:32:58
  Author: andyrtr
    Path: /home/cvs-extra/extra/devel/python24

   Added: db4.6-setup.py-detection.patch (1.1) db_fix.patch (1.1)
Modified: PKGBUILD (1.2 -> 1.3)

rebuild for new db


--------------------------------+
 PKGBUILD                       |   21 +++++++---------
 db4.6-setup.py-detection.patch |   20 +++++++++++++++
 db_fix.patch                   |   50 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 11 deletions(-)


Index: extra/devel/python24/PKGBUILD
diff -u extra/devel/python24/PKGBUILD:1.2 extra/devel/python24/PKGBUILD:1.3
--- extra/devel/python24/PKGBUILD:1.2	Sun Mar 18 07:37:13 2007
+++ extra/devel/python24/PKGBUILD	Sat Sep 29 08:32:58 2007
@@ -1,24 +1,23 @@
-# $Id: PKGBUILD,v 1.2 2007/03/18 11:37:13 tpowa Exp $
+# $Id: PKGBUILD,v 1.3 2007/09/29 12:32:58 andyrtr Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 pkgname=python24
 pkgver=2.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A high-level scripting language"
 arch=(i686 x86_64)
 url="http://www.python.org"
-depends=('db>=4.5' 'bzip2' 'gdbm' 'openssl' 'zlib')
+depends=('db>=4.6' 'bzip2' 'gdbm' 'openssl' 'zlib' 'gcc-libs' 'readline')
 makedepends=('tk')
-source=(http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.bz2)
-md5sums=('0ba90c79175c017101100ebf5978e906' )
+source=(http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.bz2 db4.6-setup.py-detection.patch db_fix.patch)
+md5sums=('0ba90c79175c017101100ebf5978e906'
+         '437410b4d9b8889e26d70182527ea110'
+         '1c178479d17ae1e59cccb0a3f7be043b')
+options=('!makeflags')
 
 build() {
   cd $startdir/src/Python-$pkgver
-
-# reverting it - breaks too much
-#if [ "$CARCH" = "x86_64" ]; then
-#  patch -Np1 -i ../python-Py_ssize_t.patch || return 1
-#fi
-
+  patch -Np0 -i ../db4.6-setup.py-detection.patch || return 1
+  patch -Np0 -i ../db_fix.patch || return 1
   ./configure --prefix=/usr --enable-shared --with-threads --enable-unicode
   # This is supposed to be the previous version's python directory
   #  NOT the current one
Index: extra/devel/python24/db4.6-setup.py-detection.patch
diff -u /dev/null extra/devel/python24/db4.6-setup.py-detection.patch:1.1
--- /dev/null	Sat Sep 29 08:32:58 2007
+++ extra/devel/python24/db4.6-setup.py-detection.patch	Sat Sep 29 08:32:58 2007
@@ -0,0 +1,20 @@
+--- setup.py	2006-10-08 19:41:25.000000000 +0200
++++ setup.py.new	2007-09-29 13:47:50.000000000 +0200
+@@ -522,7 +522,7 @@
+         #
+         # http://www.sleepycat.com/update/index.html
+ 
+-        max_db_ver = (4, 4)
++        max_db_ver = (4, 6)
+         min_db_ver = (3, 2)
+         db_setup_debug = False   # verbose debug prints from this script?
+ 
+@@ -539,7 +539,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,6):
+             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)
Index: extra/devel/python24/db_fix.patch
diff -u /dev/null extra/devel/python24/db_fix.patch:1.1
--- /dev/null	Sat Sep 29 08:32:58 2007
+++ extra/devel/python24/db_fix.patch	Sat Sep 29 08:32:58 2007
@@ -0,0 +1,50 @@
+Index: Modules/_bsddb.c
+===================================================================
+--- Modules/_bsddb.c	(revision 57077)
++++ Modules/_bsddb.c	(working copy)
+@@ -3831,6 +3831,7 @@
+ }
+ 
+ 
++#if (DBVER < 45)
+ static PyObject*
+ DBEnv_set_lk_max(DBEnvObject* self, PyObject* args)
+ {
+@@ -3846,6 +3847,7 @@
+     RETURN_IF_ERR();
+     RETURN_NONE();
+ }
++#endif
+ 
+ 
+ #if (DBVER >= 32)
+@@ -4532,7 +4534,9 @@
+     {"set_lg_dir",      (PyCFunction)DBEnv_set_lg_dir,       METH_VARARGS},
+     {"set_lg_max",      (PyCFunction)DBEnv_set_lg_max,       METH_VARARGS},
+     {"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},
+@@ -5039,7 +5043,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
+@@ -5074,7 +5080,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);
\ No newline at end of file