Date: Tue, 06 Jan 2026 22:40:49 +0000 Message-ID: <695d8f71.25c23.463d7b7d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=23e2ed5f0c58a26f6ee3c6d62722e66a3120ef06 commit 23e2ed5f0c58a26f6ee3c6d62722e66a3120ef06 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2026-01-06 22:40:17 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2026-01-06 22:40:17 +0000 www/firefox-esr: update to 140.7.0 (rc1) Release Notes (soon): https://www.firefox.com/en-US/firefox/140.7.0/releasenotes/ --- www/firefox-esr/Makefile | 3 +- www/firefox-esr/distinfo | 6 ++-- www/firefox-esr/files/patch-bug1269654 | 34 +++++++++++++++++++ www/firefox-esr/files/patch-bug1269654_comment5 | 43 ------------------------- 4 files changed, 38 insertions(+), 48 deletions(-) diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 898c7c931af8..ca2463958e5f 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -1,6 +1,5 @@ PORTNAME= firefox -DISTVERSION= 140.6.0 -PORTREVISION= 1 +DISTVERSION= 140.7.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index 593b991b1898..6c39ff6a3090 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1764619757 -SHA256 (firefox-140.6.0esr.source.tar.xz) = 6c35c9ab507521033c8fd49f1b4c85ee158f33ed36f5781a663f116c3d604dc9 -SIZE (firefox-140.6.0esr.source.tar.xz) = 643086844 +TIMESTAMP = 1767737118 +SHA256 (firefox-140.7.0esr.source.tar.xz) = 608a739071726f30236f7100ec5e30e1b8ec342d4e91e715948c287909cb1529 +SIZE (firefox-140.7.0esr.source.tar.xz) = 641146512 diff --git a/www/firefox-esr/files/patch-bug1269654 b/www/firefox-esr/files/patch-bug1269654 new file mode 100644 index 000000000000..9f9265f86bfe --- /dev/null +++ b/www/firefox-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/www/firefox-esr/files/patch-bug1269654_comment5 b/www/firefox-esr/files/patch-bug1269654_comment5 deleted file mode 100644 index 0aa2d639d352..000000000000 --- a/www/firefox-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; - } - }help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?695d8f71.25c23.463d7b7d>