CVS commit: pkgsrc/www/firefox128

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Wed Oct  7 16:41:45 UTC 2026

Modified Files:
        pkgsrc/www/firefox128: Makefile distinfo
Added Files:
        pkgsrc/www/firefox128/patches:
            patch-gfx_wr_webrender_src_texture__cache.rs

Log Message:
Fix build of firefox128 with latest rust

(Based on changed in firefox140)

Approved by ryo


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/www/firefox128/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/firefox128/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox128/patches/patch-gfx_wr_webrender_src_texture__cache.rs

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

Modified files:

Index: pkgsrc/www/firefox128/Makefile
diff -u pkgsrc/www/firefox128/Makefile:1.40 pkgsrc/www/firefox128/Makefile:1.41
--- pkgsrc/www/firefox128/Makefile:1.40 Tue Sep 29 06:08:04 2026
+++ pkgsrc/www/firefox128/Makefile      Wed Oct  7 16:41:45 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2026/09/29 06:08:04 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2026/10/07 16:41:45 abs Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            128.14
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox128-/}
-PKGREVISION=   11
+PKGREVISION=   12
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}

Index: pkgsrc/www/firefox128/distinfo
diff -u pkgsrc/www/firefox128/distinfo:1.22 pkgsrc/www/firefox128/distinfo:1.23
--- pkgsrc/www/firefox128/distinfo:1.22 Tue Jan  6 16:16:39 2026
+++ pkgsrc/www/firefox128/distinfo      Wed Oct  7 16:41:45 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2026/01/06 16:16:39 ryoon Exp $
+$NetBSD: distinfo,v 1.23 2026/10/07 16:41:45 abs Exp $
 
 BLAKE2s (firefox-128.14.0esr.source.tar.xz) = a3cc3c29528e11e4a25d67ac536bc00bdb09aaaddb21f36586e9a30a1dc412cb
 SHA512 (firefox-128.14.0esr.source.tar.xz) = a3cf267e82b6f5ab8b6497a62b12f85afb78fcaef6b12c43ef79564ce8270d3327a873368ce48fc018e46fef5e07339c07b9a494a5ff6c22a84099f939f6a9de
@@ -17,6 +17,7 @@ SHA1 (patch-gfx_angle_checkout_src_commo
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = b2adce9e65662283a11b6dcff40e95523e940045
 SHA1 (patch-gfx_ots_src_name.cc) = b3ea28fa953e2918d86ece58c4f0db6a389db21f
 SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb
+SHA1 (patch-gfx_wr_webrender_src_texture__cache.rs) = db3492d6c436d385fb76d061094ae335e5c59a75
 SHA1 (patch-intl_lwbrk_LineBreaker.cpp) = 8c4d3016218ea11f0092247d17c8efc99e96e108
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 298642a3527804115b398fb7904a3596962932e3
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 753bb4e90758f5b42a51bbc073b328de673988cf

Added files:

Index: pkgsrc/www/firefox128/patches/patch-gfx_wr_webrender_src_texture__cache.rs
diff -u /dev/null pkgsrc/www/firefox128/patches/patch-gfx_wr_webrender_src_texture__cache.rs:1.1
--- /dev/null   Wed Oct  7 16:41:45 2026
+++ pkgsrc/www/firefox128/patches/patch-gfx_wr_webrender_src_texture__cache.rs  Wed Oct  7 16:41:45 2026
@@ -0,0 +1,29 @@
+$NetBSD: patch-gfx_wr_webrender_src_texture__cache.rs,v 1.1 2026/10/07 16:41:45 abs Exp $
+
+Mark BudgetType related values as non pub to match firefox140.
+Avoids build issue with webrender_ffi_generated.h defining
+BudgetType_COUNT and then using COUNT
+
+--- gfx/wr/webrender/src/texture_cache.rs.orig 2026-09-23 15:58:19.384304323 +0000
++++ gfx/wr/webrender/src/texture_cache.rs
+@@ -272,9 +272,9 @@ enum BudgetType {
+ }
+ 
+ impl BudgetType {
+-    pub const COUNT: usize = 7;
++    const COUNT: usize = 7;
+ 
+-    pub const VALUES: [BudgetType; BudgetType::COUNT] = [
++    const VALUES: [BudgetType; BudgetType::COUNT] = [
+         BudgetType::SharedColor8Linear,
+         BudgetType::SharedColor8Nearest,
+         BudgetType::SharedColor8Glyphs,
+@@ -284,7 +284,7 @@ impl BudgetType {
+         BudgetType::Standalone,
+     ];
+ 
+-    pub const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [
++    const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [
+         profiler::ATLAS_COLOR8_LINEAR_PRESSURE,
+         profiler::ATLAS_COLOR8_NEAREST_PRESSURE,
+         profiler::ATLAS_COLOR8_GLYPHS_PRESSURE,