summaryrefslogtreecommitdiff
path: root/extra/python/PKGBUILD
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-04-28 03:53:49 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-04-28 03:53:49 +0000
commit84fbb975eaab5e85082b96147a85031f1912646e (patch)
tree949477c713b1abae66611dace0e2b4d6a4f62f19 /extra/python/PKGBUILD
parent4534f7b3a3b58171148c3c50d6d067b3ae069b9e (diff)
Mon Apr 28 03:48:05 UTC 2014
Diffstat (limited to 'extra/python/PKGBUILD')
-rw-r--r--extra/python/PKGBUILD17
1 files changed, 12 insertions, 5 deletions
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 9c658ee23..56a86041f 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 208835 2014-03-27 14:43:22Z fyan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# $Id: PKGBUILD 211814 2014-04-27 16:13:15Z fyan $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=python
pkgver=3.4.0
-pkgrel=2
+pkgrel=3
_pybasever=3.4
pkgdesc="Next generation of the python high-level scripting language"
arch=('i686' 'x86_64')
@@ -24,9 +25,11 @@ options=('!makeflags')
provides=('python3')
replaces=('python3')
source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
- python3.4-test_sqlite.patch::http://hg.python.org/cpython/raw-rev/4d626a9df062)
+ python3.4-test_sqlite.patch::http://hg.python.org/cpython/raw-rev/4d626a9df062
+ issue21207.patch::http://hg.python.org/cpython/raw-rev/a66524ce9551)
sha1sums=('f54d7cf6af5dbd9bddbe31cf4772f39711381dbe'
- 'b13a0b728d8e1fe1d81dea501b064cb1032f183b')
+ 'b13a0b728d8e1fe1d81dea501b064cb1032f183b'
+ '67486ae413698d6bd3c32de10a9a1e885d0097b8')
prepare() {
cd "${srcdir}/Python-${pkgver}"
@@ -37,6 +40,10 @@ prepare() {
# http://bugs.python.org/issue20901
patch -p1 -i "$srcdir/python3.4-test_sqlite.patch"
+ # http://bugs.python.org/issue21207 FS#40108
+ sed -i "62,74d" "$srcdir/issue21207.patch" # Remove conflicting NEWS part
+ patch -p1 -i "$srcdir/issue21207.patch"
+
# Ensure that we are using the system copy of various libraries (expat, zlib, libffi, and libmpdec),
# rather than copies shipped in the tarball
rm -r Modules/expat