Skip to content

Commit fafb49f

Browse files
committed
www/firefox12: Enable build with python314
1 parent fe80a1a commit fafb49f

6 files changed

Lines changed: 64 additions & 8 deletions

www/firefox128/distinfo

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.21 2026/01/02 15:55:32 tnn Exp $
1+
$NetBSD: distinfo,v 1.22 2026/01/06 16:16:39 ryoon Exp $
22

33
BLAKE2s (firefox-128.14.0esr.source.tar.xz) = a3cc3c29528e11e4a25d67ac536bc00bdb09aaaddb21f36586e9a30a1dc412cb
44
SHA512 (firefox-128.14.0esr.source.tar.xz) = a3cf267e82b6f5ab8b6497a62b12f85afb78fcaef6b12c43ef79564ce8270d3327a873368ce48fc018e46fef5e07339c07b9a494a5ff6c22a84099f939f6a9de
@@ -17,7 +17,7 @@ SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp
1717
SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = b2adce9e65662283a11b6dcff40e95523e940045
1818
SHA1 (patch-gfx_ots_src_name.cc) = b3ea28fa953e2918d86ece58c4f0db6a389db21f
1919
SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb
20-
SHA1 (patch-intl_lwbrk_LineBreaker.cpp) = e2eaf7d66f1255ba5baf7f7edadbb1fa8cb39b13
20+
SHA1 (patch-intl_lwbrk_LineBreaker.cpp) = 8c4d3016218ea11f0092247d17c8efc99e96e108
2121
SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 298642a3527804115b398fb7904a3596962932e3
2222
SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 753bb4e90758f5b42a51bbc073b328de673988cf
2323
SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 63fbee04321f7ade20db4ccc1a1218b848344ce1
@@ -32,6 +32,7 @@ SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac0
3232
SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e
3333
SHA1 (patch-netwerk_protocol_http_nsHttpHandler.cpp) = 8e1d9a0746b637f5f4259e448e72172cfb08b23f
3434
SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = b0d1f6a6e0eb852b0fd0238ad3f8ed3166c60a50
35+
SHA1 (patch-python_mozbuild_mozbuild_frontend_reader.py) = 0b9136397688cef5b9c5de578192ee61ce39440b
3536
SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
3637
SHA1 (patch-third__party_js_cfworker_build.sh) = 46cdf97b99cf01080f290ae8d9a33b5f869fc3e4
3738
SHA1 (patch-third__party_libwebrtc_modules_desktop__capture_desktop__capture__gn_moz.build) = d0454784eb72be49162f619579e060a0de3c480f
@@ -40,6 +41,8 @@ SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__v4
4041
SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_video__capture__v4l2.cc) = 8111952a107eb2cd665525ddd0e27c79eee3c1cd
4142
SHA1 (patch-third__party_libwebrtc_rtc__base_physical__socket__server.cc) = 6909c4da9e7b3785252e5bce9be0ff47ebb87e01
4243
SHA1 (patch-third__party_libwebrtc_system__wrappers_source_cpu__features__linux.cc) = b90e22b50879f7adcc1da3a993f52c0701b720f8
44+
SHA1 (patch-third__party_python_dlmanager_check.py) = 0390376a7bb03065760a24cf7676e01042bce092
45+
SHA1 (patch-third__party_python_jsonschema_jsonschema_validators.py) = 00cd379cf70cc27224ba328c684d94d0aa4fb4fd
4346
SHA1 (patch-third__party_sqlite3_src_moz.build) = b26856a4b87aa12211575d9982f62dc899474b52
4447
SHA1 (patch-third__party_wasm2c_src_prebuilt_wasm2c__source__includes.cc) = 99d0db944f0c2d0c623460991efd423d9127c988
4548
SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e905e38ef1b88d764c695c019f15609350c1c43b

www/firefox128/mozilla-common.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# $NetBSD: mozilla-common.mk,v 1.3 2025/10/19 19:17:42 wiz Exp $
1+
# $NetBSD: mozilla-common.mk,v 1.4 2026/01/06 16:16:39 ryoon Exp $
22
#
33
# common Makefile fragment for mozilla packages based on gecko 2.0.
44
#
55
# used by www/firefox128/Makefile
66

77
.include "../../mk/bsd.prefs.mk"
88

9-
PYTHON_VERSIONS_INCOMPATIBLE= 27 314
9+
PYTHON_VERSIONS_INCOMPATIBLE= 27
1010
PYTHON_FOR_BUILD_ONLY= tool
1111
ALL_ENV+= PYTHON3=${PYTHONBIN}
1212

www/firefox128/patches/patch-intl_lwbrk_LineBreaker.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$NetBSD: patch-intl_lwbrk_LineBreaker.cpp,v 1.1 2024/08/18 15:02:21 leot Exp $
1+
$NetBSD: patch-intl_lwbrk_LineBreaker.cpp,v 1.2 2026/01/06 16:16:39 ryoon Exp $
22

3-
icu 74.1 support.
3+
icu 74.1 and 78.1 support.
44

5-
--- intl/lwbrk/LineBreaker.cpp.orig 2023-10-19 19:54:30.000000000 +0000
5+
--- intl/lwbrk/LineBreaker.cpp.orig 2025-12-01 17:21:02.000000000 +0000
66
+++ intl/lwbrk/LineBreaker.cpp
7-
@@ -448,7 +448,13 @@ static int8_t GetClass(uint32_t u, LineB
7+
@@ -434,7 +434,14 @@ static int8_t GetClass(uint32_t u, LineBreakRule aLeve
88
/* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER,
99
/* E_BASE = 40, [EB] */ CLASS_BREAKABLE,
1010
/* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER,
@@ -15,6 +15,7 @@ icu 74.1 support.
1515
+ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER,
1616
+ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER,
1717
+ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER,
18+
+ /* UNAMBIGUOUS_HYPHEN = 48, [HH] */ CLASS_CHARACTER,
1819
+};
1920

2021
static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
$NetBSD: patch-python_mozbuild_mozbuild_frontend_reader.py,v 1.1 2026/01/06 16:16:39 ryoon Exp $
2+
3+
--- python/mozbuild/mozbuild/frontend/reader.py.orig 2025-08-11 17:07:23.000000000 +0000
4+
+++ python/mozbuild/mozbuild/frontend/reader.py
5+
@@ -470,7 +470,7 @@ class TemplateFunction(object):
6+
return c(
7+
ast.Subscript(
8+
value=c(ast.Name(id=self._global_name, ctx=ast.Load())),
9+
- slice=c(ast.Index(value=c(ast.Str(s=node.id)))),
10+
+ slice=c(ast.Index(value=c(ast.Constant(value=node.id)))),
11+
ctx=node.ctx,
12+
)
13+
)
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
$NetBSD: patch-third__party_python_dlmanager_check.py,v 1.1 2026/01/06 16:16:39 ryoon Exp $
2+
3+
--- third_party/python/dlmanager/check.py.orig 2025-08-11 17:07:30.000000000 +0000
4+
+++ third_party/python/dlmanager/check.py
5+
@@ -5,7 +5,7 @@ import argparse
6+
7+
import os
8+
import argparse
9+
-import pipes
10+
+import shlex
11+
import shutil
12+
import tempfile
13+
14+
@@ -23,7 +23,7 @@ def run(cmd, **kwargs):
15+
16+
17+
def run(cmd, **kwargs):
18+
- msg = 'Running: |%s|' % ' '.join(pipes.quote(c) for c in cmd)
19+
+ msg = 'Running: |%s|' % ' '.join(shlex.quote(c) for c in cmd)
20+
if kwargs.get('cwd'):
21+
msg += ' in %s' % kwargs['cwd']
22+
print(msg)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
$NetBSD: patch-third__party_python_jsonschema_jsonschema_validators.py,v 1.1 2026/01/06 16:16:39 ryoon Exp $
2+
3+
--- third_party/python/jsonschema/jsonschema/validators.py.orig 2025-08-11 17:07:30.000000000 +0000
4+
+++ third_party/python/jsonschema/jsonschema/validators.py
5+
@@ -875,8 +875,11 @@ class RefResolver:
6+
return None
7+
uri, fragment = urldefrag(url)
8+
for subschema in subschemas:
9+
+ id = subschema["$id"]
10+
+ if not isinstance(id, str):
11+
+ continue
12+
target_uri = self._urljoin_cache(
13+
- self.resolution_scope, subschema["$id"],
14+
+ self.resolution_scope, id,
15+
)
16+
if target_uri.rstrip("/") == uri.rstrip("/"):
17+
if fragment:

0 commit comments

Comments
 (0)