tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Building thunderbird with python 3.10
In the interests of not having python3.9 installed on my system just
for building thunderbird I took a pass through to patch the old style
collections import to collections.abc ("New in version 3.3!")
We have a ... quite old version of thunderbird in pkgsrc, and I'm sure
this is all resolved in newer versions, but would anyone object to the
attached being committed?
David
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/thunderbird/Makefile,v
retrieving revision 1.287
diff -u -r1.287 Makefile
--- Makefile 23 Nov 2022 16:20:34 -0000 1.287
+++ Makefile 16 Dec 2022 09:37:30 -0000
@@ -2,7 +2,7 @@
DISTNAME= thunderbird-${TB_VER}.source
PKGNAME= thunderbird-${TB_VER}
-PKGREVISION= 9
+PKGREVISION= 10
TB_VER= 78.12.0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/thunderbird/distinfo,v
retrieving revision 1.252
diff -u -r1.252 distinfo
--- distinfo 7 Sep 2022 09:37:15 -0000 1.252
+++ distinfo 16 Dec 2022 09:37:30 -0000
@@ -32,7 +32,14 @@
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 2c07cd2361752c307b2a50599a000e41d054aff6
SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 20b208c5ab4bfea5d49d79c19fc610867da0c4c7
SHA1 (patch-old-configure.in) = 27d42da882af2325dd3a8d8f6c062e59ffdb4d78
+SHA1 (patch-python_mozbuild_mozbuild_backend_configenvironment.py) = 51d875da8aeb09e475bc92d06b5b9abf59511154
+SHA1 (patch-python_mozbuild_mozbuild_makeutil.py) = f86940dc191b5705d6cdc2bb8f1a3b17807bfacb
+SHA1 (patch-python_mozbuild_mozbuild_util.py) = 2ac10992b870174380dac94deb58ef980a63262f
SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = 0cbf185955c77c9438ced0c294fbc8e4824797bf
+SHA1 (patch-testing_mozbase_manifestparser_manifestparser_filters.py) = 242859960c93a82b9e04bd0296e395d0233343e0
+SHA1 (patch-third__party_python_gyp_pylib_gyp_common.py) = 1576d52520efc9e12d0b4a6b8eaa2ffb3e4b2c06
+SHA1 (patch-third__party_python_pyyaml_lib3_yaml_constructor.py) = 3a8fb5e383fe571e3c2201b1420b18245cec3097
+SHA1 (patch-third__party_python_voluptuous_voluptuous_schema__builder.py) = 6cd4b1f02830279e4727d4fb8b2d69bfb8759296
SHA1 (patch-third__party_rust_authenticator_.cargo-checksum.json) = 4a181138f3080b0e2203be1f8277f4ab2a584250
SHA1 (patch-third__party_rust_authenticator_src_lib.rs) = 7ae115c6fa9617d3c211207739e74d2eaee194e4
SHA1 (patch-third__party_rust_authenticator_src_netbsd_device.rs) = bcf69cdbcb471fa37b348176b5e368eccc7e50a9
Index: mozilla-common.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/thunderbird/mozilla-common.mk,v
retrieving revision 1.3
diff -u -r1.3 mozilla-common.mk
--- mozilla-common.mk 7 Nov 2022 00:55:15 -0000 1.3
+++ mozilla-common.mk 16 Dec 2022 09:37:30 -0000
@@ -6,7 +6,9 @@
.include "../../mk/bsd.prefs.mk"
-PYTHON_VERSIONS_ACCEPTED+= 39 38
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYTHON_VERSIONS_INCOMPATIBLE+= 311
+
PYTHON_FOR_BUILD_ONLY= tool
ALL_ENV+= PYTHON3=${PYTHONBIN}
Index: patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py
===================================================================
RCS file: patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py
diff -N patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py 16 Dec 2022 09:37:30 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Adjust for python 3.10
+
+--- python/mozbuild/mozbuild/backend/configenvironment.py.orig 2021-07-12 13:35:01.000000000 +0000
++++ python/mozbuild/mozbuild/backend/configenvironment.py
+@@ -9,7 +9,8 @@ import six
+ import sys
+ import json
+
+-from collections import Iterable, OrderedDict
++from collections import OrderedDict
++from collections.abc import Iterable
+ from types import ModuleType
+
+ import mozpack.path as mozpath
Index: patches/patch-python_mozbuild_mozbuild_makeutil.py
===================================================================
RCS file: patches/patch-python_mozbuild_mozbuild_makeutil.py
diff -N patches/patch-python_mozbuild_mozbuild_makeutil.py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-python_mozbuild_mozbuild_makeutil.py 16 Dec 2022 09:37:30 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adjust for python 3.10
+
+--- python/mozbuild/mozbuild/makeutil.py.orig 2021-07-12 13:35:01.000000000 +0000
++++ python/mozbuild/mozbuild/makeutil.py
+@@ -7,7 +7,7 @@ from __future__ import absolute_import,
+ import os
+ import re
+ import six
+-from collections import Iterable
++from collections.abc import Iterable
+
+
+ class Makefile(object):
Index: patches/patch-python_mozbuild_mozbuild_util.py
===================================================================
RCS file: patches/patch-python_mozbuild_mozbuild_util.py
diff -N patches/patch-python_mozbuild_mozbuild_util.py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-python_mozbuild_mozbuild_util.py 16 Dec 2022 09:37:30 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adjust for python 3.10
+
+--- python/mozbuild/mozbuild/util.py.orig 2021-07-12 13:35:01.000000000 +0000
++++ python/mozbuild/mozbuild/util.py
+@@ -782,7 +782,7 @@ class HierarchicalStringList(object):
+ self._strings = StrictOrderingOnAppendList()
+ self._children = {}
+
+- class StringListAdaptor(collections.Sequence):
++ class StringListAdaptor(collections.abc.Sequence):
+ def __init__(self, hsl):
+ self._hsl = hsl
+
Index: patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py
===================================================================
RCS file: patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py
diff -N patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py 16 Dec 2022 09:37:30 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Adjust for python 3.10
+
+--- testing/mozbase/manifestparser/manifestparser/filters.py.orig 2021-07-12 13:35:02.000000000 +0000
++++ testing/mozbase/manifestparser/manifestparser/filters.py
+@@ -12,7 +12,8 @@ from __future__ import absolute_import
+
+ import itertools
+ import os
+-from collections import defaultdict, MutableSequence
++from collections import defaultdict
++from collections.abc import MutableSequence
+
+ import six
+ from six import string_types
Index: patches/patch-third__party_python_gyp_pylib_gyp_common.py
===================================================================
RCS file: patches/patch-third__party_python_gyp_pylib_gyp_common.py
diff -N patches/patch-third__party_python_gyp_pylib_gyp_common.py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-third__party_python_gyp_pylib_gyp_common.py 16 Dec 2022 09:37:30 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adjust for python 3.10
+
+--- third_party/python/gyp/pylib/gyp/common.py.orig 2021-07-12 13:35:05.000000000 +0000
++++ third_party/python/gyp/pylib/gyp/common.py
+@@ -494,7 +494,7 @@ def uniquer(seq, idfun=None):
+
+
+ # Based on http://code.activestate.com/recipes/576694/.
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(collections.abc.MutableSet):
+ def __init__(self, iterable=None):
+ self.end = end = []
+ end += [None, end, end] # sentinel node for doubly linked list
Index: patches/patch-third__party_python_pyyaml_lib3_yaml_constructor.py
===================================================================
RCS file: patches/patch-third__party_python_pyyaml_lib3_yaml_constructor.py
diff -N patches/patch-third__party_python_pyyaml_lib3_yaml_constructor.py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-third__party_python_pyyaml_lib3_yaml_constructor.py 16 Dec 2022 09:37:30 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adjust for python 3.10
+
+--- third_party/python/pyyaml/lib3/yaml/constructor.py.orig 2021-07-12 13:35:05.000000000 +0000
++++ third_party/python/pyyaml/lib3/yaml/constructor.py
+@@ -123,7 +123,7 @@ class BaseConstructor:
+ mapping = {}
+ for key_node, value_node in node.value:
+ key = self.construct_object(key_node, deep=deep)
+- if not isinstance(key, collections.Hashable):
++ if not isinstance(key, collections.abc.Hashable):
+ raise ConstructorError("while constructing a mapping", node.start_mark,
+ "found unhashable key", key_node.start_mark)
+ value = self.construct_object(value_node, deep=deep)
Index: patches/patch-third__party_python_voluptuous_voluptuous_schema__builder.py
===================================================================
RCS file: patches/patch-third__party_python_voluptuous_voluptuous_schema__builder.py
diff -N patches/patch-third__party_python_voluptuous_voluptuous_schema__builder.py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-third__party_python_voluptuous_voluptuous_schema__builder.py 16 Dec 2022 09:37:30 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adjust for python 3.10
+
+--- third_party/python/voluptuous/voluptuous/schema_builder.py.orig 2021-07-12 13:35:05.000000000 +0000
++++ third_party/python/voluptuous/voluptuous/schema_builder.py
+@@ -280,7 +280,7 @@ class Schema(object):
+ return schema.__voluptuous_compile__(self)
+ if isinstance(schema, Object):
+ return self._compile_object(schema)
+- if isinstance(schema, collections.Mapping):
++ if isinstance(schema, collections.abc.Mapping):
+ return self._compile_dict(schema)
+ elif isinstance(schema, list):
+ return self._compile_list(schema)
Home |
Main Index |
Thread Index |
Old Index