CVS commit: pkgsrc/mail/thunderbird

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Tue Dec 27 20:08:45 UTC 2022

Modified Files:
        pkgsrc/mail/thunderbird: Makefile distinfo mozilla-common.mk
Added Files:
        pkgsrc/mail/thunderbird/patches:
            patch-python_mozbuild_mozbuild_backend_configenvironment.py
            patch-python_mozbuild_mozbuild_makeutil.py
            patch-python_mozbuild_mozbuild_util.py
            patch-testing_mozbase_manifestparser_manifestparser_filters.py
            patch-third__party_python_gyp_pylib_gyp_common.py
            patch-third__party_python_pyyaml_lib3_yaml_constructor.py
            patch-third__party_python_voluptuous_voluptuous_schema__builder.py

Log Message:
Update to build with python 3.10

Previously max version was 3.9.

Hopefully at some point someone will have the time to upgrade pkgsrc
to a newer version of thunderbird, but in the meantime...


To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 pkgsrc/mail/thunderbird/Makefile
cvs rdiff -u -r1.252 -r1.253 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/thunderbird/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py \
    pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_makeutil.py \
    pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_util.py \
    pkgsrc/mail/thunderbird/patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py \
    pkgsrc/mail/thunderbird/patches/patch-third__party_python_gyp_pylib_gyp_common.py \
    pkgsrc/mail/thunderbird/patches/patch-third__party_python_pyyaml_lib3_yaml_constructor.py \
    pkgsrc/mail/thunderbird/patches/patch-third__party_python_voluptuous_voluptuous_schema__builder.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/thunderbird/Makefile
diff -u pkgsrc/mail/thunderbird/Makefile:1.287 pkgsrc/mail/thunderbird/Makefile:1.288
--- pkgsrc/mail/thunderbird/Makefile:1.287      Wed Nov 23 16:20:34 2022
+++ pkgsrc/mail/thunderbird/Makefile    Tue Dec 27 20:08:45 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.287 2022/11/23 16:20:34 adam Exp $
+# $NetBSD: Makefile,v 1.288 2022/12/27 20:08:45 abs Exp $
 
 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: pkgsrc/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.252 pkgsrc/mail/thunderbird/distinfo:1.253
--- pkgsrc/mail/thunderbird/distinfo:1.252      Wed Sep  7 09:37:15 2022
+++ pkgsrc/mail/thunderbird/distinfo    Tue Dec 27 20:08:45 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.252 2022/09/07 09:37:15 pho Exp $
+$NetBSD: distinfo,v 1.253 2022/12/27 20:08:45 abs Exp $
 
 BLAKE2s (thunderbird-78.12.0.source.tar.xz) = a16874486907a6f374d61c016d43258ed1765669bdef665610b46e796f28faf9
 SHA512 (thunderbird-78.12.0.source.tar.xz) = 8a9275f6a454b16215e9440d8b68926e56221dbb416f77ea0cd0a42853bdd26f35514e792564879c387271bd43d8ee966577f133f8ae7781f43e8bec9ab78696
@@ -32,7 +32,14 @@ SHA1 (patch-media_libvorbis_lib_vorbis__
 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: pkgsrc/mail/thunderbird/mozilla-common.mk
diff -u pkgsrc/mail/thunderbird/mozilla-common.mk:1.3 pkgsrc/mail/thunderbird/mozilla-common.mk:1.4
--- pkgsrc/mail/thunderbird/mozilla-common.mk:1.3       Mon Nov  7 00:55:15 2022
+++ pkgsrc/mail/thunderbird/mozilla-common.mk   Tue Dec 27 20:08:45 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.3 2022/11/07 00:55:15 gutteridge Exp $
+# $NetBSD: mozilla-common.mk,v 1.4 2022/12/27 20:08:45 abs Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -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}
 

Added files:

Index: pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py:1.1
--- /dev/null   Tue Dec 27 20:08:45 2022
+++ pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py Tue Dec 27 20:08:45 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-python_mozbuild_mozbuild_backend_configenvironment.py,v 1.1 2022/12/27 20:08:45 abs Exp $
+
+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: pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_makeutil.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_makeutil.py:1.1
--- /dev/null   Tue Dec 27 20:08:45 2022
+++ pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_makeutil.py  Tue Dec 27 20:08:45 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_mozbuild_mozbuild_makeutil.py,v 1.1 2022/12/27 20:08:45 abs Exp $
+
+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: pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_util.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_util.py:1.1
--- /dev/null   Tue Dec 27 20:08:45 2022
+++ pkgsrc/mail/thunderbird/patches/patch-python_mozbuild_mozbuild_util.py      Tue Dec 27 20:08:45 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_mozbuild_mozbuild_util.py,v 1.1 2022/12/27 20:08:45 abs Exp $
+
+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: pkgsrc/mail/thunderbird/patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py:1.1
--- /dev/null   Tue Dec 27 20:08:45 2022
+++ pkgsrc/mail/thunderbird/patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py      Tue Dec 27 20:08:45 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-testing_mozbase_manifestparser_manifestparser_filters.py,v 1.1 2022/12/27 20:08:45 abs Exp $
+
+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: pkgsrc/mail/thunderbird/patches/patch-third__party_python_gyp_pylib_gyp_common.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_python_gyp_pylib_gyp_common.py:1.1
--- /dev/null   Tue Dec 27 20:08:45 2022
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_python_gyp_pylib_gyp_common.py   Tue Dec 27 20:08:45 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-third__party_python_gyp_pylib_gyp_common.py,v 1.1 2022/12/27 20:08:45 abs Exp $
+
+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: pkgsrc/mail/thunderbird/patches/patch-third__party_python_pyyaml_lib3_yaml_constructor.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_python_pyyaml_lib3_yaml_constructor.py:1.1
--- /dev/null   Tue Dec 27 20:08:45 2022
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_python_pyyaml_lib3_yaml_constructor.py   Tue Dec 27 20:08:45 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-third__party_python_pyyaml_lib3_yaml_constructor.py,v 1.1 2022/12/27 20:08:45 abs Exp $
+
+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: pkgsrc/mail/thunderbird/patches/patch-third__party_python_voluptuous_voluptuous_schema__builder.py
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-third__party_python_voluptuous_voluptuous_schema__builder.py:1.1
--- /dev/null   Tue Dec 27 20:08:45 2022
+++ pkgsrc/mail/thunderbird/patches/patch-third__party_python_voluptuous_voluptuous_schema__builder.py  Tue Dec 27 20:08:45 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-third__party_python_voluptuous_voluptuous_schema__builder.py,v 1.1 2022/12/27 20:08:45 abs Exp $
+
+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)