CVS commit: pkgsrc/lang/mozjs78

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 16 10:20:40 UTC 2024

Modified Files:
        pkgsrc/lang/mozjs78: Makefile distinfo
Added Files:
        pkgsrc/lang/mozjs78/patches: patch-python_mach_mach_decorators.py
            patch-python_mach_mach_main.py
            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

Log Message:
mozjs78: Unbreak. Port to Python 3.10.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/mozjs78/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/mozjs78/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mozjs78/patches/patch-python_mach_mach_decorators.py \
    pkgsrc/lang/mozjs78/patches/patch-python_mach_mach_main.py \
    pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py \
    pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_makeutil.py \
    pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_util.py \
    pkgsrc/lang/mozjs78/patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py

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

Modified files:

Index: pkgsrc/lang/mozjs78/Makefile
diff -u pkgsrc/lang/mozjs78/Makefile:1.37 pkgsrc/lang/mozjs78/Makefile:1.38
--- pkgsrc/lang/mozjs78/Makefile:1.37   Thu Aug 15 22:03:10 2024
+++ pkgsrc/lang/mozjs78/Makefile        Fri Aug 16 10:20:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2024/08/15 22:03:10 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2024/08/16 10:20:40 nia Exp $
 
 DISTNAME=      mozjs78_78.15.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
@@ -68,8 +68,7 @@ SUBST_VARS.conf=      PREFIX
 PKGCONFIG_OVERRIDE+=   js/src/build/js.pc.in
 PKGCONFIG_OVERRIDE+=   js/src/ctypes/libffi/libffi.pc.in
 
-BROKEN=                "Needs porting to Python 3.10+"
-#PYTHON_VERSIONS_ACCEPTED=     39 38
+PYTHON_VERSIONS_ACCEPTED=      310
 PYTHON_FOR_BUILD_ONLY=         tool
 
 TEST_DEPENDS+=                 ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six

Index: pkgsrc/lang/mozjs78/distinfo
diff -u pkgsrc/lang/mozjs78/distinfo:1.17 pkgsrc/lang/mozjs78/distinfo:1.18
--- pkgsrc/lang/mozjs78/distinfo:1.17   Mon Jun 10 12:22:09 2024
+++ pkgsrc/lang/mozjs78/distinfo        Fri Aug 16 10:20:40 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2024/06/10 12:22:09 jperkin Exp $
+$NetBSD: distinfo,v 1.18 2024/08/16 10:20:40 nia Exp $
 
 BLAKE2s (mozjs78_78.15.0.orig.tar.xz) = 43b4d26d730a5b83732d4fad782940f74fa15251aa9d60c39b56237134c95efe
 SHA512 (mozjs78_78.15.0.orig.tar.xz) = 709e60765b93db4ce8cd6fe21f7ed52d3a53806eb096a46dd42847014c56c0329a2a14a19bfe5ca989ccd6fd62992aee7232baaeca02cff4dafb46a9f33e041b
@@ -20,3 +20,9 @@ SHA1 (patch-js_src_vm_JSONPrinter.cpp) =
 SHA1 (patch-js_src_vm_JSONPrinter.h) = b9f67b29b16d7163aecc0ce9b6939c1308878a44
 SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = 3517e5da142355f1cbe89facaad47953f1985800
 SHA1 (patch-mfbt_tests_TestVariant.cpp) = 586fb67335b497ccadd3960025c44f8630f5476a
+SHA1 (patch-python_mach_mach_decorators.py) = 4a370fe449c24f22a67e8f7041806117f522a35e
+SHA1 (patch-python_mach_mach_main.py) = 2bfa97a7770c93341c0b7bba216950da7b298b39
+SHA1 (patch-python_mozbuild_mozbuild_backend_configenvironment.py) = 996b9468b9e873793c7d962b440e784003d43643
+SHA1 (patch-python_mozbuild_mozbuild_makeutil.py) = 61f7a5e606ac5fe044c7e6b9175bdad7da46f238
+SHA1 (patch-python_mozbuild_mozbuild_util.py) = 04ff5d151c0af601dd5c6039dbee1098fa9253c8
+SHA1 (patch-testing_mozbase_manifestparser_manifestparser_filters.py) = d1f6ac31c028503a0fe6f64f1e3a9f8029ee51c2

Added files:

Index: pkgsrc/lang/mozjs78/patches/patch-python_mach_mach_decorators.py
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-python_mach_mach_decorators.py:1.1
--- /dev/null   Fri Aug 16 10:20:40 2024
+++ pkgsrc/lang/mozjs78/patches/patch-python_mach_mach_decorators.py    Fri Aug 16 10:20:40 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-python_mach_mach_decorators.py,v 1.1 2024/08/16 10:20:40 nia Exp $
+
+These python libraries were moved out of "collections" and their
+original locations were deprecated.
+
+--- python/mach/mach/decorators.py.orig        2024-08-16 10:13:24.175350287 +0000
++++ python/mach/mach/decorators.py
+@@ -140,7 +140,7 @@ def CommandProvider(cls):
+               'Conditions argument must take a list ' + \
+               'of functions. Found %s instead.'
+ 
+-        if not isinstance(command.conditions, collections.Iterable):
++        if not isinstance(command.conditions, collections.abc.Iterable):
+             msg = msg % (command.name, type(command.conditions))
+             raise MachError(msg)
+ 
Index: pkgsrc/lang/mozjs78/patches/patch-python_mach_mach_main.py
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-python_mach_mach_main.py:1.1
--- /dev/null   Fri Aug 16 10:20:40 2024
+++ pkgsrc/lang/mozjs78/patches/patch-python_mach_mach_main.py  Fri Aug 16 10:20:40 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-python_mach_mach_main.py,v 1.1 2024/08/16 10:20:40 nia Exp $
+
+These python libraries were moved out of "collections" and their
+original locations were deprecated.
+
+--- python/mach/mach/main.py.orig      2024-08-16 10:13:11.002052040 +0000
++++ python/mach/mach/main.py
+@@ -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
+ 
Index: pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py:1.1
--- /dev/null   Fri Aug 16 10:20:40 2024
+++ pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_backend_configenvironment.py     Fri Aug 16 10:20:40 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-python_mozbuild_mozbuild_backend_configenvironment.py,v 1.1 2024/08/16 10:20:40 nia Exp $
+
+These python libraries were moved out of "collections" and their
+original locations were deprecated.
+
+--- python/mozbuild/mozbuild/backend/configenvironment.py.orig 2024-08-16 10:01:11.885260679 +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/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_makeutil.py
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_makeutil.py:1.1
--- /dev/null   Fri Aug 16 10:20:40 2024
+++ pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_makeutil.py      Fri Aug 16 10:20:40 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-python_mozbuild_mozbuild_makeutil.py,v 1.1 2024/08/16 10:20:40 nia Exp $
+
+These python libraries were moved out of "collections" and their
+original locations were deprecated.
+
+--- python/mozbuild/mozbuild/makeutil.py.orig  2024-08-16 10:12:38.748775642 +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/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_util.py
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_util.py:1.1
--- /dev/null   Fri Aug 16 10:20:40 2024
+++ pkgsrc/lang/mozjs78/patches/patch-python_mozbuild_mozbuild_util.py  Fri Aug 16 10:20:40 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-python_mozbuild_mozbuild_util.py,v 1.1 2024/08/16 10:20:40 nia Exp $
+
+These python libraries were moved out of "collections" and their
+original locations were deprecated.
+
+--- python/mozbuild/mozbuild/util.py.orig      2024-08-16 10:00:10.087111758 +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/lang/mozjs78/patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py
diff -u /dev/null pkgsrc/lang/mozjs78/patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py:1.1
--- /dev/null   Fri Aug 16 10:20:40 2024
+++ pkgsrc/lang/mozjs78/patches/patch-testing_mozbase_manifestparser_manifestparser_filters.py  Fri Aug 16 10:20:40 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-testing_mozbase_manifestparser_manifestparser_filters.py,v 1.1 2024/08/16 10:20:40 nia Exp $
+
+These python libraries were moved out of "collections" and their
+original locations were deprecated.
+
+--- testing/mozbase/manifestparser/manifestparser/filters.py.orig      2024-08-16 10:11:13.194233011 +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