[arch-commits] Commit in python/trunk (PKGBUILD)

[Felix Yan]

    Date: Sunday, April 27, 2014 @ 18:12:06
  Author: fyan
Revision: 211813

upgpkg: python 3.4.0-3

- add upstream fix for FS#40108

Modified:
  python/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-27 13:51:04 UTC (rev 211812)
+++ PKGBUILD	2014-04-27 16:12:06 UTC (rev 211813)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org> 
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at gmail.com>
 # Contributor: Stéphane Gaudreault <stephane at archlinux.org>
 # Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: Jason Chu <jason at archlinux.org>
@@ -6,7 +7,7 @@
 
 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 @@
 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 @@
   # 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