[arch-commits] Commit in python-whelk/trunk (PKGBUILD python-3.8.patch)

[Evangelos Foutras]

    Date: Wednesday, November 6, 2019 @ 15:49:02
  Author: foutrelis
Revision: 524403

Fix build with Python 3.8

Added:
  python-whelk/trunk/python-3.8.patch
Modified:
  python-whelk/trunk/PKGBUILD

------------------+
 PKGBUILD         |   11 +++++++++--
 python-3.8.patch |   15 +++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-06 15:43:06 UTC (rev 524402)
+++ PKGBUILD	2019-11-06 15:49:02 UTC (rev 524403)
@@ -8,9 +8,16 @@
 license=('custom:zlib')
 url="https://pypi.python.org/pypi/whelk"
 depends=('python')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/seveas/whelk/archive/$pkgver.tar.gz")
-sha512sums=('39b73ed09a0d2442cdde5b8bae72805571a172c6acfa3f652c8cb125d3a400f2538fe6534179f95383d321e8975b6127115616372c60c736e8cd8ceba00ef093')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/seveas/whelk/archive/$pkgver.tar.gz"
+        python-3.8.patch)
+sha512sums=('39b73ed09a0d2442cdde5b8bae72805571a172c6acfa3f652c8cb125d3a400f2538fe6534179f95383d321e8975b6127115616372c60c736e8cd8ceba00ef093'
+            'cb1f1cd86c78fce28e1515966547d66eaec9d474352b03710a83b5b4977cee650ee32501aea135c78a4065c40711ab9e8d32182ea770116c2b472fa94473ada9')
 
+prepare() {
+  cd whelk-$pkgver
+  patch -Np1 -i ../python-3.8.patch
+}
+
 build() {
   cd whelk-$pkgver
   python setup.py build

Added: python-3.8.patch
===================================================================
--- python-3.8.patch	                        (rev 0)
+++ python-3.8.patch	2019-11-06 15:49:02 UTC (rev 524403)
@@ -0,0 +1,15 @@
+diff -upr whelk-2.7.1.orig/whelk/subprocess_34.py whelk-2.7.1/whelk/subprocess_34.py
+--- whelk-2.7.1.orig/whelk/subprocess_34.py	2017-04-18 16:01:38.000000000 +0300
++++ whelk-2.7.1/whelk/subprocess_34.py	2019-11-06 17:46:00.946759802 +0200
+@@ -92,7 +92,10 @@ class Popen(subprocess.Popen):
+                         raise TimeoutExpired(self.args, orig_timeout)
+ 
+                     ready = selector.select(timeout)
+-                    self._check_timeout(endtime, orig_timeout)
++                    if sys.version_info[:2] >= (3,8):
++                        self._check_timeout(endtime, orig_timeout, stdout, stderr)
++                    else:
++                        self._check_timeout(endtime, orig_timeout)
+ 
+                     # XXX Rewrite these to use non-blocking I/O on the file
+                     # objects; they are no longer using C stdio!