git: aa0518eb5953 - main - www/waterfox: Update 6.6.7 => 6.6.8
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 13 Jan 2026 15:05:07 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=aa0518eb59539c0c472818a53e116ea263dcbcfc
commit aa0518eb59539c0c472818a53e116ea263dcbcfc
Author: Martin Filla <freebsd@sysctl.cz>
AuthorDate: 2026-01-13 15:03:05 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-01-13 15:03:05 +0000
www/waterfox: Update 6.6.7 => 6.6.8
Release Notes:
https://www.waterfox.com/releases/6.6.8/
PR: 292422
MFH: 2025Q4
---
www/waterfox/Makefile | 5 ++--
www/waterfox/distinfo | 10 +++----
www/waterfox/files/patch-bug1269654 | 34 ++++++++++++++++++++++
www/waterfox/files/patch-bug1269654_comment5 | 43 ----------------------------
4 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index a8219e91e173..79e61dac515a 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -1,6 +1,5 @@
PORTNAME= waterfox
-DISTVERSION= 6.6.7
-PORTREVISION= 2
+DISTVERSION= 6.6.8
PORTEPOCH= 1
CATEGORIES= www
@@ -32,7 +31,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \
USE_GECKO= gecko
USE_GITHUB= yes
GH_ACCOUNT= BrowserWorks
-GH_TUPLE= BrowserWorks:l10n:5889642:l10n/waterfox/browser/locales
+GH_TUPLE= BrowserWorks:l10n:bce7b1e:l10n/waterfox/browser/locales
USE_MOZILLA= -sqlite
# work around bindgen not finding ICU, e.g.
# dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
diff --git a/www/waterfox/distinfo b/www/waterfox/distinfo
index 19533f6f9028..e34e47ac7fa1 100644
--- a/www/waterfox/distinfo
+++ b/www/waterfox/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1766312992
-SHA256 (BrowserWorks-waterfox-6.6.7_GH0.tar.gz) = 9c141c32d8fef0863fce37e4c8bfb9c10ed9e4067c495bbd87f416454e941255
-SIZE (BrowserWorks-waterfox-6.6.7_GH0.tar.gz) = 922143007
-SHA256 (BrowserWorks-l10n-5889642_GH0.tar.gz) = ffef9201baa5272ad58b62c5df2817a7fbafe9ee83637298a0e1e5d171f15b84
-SIZE (BrowserWorks-l10n-5889642_GH0.tar.gz) = 25769911
+TIMESTAMP = 1768267747
+SHA256 (BrowserWorks-waterfox-6.6.8_GH0.tar.gz) = 93e7dd08a973430c956726d97f077362ca647ec1ae3f0516a71eb5aa1e449146
+SIZE (BrowserWorks-waterfox-6.6.8_GH0.tar.gz) = 922180436
+SHA256 (BrowserWorks-l10n-bce7b1e_GH0.tar.gz) = 9bed62a7f1425cc3d1f83fb604b9da3faf0bb45544e32a0812aa5aed1f30e9e0
+SIZE (BrowserWorks-l10n-bce7b1e_GH0.tar.gz) = 25769031
diff --git a/www/waterfox/files/patch-bug1269654 b/www/waterfox/files/patch-bug1269654
new file mode 100644
index 000000000000..9f9265f86bfe
--- /dev/null
+++ b/www/waterfox/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/waterfox/files/patch-bug1269654_comment5 b/www/waterfox/files/patch-bug1269654_comment5
deleted file mode 100644
index 0aa2d639d352..000000000000
--- a/www/waterfox/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;
- }
- }