diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:08:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:08:57 -0300 |
| commit | 1200fd46a32625f2ac4b035653cb49c22cce6426 (patch) | |
| tree | 0723ee124b40e6e95200ca002f9ae81361ab7919 /extra/python | |
| parent | 0d0d9e0930114504c15aa8174e2c7d1d2b7a6744 (diff) | |
| parent | fd115d7057eb8243df6edfaf1ed440d6f3e70692 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/iat/PKGBUILD
community/libnsbmp/PKGBUILD
community/libnsgif/PKGBUILD
community/libopenraw/PKGBUILD
community/netsurf/PKGBUILD
core/bison/PKGBUILD
core/perl/PKGBUILD
extra/avahi/PKGBUILD
extra/mutt/PKGBUILD
extra/php/PKGBUILD
Diffstat (limited to 'extra/python')
| -rw-r--r-- | extra/python/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/python/gdbm-magic-values.patch | 13 |
2 files changed, 25 insertions, 5 deletions
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index a29eaba92..1224a7799 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136999 2011-09-05 05:47:36Z allan $ +# $Id: PKGBUILD 143818 2011-11-29 13:33:44Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python pkgver=3.2.2 -pkgrel=1 +pkgrel=2 _pybasever=3.2 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64' 'mips64el') @@ -19,8 +19,10 @@ optdepends=('tk: for tkinter' 'sqlite3') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz + gdbm-magic-values.patch) +sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769' + '43bfbe3e23360f412b95cb284ff29b2cbe338be9') build() { cd "${srcdir}/Python-${pkgver}" @@ -28,6 +30,10 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + # gdbm has new magic that whichdb does not recognize + # http://bugs.python.org/issue13007 + patch -Np1 -i ../gdbm-magic-values.patch + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat @@ -54,6 +60,7 @@ build() { --with-valgrind \ --with-wide-unicode \ --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ --with-system-ffi fi @@ -63,7 +70,7 @@ build() { check() { cd "${srcdir}/Python-${pkgver}" LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site test_uuid } package() { diff --git a/extra/python/gdbm-magic-values.patch b/extra/python/gdbm-magic-values.patch new file mode 100644 index 000000000..e8ce828cf --- /dev/null +++ b/extra/python/gdbm-magic-values.patch @@ -0,0 +1,13 @@ +diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic Python-3.2.2/Lib/dbm/__init__.py +--- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic 2011-09-03 12:16:40.000000000 -0400 ++++ Python-3.2.2/Lib/dbm/__init__.py 2011-09-30 15:47:27.488863694 -0400 +@@ -166,7 +166,7 @@ def whichdb(filename): + return "" + + # Check for GNU dbm +- if magic == 0x13579ace: ++ if magic in (0x13579ace, 0x13579acd, 0x13579acf): + return "dbm.gnu" + + # Later versions of Berkeley db hash file have a 12-byte pad in +diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS |