3 files changed, 34 insertions, 1 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index c77989ed8ad..17255ab71b5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1960,6 +1960,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/miopen-zstd.patch                        \
   %D%/packages/patches/mit-krb5-hurd.patch                      \
   %D%/packages/patches/mitm-cache-head-requests.patch           \
+  %D%/packages/patches/mozjs-fix-garbage-collector-tracer.patch \
   %D%/packages/patches/mpc123-initialize-ao.patch               \
   %D%/packages/patches/mpg321-CVE-2019-14247.patch              \
   %D%/packages/patches/mpg321-gcc-10.patch                      \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 96bb8f51b93..4c9d883531b 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -307,7 +307,13 @@ in C/C++.")
                                   version "esr.source.tar.xz"))
               (sha256
                (base32
-                "1a3h7p7126pxzpidb1lqckvhfh1had805mai4l96mnc878phbx61"))))
+                "1a3h7p7126pxzpidb1lqckvhfh1had805mai4l96mnc878phbx61"))
+              ;; 0ad requires this version of mozjs, which surfaces a bug
+              ;; related to improper garbage collection.
+              ;; See https://gitea.wildfiregames.com/0ad/0ad/issues/8757,
+              ;; https://codeberg.org/guix/guix/issues/10467.
+              (patches
+               (search-patches "mozjs-fix-garbage-collector-tracer.patch"))))
     (arguments
      (substitute-keyword-arguments arguments
        ((#:configure-flags flags)
diff --git a/gnu/packages/patches/mozjs-fix-garbage-collector-tracer.patch b/gnu/packages/patches/mozjs-fix-garbage-collector-tracer.patch
new file mode 100644
index 00000000000..201cdc3ad1d
--- /dev/null
+++ b/gnu/packages/patches/mozjs-fix-garbage-collector-tracer.patch
@@ -0,0 +1,26 @@
+From bf1994b05baea60f84309475cd544fe89acf82f2 Mon Sep 17 00:00:00 2001
+From: Itms <itms@wildfiregames.com>
+Date: Sat, 9 Aug 2025 15:32:20 +0000
+Subject: [PATCH] Bug 1982134 - Choose specific callback in
+ removeBlackRootsTracer. r=sfink
+
+This fixes a regression introduced in the refactoring at Bug 1846835 / D185307
+
+Differential Revision: https://phabricator.services.mozilla.com/D260541
+---
+ js/src/gc/GC.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
+index 79894459df7d9..5e04b1cdf1a00 100644
+--- a/js/src/gc/GC.cpp
++++ b/js/src/gc/GC.cpp
+@@ -1633,7 +1633,7 @@ bool GCRuntime::addBlackRootsTracer(JSTraceDataOp traceOp, void* data) {
+ 
+ void GCRuntime::removeBlackRootsTracer(JSTraceDataOp traceOp, void* data) {
+   // Can be called from finalizers
+-  MOZ_ALWAYS_TRUE(EraseCallback(blackRootTracers.ref(), traceOp));
++  MOZ_ALWAYS_TRUE(EraseCallback(blackRootTracers.ref(), traceOp, data));
+ }
+ 
+ void GCRuntime::setGrayRootsTracer(JSGrayRootsTracer traceOp, void* data) {