From 5895ba1815d15b3c5c4db64680da04467ecba29d Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Wed, 6 Jul 2022 21:59:03 +0300
Subject: [PATCH] firefox-102.0.1

---
 network/web/firefox/files/cbindgen-0.24.0.diff  | 17 +++++++++++++++++
 network/web/firefox/files/zstandard-0.18.0.diff | 10 ++++++++++
 network/web/firefox/pspec.xml                   |  3 ++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 network/web/firefox/files/cbindgen-0.24.0.diff
 create mode 100644 network/web/firefox/files/zstandard-0.18.0.diff

diff --git a/network/web/firefox/files/cbindgen-0.24.0.diff b/network/web/firefox/files/cbindgen-0.24.0.diff
new file mode 100644
index 0000000000..3011e8ada8
--- /dev/null
+++ b/network/web/firefox/files/cbindgen-0.24.0.diff
@@ -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/network/web/firefox/files/zstandard-0.18.0.diff b/network/web/firefox/files/zstandard-0.18.0.diff
new file mode 100644
index 0000000000..5dfa30557d
--- /dev/null
+++ b/network/web/firefox/files/zstandard-0.18.0.diff
@@ -0,0 +1,10 @@
+diff --git i/python/sites/mach.txt w/python/sites/mach.txt
+index 01f4f8c23da3b..85cfaf2b273ac 100644
+--- i/python/sites/mach.txt
++++ w/python/sites/mach.txt
+@@ -134,4 +134,4 @@ pypi-optional:glean-sdk==50.1.0:telemetry will not be collected
+ # We aren't (yet) able to pin packages in automation, so we have to
+ # support down to the oldest locally-installed version (5.4.2).
+ pypi-optional:psutil>=5.4.2,<=5.8.0:telemetry will be missing some data
+-pypi-optional:zstandard>=0.11.1,<=0.17.0:zstd archives will not be possible to extract
++pypi-optional:zstandard>=0.11.1,<=0.18.0:zstd archives will not be possible to extract
diff --git a/network/web/firefox/pspec.xml b/network/web/firefox/pspec.xml
index 045d1aaf85..844b62d58d 100644
--- a/network/web/firefox/pspec.xml
+++ b/network/web/firefox/pspec.xml
@@ -74,7 +74,8 @@
             <Dependency>jack-audio-connection-kit-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch</Patch> -->
+            <Patch level="1">cbindgen-0.24.0.diff</Patch>
+            <Patch level="1">zstandard-0.18.0.diff</Patch>
         </Patches>
     </Source>