From 9dda36e8d2016ad70149dc94ba41b71f96dee71d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 5 Feb 2019 17:37:23 +0000
Subject: python: update to 3.6.8

---
 abs/core/python/PKGBUILD    | 21 ++++++++++-----------
 abs/core/python/__changelog |  1 -
 2 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 abs/core/python/__changelog

diff --git a/abs/core/python/PKGBUILD b/abs/core/python/PKGBUILD
index 914da6b..5a3a401 100644
--- a/abs/core/python/PKGBUILD
+++ b/abs/core/python/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.6.4
-pkgrel=2
+pkgver=3.6.8
+pkgrel=1
 _pybasever=3.6
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('x86_64')
@@ -25,7 +25,7 @@ provides=('python3')
 replaces=('python3')
 source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
         dont-make-libpython-readonly.patch)
-sha512sums=('09ba2103ac517ac4d262f00380c9aac836a53401ce252540c17fd821a3b92e1ddf32528d00772221eb3126b12cb95b62c3ac3e852f4951e6f2eb406c88c848a2'
+sha512sums=('b17867e451ebe662f50df83ed112d3656c089e7d750651ea640052b01b713b58e66aac9e082f71fd16f5b5510bc9b797f5ccd30f5399581e9aa406197f02938a'
             'SKIP'
             '2ef96708d5b13ae2a3d2cc62c87b4780e60ecfce914e190564492def3a11d5e56977659f41c7f9d12266e58050c766bce4e2b5d50b708eb792794fa8357920c4')
 validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D')  # Ned Deily (Python release signing key) <nad@python.org>
@@ -66,16 +66,15 @@ build() {
               --without-ensurepip
 
   # Obtain next free server number for xvfb-run; this even works in a chroot environment.
-  #export servernum=99
-  #while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
+  export servernum=99
+  while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
 
-  #LC_CTYPE=en_US.UTF-8 xvfb-run -a -n "$servernum" make EXTRA_CFLAGS="$CFLAGS"
-  LC_CTYPE=en_US.UTF-8 make EXTRA_CFLAGS="$CFLAGS"
+  LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1280x720x24 -ac +extension GLX" -a -n "$servernum" make EXTRA_CFLAGS="$CFLAGS"
 }
 
 check() {
-  # test_gdb is expected to fail with LTO
-  # test_subprocess hangs on 3.6.3
+  # test_gdb is expected to fail with LTO~
+  # test_idle, test_tk, test_ttk_guionly segfaults on 3.6.5
 
   cd Python-${pkgver}
 
@@ -84,8 +83,8 @@ check() {
   while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
 
   LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-  LC_CTYPE=en_US.UTF-8 xvfb-run -a -n "$servernum" \
-    "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_gdb -x test_subprocess
+  LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1280x720x24 -ac +extension GLX" -a -n "$servernum" \
+    "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_gdb -x test_idle -x test_tk -x test_ttk_guionly
 }
 
 package() {
diff --git a/abs/core/python/__changelog b/abs/core/python/__changelog
deleted file mode 100644
index 33c291f..0000000
--- a/abs/core/python/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-PKGBUILD: don't use xvfb-run to make
-- 
cgit v0.12

