Added python 3.10 patch because of failing ImportError: cannot import name 'Iterable' from 'collections'

This commit is contained in:
Jan Horak 2021-07-27 08:17:44 +02:00
parent fe7bcca8e8
commit d996b693ea
2 changed files with 18 additions and 0 deletions

12
build-python3.10.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up thunderbird-78.12.0/python/mach/mach/main.py.python3.10 thunderbird-78.12.0/python/mach/mach/main.py
--- thunderbird-78.12.0/python/mach/mach/main.py.python3.10 2021-07-27 08:10:52.680466611 +0200
+++ thunderbird-78.12.0/python/mach/mach/main.py 2021-07-27 08:11:17.377561233 +0200
@@ -16,7 +16,7 @@ import os
import sys
import traceback
import uuid
-from collections import Iterable
+from collections.abc import Iterable
from six import string_types

View File

@ -119,6 +119,7 @@ Patch417: build-aarch64-user_vfp.patch
Patch418: mozilla-1512162.patch
Patch419: bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch
Patch103: rhbz-1219542-s390-build.patch
Patch104: build-python3.10.patch
# PPC fix
Patch304: mozilla-1245783.patch
@ -263,6 +264,11 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%patch103 -p1 -b .rhbz-1219542-s390-build
%endif
%if 0%{?fedora} >= 35
# since python3.10 we need to use `from collections.abc` instead of `from collections`.
%patch104 -p1 -b .python3.10
%endif
%patch304 -p1 -b .1245783
# Patch for big endian platforms only
#%if 0%{?big_endian}