CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Oct  9 14:48:04 UTC 2025

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo
Added Files:
        pkgsrc/www/firefox/patches:
            patch-python_mozbuild_mozbuild_frontend_reader.py
            patch-third__party_python_jsonschema_jsonschema_validators.py

Log Message:
www/firefox: Update to 143.0.4

* Fix build with Python 3.14 with upstream changes.

Changelog:
143.0.4:
Fixed

  * Improved Firefox' connection fallback behavior to mitigate sporadic slow/
    failed loads on some Google sites on systems with certain third-party
    software installed. (Bug 1990699)


To generate a diff of this commit:
cvs rdiff -u -r1.645 -r1.646 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.565 -r1.566 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_frontend_reader.py \
    pkgsrc/www/firefox/patches/patch-third__party_python_jsonschema_jsonschema_validators.py

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

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.645 pkgsrc/www/firefox/Makefile:1.646
--- pkgsrc/www/firefox/Makefile:1.645   Thu Oct  9 14:32:07 2025
+++ pkgsrc/www/firefox/Makefile Thu Oct  9 14:48:03 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.645 2025/10/09 14:32:07 wiz Exp $
+# $NetBSD: Makefile,v 1.646 2025/10/09 14:48:03 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            143.0
-MOZ_BRANCH_MINOR=      .3
+MOZ_BRANCH_MINOR=      .4
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
@@ -20,9 +20,6 @@ HOMEPAGE=     https://www.mozilla.org/en-US/
 COMMENT=       Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//})
 LICENSE=       mpl-1.1
 
-# AttributeError: module 'ast' has no attribute 'Str'
-PYTHON_VERSIONS_INCOMPATIBLE=  314
-
 # -------- BEFORE UPDATING THIS PACKAGE PLEASE READ & UNDERSTAND: -------
 #
 # This package works around a (stupid) build time dependency on nodejs

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.565 pkgsrc/www/firefox/distinfo:1.566
--- pkgsrc/www/firefox/distinfo:1.565   Tue Sep 30 15:38:06 2025
+++ pkgsrc/www/firefox/distinfo Thu Oct  9 14:48:03 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.565 2025/09/30 15:38:06 ryoon Exp $
+$NetBSD: distinfo,v 1.566 2025/10/09 14:48:03 ryoon Exp $
 
-BLAKE2s (firefox-143.0.3.source.tar.xz) = 7b4873f4f22d411fb95d931a9f54f060de5ac7a089986c1dca940e7607089389
-SHA512 (firefox-143.0.3.source.tar.xz) = c092bd3aac79f856a804c908b76d40409ce052b00176269ea3029b5a3a6885d4d21ce26bd76c9ea13827ff75459b6b4b0566f5aa49035ac234ae5890c67845b0
-Size (firefox-143.0.3.source.tar.xz) = 647600856 bytes
+BLAKE2s (firefox-143.0.4.source.tar.xz) = 62ee73a03fd4f6070867fb7ccc9778d514a13e31f7dee22796f60c2978a50951
+SHA512 (firefox-143.0.4.source.tar.xz) = 2bcbde4e72ea41e9ccc98836901635350b5dc7b50c618e19ab6103a27adc0f017ca3fa7555378c8af6ee1f3a14d02935289fe2b0d35d840d610f5ac07a88e4b6
+Size (firefox-143.0.4.source.tar.xz) = 645169812 bytes
 BLAKE2s (nodejs-output-142.0.1.tgz) = b0b340f8accfc2ff8296298bd8ddd447d278fcc08cc42b1a7f62752542dde80f
 SHA512 (nodejs-output-142.0.1.tgz) = f40201f1fee4db3e8f722ad57637c732c208c7884aa10914931a22427b29958591ce623b94d63776eb6a2a3779ba017c71706df9b39280040f1db166815b8d72
 Size (nodejs-output-142.0.1.tgz) = 245965 bytes
@@ -33,6 +33,7 @@ SHA1 (patch-modules_fdlibm_src_math__pri
 SHA1 (patch-netwerk_protocol_http_nsHttpHandler.cpp) = 67493b4635041d21ff9fbfda80b3197fed542a26
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 753fd4d62088c870aefe7c4b739286259848446e
 SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = 5be4183d9075f5a3a3c6b3e0338473af185fb50e
+SHA1 (patch-python_mozbuild_mozbuild_frontend_reader.py) = 57cad432ccc18e790e2cf00732f499116c79f4c1
 SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.cc) = 2b5955027add79d1b8709667b0433b2d19fbd1bc
 SHA1 (patch-third__party_abseil-cpp_absl_debugging_internal_vdso__support.cc) = f9c44d0d6fd952296f23c24f56053958b30d8e5c
 SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
@@ -47,6 +48,7 @@ SHA1 (patch-third__party_libwebrtc_rtc__
 SHA1 (patch-third__party_libwebrtc_rtc__base_platform__thread__types.cc) = 8ae75100775037347008d168eedc151e0e993b0f
 SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8
 SHA1 (patch-third__party_python_dlmanager_check.py) = 69054522d8ced8cb47e65e5a8b1a87ed5ce6708e
+SHA1 (patch-third__party_python_jsonschema_jsonschema_validators.py) = c635f83b803d2c877b720b8c0330e1a5d090511c
 SHA1 (patch-third__party_sqlite3_ext_moz.build) = 026483e9cdc61eda80b699978b1677e1b6d3ff6d
 SHA1 (patch-third__party_sqlite3_src_moz.build) = b26856a4b87aa12211575d9982f62dc899474b52
 SHA1 (patch-third__party_wasm2c_src_c-writer.cc) = 38eb2ee0e00722aa1380540b83648b43723719aa

Added files:

Index: pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_frontend_reader.py
diff -u /dev/null pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_frontend_reader.py:1.1
--- /dev/null   Thu Oct  9 14:48:04 2025
+++ pkgsrc/www/firefox/patches/patch-python_mozbuild_mozbuild_frontend_reader.py        Thu Oct  9 14:48:03 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_mozbuild_mozbuild_frontend_reader.py,v 1.1 2025/10/09 14:48:03 ryoon Exp $
+
+* For Python 3.14 too.
+
+--- python/mozbuild/mozbuild/frontend/reader.py.orig   2025-10-08 15:23:09.699830974 +0000
++++ python/mozbuild/mozbuild/frontend/reader.py
+@@ -470,7 +470,7 @@ class TemplateFunction:
+             return c(
+                 ast.Subscript(
+                     value=c(ast.Name(id=self._global_name, ctx=ast.Load())),
+-                    slice=c(ast.Index(value=c(ast.Str(s=node.id)))),
++                    slice=c(ast.Index(value=c(ast.Constant(value=node.id)))),
+                     ctx=node.ctx,
+                 )
+             )
Index: pkgsrc/www/firefox/patches/patch-third__party_python_jsonschema_jsonschema_validators.py
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_python_jsonschema_jsonschema_validators.py:1.1
--- /dev/null   Thu Oct  9 14:48:04 2025
+++ pkgsrc/www/firefox/patches/patch-third__party_python_jsonschema_jsonschema_validators.py    Thu Oct  9 14:48:03 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-third__party_python_jsonschema_jsonschema_validators.py,v 1.1 2025/10/09 14:48:03 ryoon Exp $
+
+* For Python 3.14 too.
+
+--- third_party/python/jsonschema/jsonschema/validators.py.orig        2025-10-08 15:29:42.964096922 +0000
++++ third_party/python/jsonschema/jsonschema/validators.py
+@@ -875,8 +875,11 @@ class RefResolver:
+             return None
+         uri, fragment = urldefrag(url)
+         for subschema in subschemas:
++            id = subschema["$id"]
++            if not isinstance(id, str):
++                continue
+             target_uri = self._urljoin_cache(
+-                self.resolution_scope, subschema["$id"],
++                self.resolution_scope, id,
+             )
+             if target_uri.rstrip("/") == uri.rstrip("/"):
+                 if fragment: