From 5a8de5965ecb206e92ad2cb7c2a964106fd50cb7 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 9 May 2022 11:39:07 -0500
Subject: [PATCH] Update to thunderbird-91.9.0.

---
 introduction/welcome/changelog.xml |  4 ++++
 packages.ent                       |  2 +-
 xsoft/other/thunderbird.xml        | 18 ++++++++----------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7e9e7cb2be..b9e588cf89 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>May 9th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to thunderbird-91.9.0. Fixes
+          <ulink url="&blfs-ticket-root;16508">#16508</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to seamonkey-2.53.12. Fixes
           <ulink url="&blfs-ticket-root;16507">#16507</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 7ea75eab42..a570b2e709 100644
--- a/packages.ent
+++ b/packages.ent
@@ -981,7 +981,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY pidgin-version               "2.14.9">
 <!ENTITY rox-filer-version            "2.11">
 <!ENTITY rxvt-unicode-version         "9.30">
-<!ENTITY thunderbird-version          "91.8.1">
+<!ENTITY thunderbird-version          "91.9.0">
 <!ENTITY tigervnc-version             "1.12.0">
 <!ENTITY transmission-version         "3.00">
 <!ENTITY xarchiver-version            "0.5.4.17">
diff --git a/xsoft/other/thunderbird.xml b/xsoft/other/thunderbird.xml
index 8d1f4930a4..fb6723279f 100644
--- a/xsoft/other/thunderbird.xml
+++ b/xsoft/other/thunderbird.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY thunderbird-download-http "&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">
   <!ENTITY thunderbird-download-ftp  " ">
-  <!ENTITY thunderbird-md5sum        "23f6da0d3eb12630a7870536cb2790d7">
+  <!ENTITY thunderbird-md5sum        "fc2586bc8b7e88f8b6abb394e6de289f">
   <!ENTITY thunderbird-size          "385 MB">
-  <!ENTITY thunderbird-buildsize     "6.9 GB (192 MB installed)">
+  <!ENTITY thunderbird-buildsize     "6.9 GB (191 MB installed)">
   <!ENTITY thunderbird-time          "24 SBU (on a 4-core machine)">
   <!-- Removed the -j1 time because python and rust do not obey it, although
        the C/C++ code appears to obey it -->
@@ -72,17 +72,15 @@
       </listitem>
     </itemizedlist>
 
-<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
           Required patch:
-          <ulink url="&patch-root;/thunderbird-&thunderbird-version;-buildfix-1.patch"/>
+          <ulink url="&patch-root;/thunderbird-&thunderbird-version;-gcc12_fix-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">Thunderbird Dependencies</bridgehead>
 
@@ -218,16 +216,16 @@ ac_add_options --with-system-png
 ac_add_options --with-system-zlib</literal>
 EOF</userinput></screen>
 
-<!-- no longer needed with 91.6
+
     <para>
-      Apply a patch which allows compilation on systems with Wayland-1.20:
+      Apply a patch which allows compilation on systems with gcc-12:
     </para>
 
-<screen><userinput remap="pre">patch -p1 -i ../thunderbird-&thunderbird-version;-buildfix-1.patch</userinput></screen>
--->
+<screen><userinput remap="pre">patch -Np1 -i ../thunderbird-&thunderbird-version;-gcc12_fix-1.patch</userinput></screen>
 
 <!-- applying this for 11.1: upstream haven't make their mind yet
-     https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 -->
+     https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 
+     Still not fixed in 91.9.0. -->
     <para>
       If building on a 32 bit machine, the following sed works around
       an issue with an incompatible <quote>double</quote> type in one