summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-04-12 13:51:23 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-04-12 13:51:23 -0300
commit0338cb3f158d0bc7a065412794dcf8c2518d7590 (patch)
tree9642b1c93abdc2fe6930174eb94d6d0c84a7f352 /libre
parentb6b0f82368b9bf971005e44426bc9a758153d197 (diff)
python2-libre updated to sqlite
Diffstat (limited to 'libre')
-rw-r--r--libre/python2-libre/PKGBUILD19
-rw-r--r--libre/python2-libre/gdbm-magic-values.patch2
-rw-r--r--libre/python2-libre/linux2.patch1
3 files changed, 12 insertions, 10 deletions
diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD
index c4f09188d..e743151b0 100644
--- a/libre/python2-libre/PKGBUILD
+++ b/libre/python2-libre/PKGBUILD
@@ -6,22 +6,23 @@
_pkgname=python2
pkgname=python2-libre
pkgver=2.7.2
-pkgrel=4
+pkgrel=6
_pybasever=2.7
pkgdesc="A high-level scripting language"
arch=('i686' 'x86_64')
license=('PSF')
url="http://www.python.org/"
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
makedepends=('tk')
optdepends=('tk: for IDLE')
conflicts=('python<3')
options=('!makeflags')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-4-any.src.tar.xz
doc_license_change.patch
WDAS.patch
linux2.patch
- gdbm-magic-values.patch)
+ gdbm-magic-values.patch
+ 13156-revert-tls-changeset-subinterpreter.patch)
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
replaces=("$_pkgname")
@@ -33,7 +34,7 @@ build() {
# See http://bugs.python.org/issue10835 for upstream report
sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
- # Enable built-in SQLite3 module to load extensions (fix FS#22122)
+ # Enable built-in SQLite module to load extensions (fix FS#22122)
sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
# FS#23997
@@ -47,6 +48,9 @@ build() {
# http://bugs.python.org/issue13007
patch -Np1 -i ../gdbm-magic-values.patch
+ # http://bugs.python.org/issue13156
+ patch -Np1 -i ../13156-revert-tls-changeset-subinterpreter.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
@@ -100,5 +104,6 @@ package() {
md5sums=('456d053a5d418adc913a4971e95fe918'
'1e6595f85a1da7f42b69456119924d50'
'3f8c0e310a0be0bd8b319d6c46bbd427'
- '74c04694573e0d331e2a99d7b9179460'
- '2874e9d93f4f46c1460605a5c7751372')
+ '6099a7c1aed80cf04943ee4affa84b5c'
+ '6de394351179c2ada82e95458ceb13e5'
+ 'daa5110f092f1406c17de23171529e62')
diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch
index 5613ae35c..471faf2c7 100644
--- a/libre/python2-libre/gdbm-magic-values.patch
+++ b/libre/python2-libre/gdbm-magic-values.patch
@@ -10,5 +10,3 @@ diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py
return "gdbm"
# Check for old Berkeley db hash file format v2
-diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS
-
diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch
index 74ae2aa12..670510fde 100644
--- a/libre/python2-libre/linux2.patch
+++ b/libre/python2-libre/linux2.patch
@@ -21,4 +21,3 @@ diff --git a/configure.in b/configure.in
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
-