From 7c291f8e2cac75d3ca8faab5fc8b4f09af2de000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 8 Jul 2025 17:05:14 +0200
Subject: [PATCH] thunderbird: 139.0.2 -> 140.0

https://www.thunderbird.net/en-US/thunderbird/140.0/releasenotes/
The patch needed tiny conflict-resolution.
---
 .../thunderbird/no-buildconfig-tb140.patch           | 12 ++++++++++++
 .../networking/mailreaders/thunderbird/packages.nix  |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-tb140.patch

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-tb140.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-tb140.patch
new file mode 100644
index 000000000000..4ac9834696b0
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-tb140.patch
@@ -0,0 +1,12 @@
+Remove about:buildconfig.  If used as-is, it would add unnecessary runtime dependencies.
+--- a/comm/mail/base/jar.mn
++++ b/comm/mail/base/jar.mn
+@@ -132,8 +132,6 @@
+ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
+ % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml
+ 
+-*   content/messenger/buildconfig.html              (content/buildconfig.html)
+-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html
+ % override chrome://global/locale/appstrings.properties chrome://messenger/locale/appstrings.properties
+ 
+ comm.jar:
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 1b2659decf9e..e948075cc125 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -47,7 +47,7 @@ let
       extraPatches =
         [
           # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
-          ./no-buildconfig.patch
+          (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
         ]
         ++ lib.optionals (lib.versionOlder version "139") [
           # clang-19 fixes for char_traits build issue
@@ -95,8 +95,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "139.0.2";
-    sha512 = "edb20c692674dc5c3ba70673f7dd03710bf7ac0ce2be614a7a4b3d2b40b20b4974aab2a621dd5b43720c412a590c08f8b78abeb9b61f288f3217c6a04cc1e8ff";
+    version = "140.0";
+    sha512 = "2e9a5fb44b21eba3e3295205142bfad666a65f9eea43118388968320597a940cf3c5675fbcf458fbbaa9e1bb85fe8a663feda6461b7e23f7103c5bb7a1103bd4";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";