Merge branch 'master' of https://github.com/archlinuxarm/PKGBUILDs

extra/python/PKGBUILD

@@ -10,7 +10,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')
@@ -28,9 +28,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}"
@@ -41,6 +43,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