[gnome-build-meta/abderrahim/fix-build: 3/5] sdk/mozjs: Update to mozjs102

[Marge Bot <marge-bot src gnome org>]

commit 2809aab2ae643d087c2aeb76ca516f90044dbb66
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Aug 7 16:51:29 2022 -0700

    sdk/mozjs: Update to mozjs102
    
    Latest released version is 102.1.0.
    Includes two patches that will be released in 102.2.0 in late August 2022.
    GJS will depend on this.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1711>

 elements/sdk/mozjs.bst                             |  8 +++--
 ...g-1776254-Install-ProfilingCategoryList.h.patch | 34 ++++++++++++++++++++++
 ...-Bug-1780857-Change-if-to-ifdef-for-DEBUG.patch | 30 +++++++++++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)
---
diff --git a/elements/sdk/mozjs.bst b/elements/sdk/mozjs.bst
index 5dfee75a7..05dc32ca0 100644
--- a/elements/sdk/mozjs.bst
+++ b/elements/sdk/mozjs.bst
@@ -2,8 +2,12 @@ kind: manual
 
 sources:
 - kind: tar
-  url: https://ftp.mozilla.org/pub/firefox/releases/91.5.0esr/source/firefox-91.5.0esr.source.tar.xz
-  base-dir: 'firefox-91.5.0'
+  url: https://ftp.mozilla.org/pub/firefox/releases/102.1.0esr/source/firefox-102.1.0esr.source.tar.xz
+  base-dir: 'firefox-102.1.0'
+- kind: patch
+  path: files/mozjs/0001-Bug-1776254-Install-ProfilingCategoryList.h.patch
+- kind: patch
+  path: files/mozjs/0002-Bug-1780857-Change-if-to-ifdef-for-DEBUG.patch
 
 build-depends:
 - freedesktop-sdk.bst:components/pkg-config.bst
diff --git a/files/mozjs/0001-Bug-1776254-Install-ProfilingCategoryList.h.patch 
b/files/mozjs/0001-Bug-1776254-Install-ProfilingCategoryList.h.patch
new file mode 100644
index 000000000..6313e8b0f
--- /dev/null
+++ b/files/mozjs/0001-Bug-1776254-Install-ProfilingCategoryList.h.patch
@@ -0,0 +1,34 @@
+From ced7b43f325a274792e27215a3f8dd83174bf816 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip chimento gmail com>
+Date: Fri, 22 Jul 2022 10:26:19 -0700
+Subject: [PATCH 1/4] Bug 1776254 - Install ProfilingCategoryList.h (r?arai)
+
+When installing embedded SpiderMonkey, we need to install the generated
+header ProfilingCategoryList.h into /usr/include/mozjs-___/js/ because
+that's where the rest of the SpiderMonkey code expects to find it.
+It's not automatically installed already, because it's generated.
+
+Thanks to Arai for the suggestion of where to look.
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1776254
+---
+ js/src/build/Makefile.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/js/src/build/Makefile.in b/js/src/build/Makefile.in
+index 8548eb258..0dfd7d57f 100644
+--- a/js/src/build/Makefile.in
++++ b/js/src/build/Makefile.in
+@@ -31,6 +31,9 @@ install:: $(LIBRARY_NAME).pc
+ install:: ../js-config.h
+       $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(JS_LIBRARY_NAME)
+ 
++install:: ../../../mozglue/baseprofiler/public/ProfilingCategoryList.h
++      $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(JS_LIBRARY_NAME)/js
++
+ ######################################################
+ # BEGIN SpiderMonkey header installation
+ #
+-- 
+2.37.1
+
diff --git a/files/mozjs/0002-Bug-1780857-Change-if-to-ifdef-for-DEBUG.patch 
b/files/mozjs/0002-Bug-1780857-Change-if-to-ifdef-for-DEBUG.patch
new file mode 100644
index 000000000..d8d637c6c
--- /dev/null
+++ b/files/mozjs/0002-Bug-1780857-Change-if-to-ifdef-for-DEBUG.patch
@@ -0,0 +1,30 @@
+From 74888b25217d8275c6ed6219c641fa46ac8641ec Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip chimento gmail com>
+Date: Fri, 22 Jul 2022 11:33:20 -0700
+Subject: [PATCH 2/4] Bug 1780857 - Change if to ifdef for DEBUG. (r?jimb)
+
+The paradigm for DEBUG is that it is defined or not defined, not 1 or 0,
+so we have to use ifdef here. Otherwise we get a build error in embedded
+SpiderMonkey when DEBUG is not defined.
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1780857
+---
+ js/public/Debug.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/public/Debug.h b/js/public/Debug.h
+index ed025d5ca..6d7fd8a4b 100644
+--- a/js/public/Debug.h
++++ b/js/public/Debug.h
+@@ -139,7 +139,7 @@ class Builder {
+   // Check that |thing| is in the same compartment as our debuggerObject. Used
+   // for assertions when constructing BuiltThings. We can overload this as we
+   // add more instantiations of BuiltThing.
+-#if DEBUG
++#ifdef DEBUG
+   void assertBuilt(JSObject* obj);
+ #else
+   void assertBuilt(JSObject* obj) {}
+-- 
+2.37.1
+