summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2026-03-27 22:52:13 +0900
committerNoé Lopez <noelopez@free.fr>2026-08-25 01:15:29 +0200
commit2978a2ff4a71157faab3b66b70b473a9181e4793 (patch)
treef57613431c4de89e857e22de65e7154602d0a6a1 /gnu
parentd5052f86ac9d0aa84b48fd6986b8800ea98872fb (diff)
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 <noelopez@free.fr>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/gnuzilla.scm3
-rw-r--r--gnu/packages/patches/mozjs-bug-1973994-fix-c-header.patch27
3 files changed, 30 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index c2552790fbd..175318f045e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1936,6 +1936,7 @@ dist_patch_DATA = \
1936 %D%/packages/patches/mle-1.8.1-no-var-lookbehind.patch \ 1936 %D%/packages/patches/mle-1.8.1-no-var-lookbehind.patch \
1937 %D%/packages/patches/mono-msbuild-15.7.179-fix-build.patch \ 1937 %D%/packages/patches/mono-msbuild-15.7.179-fix-build.patch \
1938 %D%/packages/patches/mono-msbuild-15.7.179-fix-resources.patch \ 1938 %D%/packages/patches/mono-msbuild-15.7.179-fix-resources.patch \
1939 %D%/packages/patches/mozjs-bug-1973994-fix-c-header.patch \
1939 %D%/packages/patches/libmemcached-build-with-gcc7.patch \ 1940 %D%/packages/patches/libmemcached-build-with-gcc7.patch \
1940 %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ 1941 %D%/packages/patches/libmhash-hmac-fix-uaf.patch \
1941 %D%/packages/patches/libmodbus-disable-networking-test.patch \ 1942 %D%/packages/patches/libmodbus-disable-networking-test.patch \
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 71e50212029..790f6490eb7 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1842,7 +1842,8 @@ associated with their name."))
1842 (package 1842 (package
1843 (name "mozjs") 1843 (name "mozjs")
1844 (version %icecat-version) 1844 (version %icecat-version)
1845 (source icecat-source) 1845 (source (origin (inherit icecat-source)
1846 (patches (search-patches "mozjs-bug-1973994-fix-c-header.patch"))))
1846 (build-system gnu-build-system) 1847 (build-system gnu-build-system)
1847 (arguments 1848 (arguments
1848 (list 1849 (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 00000000000..422021c3fe2
--- /dev/null
+++ b/gnu/packages/patches/mozjs-bug-1973994-fix-c-header.patch
@@ -0,0 +1,27 @@
1Retrieved-from: <https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch>
2Upstream-status: https://bugzilla.mozilla.org/show_bug.cgi?id=1973994
3
4From 9aa8b4b051dd539e0fbd5e08040870b3c712a846 Mon Sep 17 00:00:00 2001
5From: Philip Chimento <philip.chimento@gmail.com>
6Date: Wed, 16 Jul 2025 22:50:50 -0700
7Subject: [PATCH] Bug 1973994 - mozjs-140.pc does not contain -DXP_UNIX on
8 Linux
9
10Temporary fix.
11---
12 js/src/js-config.h.in | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in
16index 8372623586..498ea968ba 100644
17--- a/js/src/js-config.h.in
18+++ b/js/src/js-config.h.in
19@@ -68,4 +68,8 @@
20 #undef MOZJS_MAJOR_VERSION
21 #undef MOZJS_MINOR_VERSION
22
23+/* Controls API in UniquePtrExtensions.h. */
24+#undef XP_UNIX
25+#undef XP_WIN
26+
27 #endif /* js_config_h */