Cherry-pick part of an upstream commit to fix a build failure with ne…

…wer versions of cbindgen.
canonical · Jun 8, 2022 · a24fb4a · a24fb4a
1 parent 35d4305
commit a24fb4a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/patches/fix-ftbfs-newer-cbindgen.patch b/patches/fix-ftbfs-newer-cbindgen.patch
@@ -0,0 +1,16 @@
+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/patches/series b/patches/series
@@ -2,3 +2,4 @@ angle-add-missing-cmath-include.patch
 upstream-D134738.diff
 upstream-D144030.diff
 geckodriver-snap-binary.patch
+fix-ftbfs-newer-cbindgen.patch