guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit 81b74e43028e845bf055ac7959a39c91e8e19c05
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Fri Mar 27 22:52:13 2026 +0900
gnu: mozjs: Apply patch to resolve an error in the gjs build.
The headers of mozjs would previous return "#error "Unsupported OS?" when
building a recent gjs.
* gnu/packages/patches/mozjs-bug-1973994-fix-c-header.patch: New patch.
* gnu/packages/gnuzilla.scm (mozjs): Apply it.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: I9b3fb0d13a41524e6047940bc0759a218c69b277
Signed-off-by: Noé Lopez <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/gnuzilla.scm | 3 ++-
.../patches/mozjs-bug-1973994-fix-c-header.patch | 27 ++++++++++++++++++++++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index c2552790fb..175318f045 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1936,6 +1936,7 @@ dist_patch_DATA =
\
%D%/packages/patches/mle-1.8.1-no-var-lookbehind.patch \
%D%/packages/patches/mono-msbuild-15.7.179-fix-build.patch \
%D%/packages/patches/mono-msbuild-15.7.179-fix-resources.patch \
+ %D%/packages/patches/mozjs-bug-1973994-fix-c-header.patch \
%D%/packages/patches/libmemcached-build-with-gcc7.patch \
%D%/packages/patches/libmhash-hmac-fix-uaf.patch \
%D%/packages/patches/libmodbus-disable-networking-test.patch \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 71e5021202..790f6490eb 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1842,7 +1842,8 @@ associated with their name."))
(package
(name "mozjs")
(version %icecat-version)
- (source icecat-source)
+ (source (origin (inherit icecat-source)
+ (patches (search-patches
"mozjs-bug-1973994-fix-c-header.patch"))))
(build-system gnu-build-system)
(arguments
(list
diff --git a/gnu/packages/patches/mozjs-bug-1973994-fix-c-header.patch
b/gnu/packages/patches/mozjs-bug-1973994-fix-c-header.patch
new file mode 100644
index 0000000000..422021c3fe
--- /dev/null
+++ b/gnu/packages/patches/mozjs-bug-1973994-fix-c-header.patch
@@ -0,0 +1,27 @@
+Retrieved-from:
<https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch>
+Upstream-status: https://bugzilla.mozilla.org/show_bug.cgi?id=1973994
+
+From 9aa8b4b051dd539e0fbd5e08040870b3c712a846 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <[email protected]>
+Date: Wed, 16 Jul 2025 22:50:50 -0700
+Subject: [PATCH] Bug 1973994 - mozjs-140.pc does not contain -DXP_UNIX on
+ Linux
+
+Temporary fix.
+---
+ js/src/js-config.h.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in
+index 8372623586..498ea968ba 100644
+--- a/js/src/js-config.h.in
++++ b/js/src/js-config.h.in
+@@ -68,4 +68,8 @@
+ #undef MOZJS_MAJOR_VERSION
+ #undef MOZJS_MINOR_VERSION
+
++/* Controls API in UniquePtrExtensions.h. */
++#undef XP_UNIX
++#undef XP_WIN
++
+ #endif /* js_config_h */
