0002-fix-ftbfs-newer-cbindgen.patch for ftbfs, thank you CommodoreCrunch!

3 files changed, 22 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41577e2d6b24..4a779dde79ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = firefox-esr
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
 	pkgver = 91.11.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mozilla.org/en-US/firefox/enterprise/
 	arch = x86_64
 	license = MPL
@@ -146,6 +146,7 @@ pkgbase = firefox-esr
 	source = https://archive.mozilla.org/pub/firefox/releases/91.11.0esr/source/firefox-91.11.0esr.source.tar.xz
 	source = https://archive.mozilla.org/pub/firefox/releases/91.11.0esr/source/firefox-91.11.0esr.source.tar.xz.asc
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
+	source = 0002-fix-ftbfs-newer-cbindgen.patch
 	source = firefox-esr.desktop
 	source = identity-icons-brand.svg
 	source = firefox-esr-i18n-91.11.0-ach.xpi::https://archive.mozilla.org/pub/mozilla.org/firefox/releases/91.11.0esr/linux-x86_64/xpi/ach.xpi
@@ -248,6 +249,7 @@ pkgbase = firefox-esr
 	sha512sums = bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96
 	sha512sums = SKIP
 	sha512sums = 88509577b686c995144163538efdba3cfe1a3b01564d3823b9fb7972e64823d1d0a444372636f8d0b355c485f095df8f273a6eb5560fce4c41d4f1c0a0467f75
+	sha512sums = e41c1ee61ae18d77cdb98f87d90e48fc4fe6fb2acf938bbcd41bdd75d0255bda9e25b10a7a984cfa86f5d3b956e691abd51417e3b755a79f2dba52ad43bf0b19
 	sha512sums = 4b53ee133a4ecaf068e240f6a05a1ebf4b788d67fe9141cc5b3561e1128907c8c3edb49bf2b24ba89daf1552f94ac48adf682dbe7dd070cffe7f78d98f2b3338
 	sha512sums = b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17
 	sha512sums = 515e8424da6d1505480f15451c56363bf72471fa4d0e47b3e43b4cac261b088b82a85ad2f3234edfb8499beabf392e0636b227d0d7cc7285e544b1e2bdcdf395
diff --git a/0002-fix-ftbfs-newer-cbindgen.patch b/0002-fix-ftbfs-newer-cbindgen.patch
new file mode 100644
index 000000000000..a996d355b041
--- /dev/null
+++ b/0002-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/PKGBUILD b/PKGBUILD
index 104958638839..da24a9af4e9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 pkgbase=firefox-esr
 pkgname=(firefox-esr)
 pkgver=91.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -28,6 +28,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags !strip !lto !debug)
 source=(https://archive.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
+        0002-fix-ftbfs-newer-cbindgen.patch
         $pkgname.desktop identity-icons-brand.svg)
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
@@ -349,6 +350,7 @@ done
 sha512sums=('bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96'
             'SKIP'
             '88509577b686c995144163538efdba3cfe1a3b01564d3823b9fb7972e64823d1d0a444372636f8d0b355c485f095df8f273a6eb5560fce4c41d4f1c0a0467f75'
+            'e41c1ee61ae18d77cdb98f87d90e48fc4fe6fb2acf938bbcd41bdd75d0255bda9e25b10a7a984cfa86f5d3b956e691abd51417e3b755a79f2dba52ad43bf0b19'
             '4b53ee133a4ecaf068e240f6a05a1ebf4b788d67fe9141cc5b3561e1128907c8c3edb49bf2b24ba89daf1552f94ac48adf682dbe7dd070cffe7f78d98f2b3338'
             'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17'
             '515e8424da6d1505480f15451c56363bf72471fa4d0e47b3e43b4cac261b088b82a85ad2f3234edfb8499beabf392e0636b227d0d7cc7285e544b1e2bdcdf395'