firefox-esr: update to 140.8.0, rebuild for libvpx-1.16.0.

2026-03-15 23:44:15 +01:00
parent bb700769e3
commit a6243ad57c
3 changed files with 101 additions and 43 deletions
@@ -1,39 +0,0 @@
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1462463631 14400
-#      Thu May 05 11:53:51 2016 -0400
-# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
-# Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
-handle big-endian formats in Cairo format conversions
-
--- a/gfx/2d/HelpersCairo.h
-+++ b/gfx/2d/HelpersCairo.h
-@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
-     case SurfaceFormat::R5G6B5_UINT16:
-       return CAIRO_FORMAT_RGB16_565;
-     default:
-      gfxCriticalError() << "Unknown image format " << (int)format;
-+      // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
-+      // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
-+      // See bug 1269654
-+      if (format == SurfaceFormat::B8G8R8X8) {
-+        return CAIRO_FORMAT_RGB24;
-+      } else if (format != SurfaceFormat::B8G8R8A8) {
-+        gfxCriticalError() << "Unknown image format " << (int)format;
-+      }
-       return CAIRO_FORMAT_ARGB32;
-   }
- }
-@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
-     case SurfaceFormat::A8:
-       return CAIRO_CONTENT_ALPHA;
-     default:
-      gfxCriticalError() << "Unknown image content format " << (int)format;
-+      if (format == SurfaceFormat::B8G8R8X8) {
-+        return CAIRO_CONTENT_COLOR;
-+      } else if (format != SurfaceFormat::B8G8R8A8) {
-+        gfxCriticalError() << "Unknown image content format " << (int)format;
-+      }
-       return CAIRO_CONTENT_COLOR_ALPHA;
-   }
- }
@@ -0,0 +1,97 @@
+--- a/python/mach/mach/command_util.py
+++ b/python/mach/mach/command_util.py
+@@ -292,7 +292,7 @@
+             kwarg_dict = {}
+ 
+             for name, arg in zip(["command", "subcommand"], decorator.args):
+-                kwarg_dict[name] = arg.s
+                kwarg_dict[name] = arg.value
+ 
+             for keyword in decorator.keywords:
+                 if keyword.arg not in relevant_kwargs:
+
+diff --git a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
+--- a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
+++ b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
+@@ -322,25 +322,23 @@ def assignment_node_to_source_filename_l
+     If this happens, we'll return an empty list. The consequence of this is that we
+     won't be able to match a file against this list, so we may not be able to add it.
+ 
+     (But if the file matches a generated list, perhaps it will be included in the
+     Sources list automatically?)
+     """
+     if isinstance(node.value, ast.List) and "elts" in node.value._fields:
+         for f in node.value.elts:
+-            if not isinstance(f, ast.Constant) and not isinstance(f, ast.Str):
+            if not isinstance(f, ast.Constant):
+                 log(
+                     "Found non-constant source file name in list: ",
+                     ast_get_source_segment(code, f),
+                 )
+                 return []
+-        return [
+-            f.value if isinstance(f, ast.Constant) else f.s for f in node.value.elts
+-        ]
+        return [f.value for f in node.value.elts]
+     elif isinstance(node.value, ast.ListComp):
+         # SOURCES += [f for f in foo if blah]
+         log("Could not find the files for " + ast_get_source_segment(code, node.value))
+     elif isinstance(node.value, ast.Name) or isinstance(node.value, ast.Subscript):
+         # SOURCES += other_var
+         # SOURCES += files['X64_SOURCES']
+         log("Could not find the files for " + ast_get_source_segment(code, node))
+     elif isinstance(node.value, ast.Call):
+
+--- a/python/mozbuild/mozbuild/frontend/reader.py
+++ b/python/mozbuild/mozbuild/frontend/reader.py
+@@ -470,7 +470,7 @@
+             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,
+                 )
+             )
+@@ -1034,8 +1034,8 @@
+                 # We need to branch to deal with python version differences.
+                 if isinstance(target.slice, ast.Constant):
+                     # Python >= 3.9
+-                    assert isinstance(target.slice.value, str)
+-                    key = target.slice.value
+                    assert isinstance(target.slice.value, ast.Constant)
+                    key = target.slice.value.value
+                 else:
+                     # Others
+                     assert isinstance(target.slice, ast.Index)
+@@ -1051,11 +1051,11 @@
+             value = node.value
+             if isinstance(value, ast.List):
+                 for v in value.elts:
+-                    assert isinstance(v, ast.Str)
+-                    yield v.s
+                    assert isinstance(v, ast.Constant)
+                    yield v.value
+             else:
+-                assert isinstance(value, ast.Str)
+-                yield value.s
+                assert isinstance(value, ast.Constant)
+                yield value.value
+ 
+         assignments = []
+ 
+--- a/third_party/python/jsonschema/jsonschema/validators.py
+++ b/third_party/python/jsonschema/jsonschema/validators.py
+@@ -875,8 +875,11 @@
+             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:
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=140.2.0
+version=140.8.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release"
@@ -11,15 +11,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=956dce675c3b706d563caf07ed3ca9af632ab830be710dfd4351da78a0a2ef55
+checksum=57a7f339ef68273f6597d8074a841fa053f63a21d1f609ab0074a26c063282e6

 lib32disabled=yes
-_llvmver=19 # needs to match rust
+_llvmver=21 # needs to match rust
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust
 cargo llvm${_llvmver} clang${_llvmver} lld${_llvmver} nodejs cbindgen nasm which
 tar xz $(vopt_if pgo 'xvfb-run dbus mesa-dri vulkan-loader pciutils')
 $(vopt_if wasi wasi-sdk)"
-makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel icu-devel
+makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel libicu77-devel
 pixman-devel libevent-devel libnotify-devel libvpx-devel libwebp-devel
 libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std
 libXdamage-devel freetype-devel $(vopt_if wasi wasi-sdk)