From 8fd370784e5fcabe0828c05463f7fc80a7093214 Mon Sep 17 00:00:00 2001
From: Martin Robinson <mrobinson@igalia.com>
Date: Thu, 2 Nov 2023 17:55:12 +0100
Subject: [PATCH] Update mozjs and setuptools (#30685)

This should fix issues with Python 3.12 on Mac builders.

Co-authored-by: Samson <16504129+sagudev@users.noreply.github.com>
---
 .github/workflows/mac.yml | 4 ----
 Cargo.lock                | 4 ++--
 python/requirements.txt   | 3 ++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 5e22f0bfede..8bd413774aa 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -70,10 +70,6 @@ jobs:
           fetch-depth: 2
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@v0.0.3
-      - name: Select Python 3.11
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
       - name: Install taplo
         uses: baptiste0928/cargo-install@v2
         with:
diff --git a/Cargo.lock b/Cargo.lock
index 17868498439..918c632bdb2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3611,7 +3611,7 @@ checksum = "903970ae2f248d7275214cf8f387f8ba0c4ea7e3d87a320e85493db60ce28616"
 [[package]]
 name = "mozjs"
 version = "0.14.1"
-source = "git+https://github.com/servo/mozjs#ec63ca39efb346c414e0f55ef26e63c0b17ee69a"
+source = "git+https://github.com/servo/mozjs#f452fb2e642e158893a094b62956b5f40e015c3e"
 dependencies = [
  "bindgen 0.68.1",
  "cc",
@@ -3625,7 +3625,7 @@ dependencies = [
 [[package]]
 name = "mozjs_sys"
 version = "0.68.2"
-source = "git+https://github.com/servo/mozjs#ec63ca39efb346c414e0f55ef26e63c0b17ee69a"
+source = "git+https://github.com/servo/mozjs#f452fb2e642e158893a094b62956b5f40e015c3e"
 dependencies = [
  "bindgen 0.68.1",
  "cc",
diff --git a/python/requirements.txt b/python/requirements.txt
index 115ee8fd6d5..ed69e90ba47 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -5,7 +5,8 @@ blessings == 1.7
 distro == 1.4
 mozinfo == 1.2.1
 mozlog == 7.1.0
-setuptools == 65.5.1
+setuptools == 68.2.2; python_version >= "3.8"
+setuptools == 65.5.1; python_version < "3.8"
 toml == 0.9.2
 dataclasses == 0.8; python_version < "3.7"