diff --git a/network/mail/thunderbird/files/cbindgen-0.24.patch b/network/mail/thunderbird/files/cbindgen-0.24.patch
new file mode 100644
index 0000000000..3011e8ada8
--- /dev/null
+++ b/network/mail/thunderbird/files/cbindgen-0.24.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/network/mail/thunderbird/files/metainfo.patch b/network/mail/thunderbird/files/metainfo.patch
new file mode 100644
index 0000000000..afc9b5b3eb
--- /dev/null
+++ b/network/mail/thunderbird/files/metainfo.patch
@@ -0,0 +1,11 @@
+diff -Naur thunderbird-78.9.1.orig/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml thunderbird-78.9.1/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml
+--- thunderbird-78.9.1.orig/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml	2021-04-17 02:05:05.808596043 +0000
++++ thunderbird-78.9.1/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml	2021-04-17 02:06:12.052455998 +0000
+@@ -1,6 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <component type="desktop-application">
+   <id>net.thunderbird.Thunderbird</id>
++  <launchable type="desktop-id">thunderbird.desktop</launchable>
+   <metadata_license>CC0-1.0</metadata_license>
+   <name>Thunderbird</name>
+   <summary>Thunderbird is a free and open source email, newsfeed, chat, and calendaring client</summary>
diff --git a/network/mail/thunderbird/pspec.xml b/network/mail/thunderbird/pspec.xml
index ea2bfa4929..7594756870 100644
--- a/network/mail/thunderbird/pspec.xml
+++ b/network/mail/thunderbird/pspec.xml
@@ -56,7 +56,8 @@
             <Dependency>libnotify-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">thunderbird-install-dir.patch</Patch> -->
+            <Patch level="1">metainfo.patch</Patch>
+            <Patch level="1">cbindgen-0.24.patch</Patch>
         </Patches>
     </Source>