Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8368 from neheb/p

Browse source 
python: Refresh patches
This commit is contained in:
Hannu Nyman 2019-03-12 19:06:18 +02:00 committed by GitHub
commit 840d05eb8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/python/python/patches/001-enable-zlib.patch
View file

@ -17,4 +17,4 @@ Subject: [PATCH] enable zlib
+zlib zlibmodule.c -lz +zlib zlibmodule.c -lz
# Interface to the Expat XML parser # Interface to the Expat XML parser
# # More information on Expat can be found at www.libexpat.org.

6
lang/python/python/patches/005-fix-bluetooth-support.patch
View file

@ -1,6 +1,6 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -7077,7 +7077,7 @@ sys/param.h sys/poll.h sys/random.h sys/ @@ -7084,7 +7084,7 @@ sys/param.h sys/poll.h sys/random.h sys/
sys/termio.h sys/time.h \ sys/termio.h sys/time.h \
sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \ sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
@ -9,7 +9,7 @@
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -7299,6 +7299,24 @@ fi @@ -7306,6 +7306,24 @@ fi
fi fi
@ -36,7 +36,7 @@
do : do :
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1732,10 +1732,17 @@ sys/param.h sys/poll.h sys/random.h sys/ @@ -1739,10 +1739,17 @@ sys/param.h sys/poll.h sys/random.h sys/
sys/termio.h sys/time.h \ sys/termio.h sys/time.h \
sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \ sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \

6
lang/python/python/patches/011-fix-ssl-build-use-have-npn.patch
View file

@ -1,8 +1,6 @@
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index a96c419260..c80437eef7 100644
--- a/Modules/_ssl.c --- a/Modules/_ssl.c
+++ b/Modules/_ssl.c +++ b/Modules/_ssl.c
@@ -1586,7 +1586,7 @@ static PyObject *PySSL_version(PySSLSocket *self) @@ -1590,7 +1590,7 @@ static PyObject *PySSL_version(PySSLSocket *self)
return PyUnicode_FromString(version); return PyUnicode_FromString(version);
} }
@ -11,7 +9,7 @@ index a96c419260..c80437eef7 100644
static PyObject *PySSL_selected_npn_protocol(PySSLSocket *self) { static PyObject *PySSL_selected_npn_protocol(PySSLSocket *self) {
const unsigned char *out; const unsigned char *out;
unsigned int outlen; unsigned int outlen;
@@ -2114,7 +2114,7 @@ static PyMethodDef PySSLMethods[] = { @@ -2118,7 +2118,7 @@ static PyMethodDef PySSLMethods[] = {
PySSL_peercert_doc}, PySSL_peercert_doc},
{"cipher", (PyCFunction)PySSL_cipher, METH_NOARGS}, {"cipher", (PyCFunction)PySSL_cipher, METH_NOARGS},
{"version", (PyCFunction)PySSL_version, METH_NOARGS}, {"version", (PyCFunction)PySSL_version, METH_NOARGS},

4
lang/python/python/patches/017_lib2to3_fix_pyc_search.patch
View file

@ -1,8 +1,6 @@
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
index 7841b99..1e0d3b3 100644
--- a/Lib/lib2to3/refactor.py --- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py
@@ -37,6 +37,12 @@ def get_all_fix_names(fixer_pkg, remove_prefix=True): @@ -40,6 +40,12 @@ def get_all_fix_names(fixer_pkg, remove_prefix=True):
if remove_prefix: if remove_prefix:
name = name[4:] name = name[4:]
fix_names.append(name[:-3]) fix_names.append(name[:-3])