mail/thunderbird-esr: update to 140.7.0 (rc1)2025Q4

Release Notes:
  https://www.thunderbird.net/en-US/thunderbird/140.7.0esr/releasenotes/

(cherry picked from commit 1d04867f13ef2c90a27d168a4c296197433f7800)

4 files changed, 40 insertions, 48 deletions

diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index e005626c7fd0..945f25c3adea 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -1,8 +1,9 @@
 PORTNAME=	thunderbird
-DISTVERSION=	140.6.0
+DISTVERSION=	140.7.0
+
 CATEGORIES=	mail news net-im wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
 PKGNAMESUFFIX=	-esr
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
index c9819612b7b8..0e2a1c134e87 100644
--- a/mail/thunderbird-esr/distinfo
+++ b/mail/thunderbird-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765306946
-SHA256 (thunderbird-140.6.0esr.source.tar.xz) = c5ff00249b032009f34486c927e0d6566ac9c5f0b1d036548b5a880d4bbbddc6
-SIZE (thunderbird-140.6.0esr.source.tar.xz) = 750981904
+TIMESTAMP = 1767984494
+SHA256 (thunderbird-140.7.0esr.source.tar.xz) = 97a9be86fae8881d3aa0f899dfa864b51723596cdeb6a09b3ecc2a0e81f45c18
+SIZE (thunderbird-140.7.0esr.source.tar.xz) = 757376992
diff --git a/mail/thunderbird-esr/files/patch-bug1269654 b/mail/thunderbird-esr/files/patch-bug1269654
new file mode 100644
index 000000000000..9f9265f86bfe
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-bug1269654
@@ -0,0 +1,34 @@
+commit ff13efe458e7786d8c810342d25a6ba8e90a422b
+Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+
+    based on BMO 1269654
+    
+    : https://bugzilla.mozilla.org/show_bug.cgi?id=1269654#c5
+    : https://bug1269654.bmoattachments.org/attachment.cgi?id=8749234
+    : handle big-endian formats in Cairo format conversions
+    :
+    : HG changeset patch
+    : User Lee Salzman <lsalzman@mozilla.com>
+    : Date 1462463631 14400
+    :      Thu May 05 11:53:51 2016 -0400
+    : Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
+    : Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
+    : handle big-endian formats in Cairo format conversions
+
+diff --git gfx/2d/HelpersCairo.h gfx/2d/HelpersCairo.h
+index a10e01bdd62b..f2007ee189fc 100644
+--- gfx/2d/HelpersCairo.h
++++ gfx/2d/HelpersCairo.h
+@@ -185,7 +185,11 @@ static inline cairo_content_t GfxFormatToCairoContent(SurfaceFormat format) {
+     case SurfaceFormat::A8:
+       return CAIRO_CONTENT_ALPHA;
+     default:
+-      gfxCriticalError() << "Unknown image content format " << (int)format;
++      if (format == SurfaceFormat::B8G8R8X8) {
++        return CAIRO_CONTENT_COLOR;
++      } else if (format != SurfaceFormat::B8G8R8A8) {
++        gfxCriticalError() << "Unknown image content format " << (int)format;
++      }
+       return CAIRO_CONTENT_COLOR_ALPHA;
+   }
+ }
diff --git a/mail/thunderbird-esr/files/patch-bug1269654_comment5 b/mail/thunderbird-esr/files/patch-bug1269654_comment5
deleted file mode 100644
index 0aa2d639d352..000000000000
--- a/mail/thunderbird-esr/files/patch-bug1269654_comment5
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1269654#c5
-https://bug1269654.bmoattachments.org/attachment.cgi?id=8749234
-handle big-endian formats in Cairo format conversions
-
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1462463631 14400
-#      Thu May 05 11:53:51 2016 -0400
-# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d
-# Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
-handle big-endian formats in Cairo format conversions
-
---- gfx/2d/HelpersCairo.h.orig	2019-12-02 17:51:16.633474000 +0100
-+++ gfx/2d/HelpersCairo.h	2019-12-02 17:52:44.939998000 +0100
-@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
-     case SurfaceFormat::R5G6B5_UINT16:
-       return CAIRO_FORMAT_RGB16_565;
-     default:
--      gfxCriticalError() << "Unknown image format " << (int)format;
-+      // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms,
-+      // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32.
-+      // See bug 1269654
-+      if (format == SurfaceFormat::B8G8R8X8) {
-+        return CAIRO_FORMAT_RGB24;
-+      } else if (format != SurfaceFormat::B8G8R8A8) {
-+        gfxCriticalError() << "Unknown image format " << (int)format;
-+      }
-       return CAIRO_FORMAT_ARGB32;
-   }
- }
-@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent(
-     case SurfaceFormat::A8:
-       return CAIRO_CONTENT_ALPHA;
-     default:
--      gfxCriticalError() << "Unknown image content format " << (int)format;
-+      if (format == SurfaceFormat::B8G8R8X8) {
-+        return CAIRO_CONTENT_COLOR;
-+      } else if (format != SurfaceFormat::B8G8R8A8) {
-+        gfxCriticalError() << "Unknown image content format " << (int)format;
-+      }
-       return CAIRO_CONTENT_COLOR_ALPHA;
-   }
- }