From da861e3c56396ad6563cc006245b9bfc681095c3 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Thu, 30 Jun 2016 12:00:12 +0200
Subject: [PATCH] python: update to 2.7.12

---
 .../files/Python-2.7.6-xcompile.patch          |  1 -
 srcpkgs/python-tkinter/files/cross.patch       |  1 +
 srcpkgs/python-tkinter/template                | 18 +++++++-----------
 ...Python-2.7.6-xcompile.patch => cross.patch} | 17 -----------------
 srcpkgs/python/template                        | 16 +++++++---------
 5 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 120000 srcpkgs/python-tkinter/files/Python-2.7.6-xcompile.patch
 create mode 120000 srcpkgs/python-tkinter/files/cross.patch
 rename srcpkgs/python/files/{Python-2.7.6-xcompile.patch => cross.patch} (85%)

diff --git a/srcpkgs/python-tkinter/files/Python-2.7.6-xcompile.patch b/srcpkgs/python-tkinter/files/Python-2.7.6-xcompile.patch
deleted file mode 120000
index 088a04bc274..00000000000
--- a/srcpkgs/python-tkinter/files/Python-2.7.6-xcompile.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../python/files/Python-2.7.6-xcompile.patch
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/cross.patch b/srcpkgs/python-tkinter/files/cross.patch
new file mode 120000
index 00000000000..c27b8a16c11
--- /dev/null
+++ b/srcpkgs/python-tkinter/files/cross.patch
@@ -0,0 +1 @@
+../../python/files/cross.patch
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index d553e0a8728..6e5d3f7b65a 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -4,8 +4,8 @@
 # A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
 #
 pkgname=python-tkinter
-version=2.7.11
-revision=2
+version=2.7.12
+revision=1
 wrksrc="Python-${version}"
 hostmakedepends="pkg-config"
 makedepends="
@@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.python.org"
 license="PSF"
 distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.xz"
-checksum=962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46
+checksum=d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978
 
 pre_configure() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -36,19 +36,15 @@ do_configure() {
 		mkdir -p ../hostpython
 		mv python ../hostpython
 		cd ..
-		patch -Np0 -i ${FILESDIR}/Python-2.7.6-xcompile.patch
+		patch -Np0 -i ${FILESDIR}/cross.patch
 	fi
 	./configure ${configure_args} \
-		--with-threads --enable-ipv6 --with-signal-module \
-		--with-system-ffi --enable-unicode=ucs4 --with-system-expat \
-		--with-wctype-functions --enable-shared \
-		ac_cv_file__dev_ptc=no ac_cv_file__dev_ptmx=yes \
-		ac_cv_have_long_long_format=yes
+		--enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
+		--with-computed-gotos --with-wctype-functions --with-system-expat \
+		--with-system-ffi --without-ensurepip
 }
 
 do_build() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
 	export PATH="$PATH:$wrksrc/hostpython"
 	make ${makejobs}
 }
diff --git a/srcpkgs/python/files/Python-2.7.6-xcompile.patch b/srcpkgs/python/files/cross.patch
similarity index 85%
rename from srcpkgs/python/files/Python-2.7.6-xcompile.patch
rename to srcpkgs/python/files/cross.patch
index bd6284f2663..04a20a75dad 100644
--- a/srcpkgs/python/files/Python-2.7.6-xcompile.patch
+++ b/srcpkgs/python/files/cross.patch
@@ -1,22 +1,5 @@
 --- Makefile.pre.in
 +++ Makefile.pre.in
-@@ -227,6 +227,7 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
- ##########################################################################
- # Parser
- PGEN=		Parser/pgen$(EXE)
-+PGEN=		Parser/pgen$(EXE)
- 
- PSRCS=		\
- 		Parser/acceler.c \
-@@ -593,7 +595,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule
- $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
- 		@$(MKDIR_P) Include
- 		$(MAKE) $(PGEN)
--		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
- $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
- 		$(MAKE) $(GRAMMAR_H)
- 		touch $(GRAMMAR_C)
 @@ -1000,12 +1002,12 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
  		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
  			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 1e43aac98b0..95b49180ecf 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
 #
 pkgname=python
-version=2.7.11
-revision=9
+version=2.7.12
+revision=1
 wrksrc="Python-${version}"
 hostmakedepends="pkg-config"
 makedepends="
@@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.python.org"
 license="PSF"
 distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.xz"
-checksum=962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46
+checksum=d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978
 
 alternatives="
  python:idle:/usr/bin/idle2.7
@@ -44,18 +44,16 @@ do_configure() {
 		mkdir -p ../hostpython
 		mv python ../hostpython
 		cd ..
-		patch -Np0 -i ${FILESDIR}/Python-2.7.6-xcompile.patch
+		patch -Np0 -i ${FILESDIR}/cross.patch
 		_args="--build=${XBPS_MACHINE%%-musl}"
 	fi
 	./configure ${configure_args} ${_args} \
-		--with-threads --enable-ipv6 --with-signal-module \
-		--with-system-ffi --enable-unicode=ucs4 --with-system-expat \
-		--with-wctype-functions --enable-shared
+		--enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
+		--with-computed-gotos --with-wctype-functions --with-system-expat \
+		--with-system-ffi --without-ensurepip
 }
 
 do_build() {
-	# Avoid invoking pgen for cross-compiles.
-	touch Include/graminit.h Python/graminit.c
 	export PATH="$PATH:$wrksrc/hostpython"
 	make ${makejobs}
 }