From c0394a73523d5428a9d35dabbea58f2866c7c803 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Mon, 4 Oct 2021 12:39:25 +0000
Subject: [PATCH] fixes compile problem

---
 .../0001-Cannot-use-both-branch-and-rev.patch | 24 +++++++++++++++++++
 .../recipes-support/mozjs78/mozjs78_78.0.1.bb |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 meta-gnome/recipes-support/mozjs78/mozjs78/0001-Cannot-use-both-branch-and-rev.patch

diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Cannot-use-both-branch-and-rev.patch b/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Cannot-use-both-branch-and-rev.patch
new file mode 100644
index 0000000..69024d0
--- /dev/null
+++ b/meta-gnome/recipes-support/mozjs78/mozjs78/0001-Cannot-use-both-branch-and-rev.patch
@@ -0,0 +1,24 @@
+From 598fdeaac5f695c3f6e050e50b0a7397a4642fe3 Mon Sep 17 00:00:00 2001
+From: Bruce Leidl <bruce@subgraph.com>
+Date: Mon, 4 Oct 2021 08:09:52 -0400
+Subject: [PATCH] Cannot use both branch and rev
+
+---
+ Cargo.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 5aefc282f..971afa3dc 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -58,8 +58,8 @@ debug-assertions = false
+ [patch.crates-io]
+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++spirv_cross = { git = "https://github.com/kvark/spirv_cross", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
+ # failure's backtrace feature might break our builds, see bug 1608157.
+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
diff --git a/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb b/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb
index 049d4a3..5d6079a 100644
--- a/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb
+++ b/meta-gnome/recipes-support/mozjs78/mozjs78_78.0.1.bb
@@ -10,6 +10,7 @@ SRC_URI = "https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/m
            file://0003-Set-rust-host-and-target-correctly.patch \
            file://0004-Do-not-add-RequiredDefines.h-here-instead-add-to-gjs.patch \
            file://0005-Remove-Abort-Panic-Strategy.patch \
+           file://0001-Cannot-use-both-branch-and-rev.patch \
            "
 
 SRC_URI[md5sum] = "09bf510150144238dd31f7f4e1582cf8"