From nobody Wed Nov 17 12:35:10 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0BFA2189309A; Wed, 17 Nov 2021 12:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HvMp65Vm1z3Q5x; Wed, 17 Nov 2021 12:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 999CE21209; Wed, 17 Nov 2021 12:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AHCZAfp033599; Wed, 17 Nov 2021 12:35:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AHCZA1n033598; Wed, 17 Nov 2021 12:35:10 GMT (envelope-from git) Date: Wed, 17 Nov 2021 12:35:10 GMT Message-Id: <202111171235.1AHCZA1n033598@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: d8107994a297 - main - lang/spidermonkey78: fix build with python 3.10 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8107994a2970045df453f6e702925ffdf59c7cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8107994a2970045df453f6e702925ffdf59c7cb commit d8107994a2970045df453f6e702925ffdf59c7cb Author: Dmitry Marakasov AuthorDate: 2021-11-17 11:13:21 +0000 Commit: Dmitry Marakasov CommitDate: 2021-11-17 12:34:18 +0000 lang/spidermonkey78: fix build with python 3.10 Approved by: portmgr blanket --- ..._mozbuild_mozbuild_backend_configenvironment.py | 17 ++++++++++++++++ .../patch-python_mozbuild_mozbuild_makeutil.py | 16 +++++++++++++++ .../patch-python_mozbuild_mozbuild_pythonutil.py | 11 +++++++++++ .../files/patch-python_mozbuild_mozbuild_util.py | 23 ++++++++++++++++++++++ ...ozbase_manifestparser_manifestparser_filters.py | 17 ++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_backend_configenvironment.py b/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_backend_configenvironment.py new file mode 100644 index 000000000000..fd3d705fefbf --- /dev/null +++ b/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_backend_configenvironment.py @@ -0,0 +1,17 @@ +--- python/mozbuild/mozbuild/backend/configenvironment.py.orig 2021-03-15 15:52:37 UTC ++++ python/mozbuild/mozbuild/backend/configenvironment.py +@@ -9,8 +9,13 @@ import six + import sys + import json + +-from collections import Iterable, OrderedDict ++from collections import OrderedDict + from types import ModuleType ++ ++if sys.version.startswith('2'): ++ from collections import Iterable ++else: ++ from collections.abc import Iterable + + import mozpack.path as mozpath + diff --git a/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_makeutil.py b/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_makeutil.py new file mode 100644 index 000000000000..024e8e0c692f --- /dev/null +++ b/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_makeutil.py @@ -0,0 +1,16 @@ +--- python/mozbuild/mozbuild/makeutil.py.orig 2021-03-15 15:52:38 UTC ++++ python/mozbuild/mozbuild/makeutil.py +@@ -7,7 +7,12 @@ from __future__ import absolute_import, print_function + import os + import re + import six +-from collections import Iterable ++import sys ++ ++if sys.version.startswith('2'): ++ from collections import Iterable ++else: ++ from collections.abc import Iterable + + + class Makefile(object): diff --git a/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_pythonutil.py b/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_pythonutil.py new file mode 100644 index 000000000000..64a142ffd5bd --- /dev/null +++ b/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_pythonutil.py @@ -0,0 +1,11 @@ +--- python/mozbuild/mozbuild/pythonutil.py.orig 2021-03-15 15:52:37 UTC ++++ python/mozbuild/mozbuild/pythonutil.py +@@ -81,7 +81,7 @@ def _find_python_executable(major): + names = ['python%d' % major] + + # Look for `pythonX.Y` down to our minimum version. +- for minor in range(9, min_version.version[1] - 1, -1): ++ for minor in range(20, min_version.version[1] - 1, -1): + names.append('python%d.%d' % (major, minor)) + + for name in names: diff --git a/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_util.py b/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_util.py new file mode 100644 index 000000000000..3c5488327fd8 --- /dev/null +++ b/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_util.py @@ -0,0 +1,23 @@ +--- python/mozbuild/mozbuild/util.py.orig 2021-03-15 15:52:38 UTC ++++ python/mozbuild/mozbuild/util.py +@@ -27,6 +27,11 @@ from collections import ( + ) + from io import (BytesIO, StringIO) + ++if sys.version.startswith('2'): ++ from collections import Sequence ++else: ++ from collections.abc import Sequence ++ + import six + + if sys.platform == 'win32': +@@ -782,7 +787,7 @@ class HierarchicalStringList(object): + self._strings = StrictOrderingOnAppendList() + self._children = {} + +- class StringListAdaptor(collections.Sequence): ++ class StringListAdaptor(Sequence): + def __init__(self, hsl): + self._hsl = hsl + diff --git a/lang/spidermonkey78/files/patch-testing_mozbase_manifestparser_manifestparser_filters.py b/lang/spidermonkey78/files/patch-testing_mozbase_manifestparser_manifestparser_filters.py new file mode 100644 index 000000000000..c445d477852c --- /dev/null +++ b/lang/spidermonkey78/files/patch-testing_mozbase_manifestparser_manifestparser_filters.py @@ -0,0 +1,17 @@ +--- testing/mozbase/manifestparser/manifestparser/filters.py.orig 2021-03-15 15:52:38 UTC ++++ testing/mozbase/manifestparser/manifestparser/filters.py +@@ -12,7 +12,13 @@ from __future__ import absolute_import + + import itertools + import os +-from collections import defaultdict, MutableSequence ++import sys ++from collections import defaultdict ++ ++if sys.version.startswith('2'): ++ from collections import MutableSequence ++else: ++ from collections.abc import MutableSequence + + import six + from six import string_types