From d48ad7c2b4f2b2beb551a32e2bb2020c69daf7d5 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Sat, 2 Jul 2022 12:13:10 +0200
Subject: [PATCH] v102.0-2

---
 deb_patches/fix-ftbfs-newer-cbindgen.patch | 17 +++++++++++++++++
 scripts/3_Configure_Source_Code.sh         |  4 ++++
 scripts/4_Build_Binary_Tarball.sh          |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 deb_patches/fix-ftbfs-newer-cbindgen.patch

diff --git a/deb_patches/fix-ftbfs-newer-cbindgen.patch b/deb_patches/fix-ftbfs-newer-cbindgen.patch
new file mode 100644
index 0000000..3411a96
--- /dev/null
+++ b/deb_patches/fix-ftbfs-newer-cbindgen.patch
@@ -0,0 +1,17 @@
+Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24),
+ and causing build failures because it is defined in several places.
+Author: Olivier Tilloy <olivier.tilloy@canonical.com>
+Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
+Forwarded: not-needed
+
+--- a/gfx/webrender_bindings/webrender_ffi.h
++++ b/gfx/webrender_bindings/webrender_ffi.h
+@@ -73,8 +73,6 @@ struct WrPipelineInfo;
+ struct WrPipelineIdAndEpoch;
+ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
+ 
+-const uint64_t ROOT_CLIP_CHAIN = ~0;
+-
+ }  // namespace wr
+ }  // namespace mozilla
+ 
diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh
index e7c16df..99244ee 100755
--- a/scripts/3_Configure_Source_Code.sh
+++ b/scripts/3_Configure_Source_Code.sh
@@ -144,6 +144,10 @@ patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch"
 # might make the build just a tiny bit cleaner, not really required though
 patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-wayland-build.patch"
 
+# cbindgen >= 24 patch
+
+patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-ftbfs-newer-cbindgen.patch"
+
 
 # Remove some pre-installed addons that might be questionable
 patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch
diff --git a/scripts/4_Build_Binary_Tarball.sh b/scripts/4_Build_Binary_Tarball.sh
index 682ae58..2e4fc7b 100755
--- a/scripts/4_Build_Binary_Tarball.sh
+++ b/scripts/4_Build_Binary_Tarball.sh
@@ -70,7 +70,7 @@ cd $srcdir;
 rm -f mozconfig
 
 # install cbindgen
-cargo install --version 0.23.0 cbindgen
+cargo install --version 0.24.3 cbindgen
 
 if [[ $CARCH == 'aarch64' ]]; then