diff options
Diffstat (limited to 'www/waterfox')
| -rw-r--r-- | www/waterfox/Makefile | 10 | ||||
| -rw-r--r-- | www/waterfox/distinfo | 10 | ||||
| -rw-r--r-- | www/waterfox/files/patch-bug1876366 | 23 | ||||
| -rw-r--r-- | www/waterfox/files/patch-bug1876632 | 35 |
4 files changed, 43 insertions, 35 deletions
diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index ca094e9fc62c..204883440353 100644 --- a/www/waterfox/Makefile +++ b/www/waterfox/Makefile @@ -1,5 +1,5 @@ PORTNAME= waterfox -DISTVERSION= 6.6.0-beta-3 +DISTVERSION= 6.6.0-beta-6 PORTEPOCH= 1 CATEGORIES= www @@ -31,7 +31,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ USE_GECKO= gecko USE_GITHUB= yes GH_ACCOUNT= BrowserWorks -GH_TUPLE= BrowserWorks:l10n:39f141a:l10n/waterfox/browser/locales +GH_TUPLE= BrowserWorks:l10n:3046738: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 @@ -70,14 +70,10 @@ MOZ_OPTIONS= --enable-application=browser \ .include <bsd.port.options.mk> -.if ${ARCH} == i386 -BUILD_DEPENDS+= node${NODEJS_VERSION}>=24:www/node${NODEJS_VERSION} -USES+= nodejs:24,build,env -. if ${MACHINE_CPU:Msse2} +.if ${ARCH} == i386 && ${MACHINE_CPU:Msse2} # is not enabled on i386 by default # Fix for error: always_inline function '_mm_setzero_si64' requires target feature 'sse2' CFLAGS_i386+= -msse2 -. endif .endif .if ${ARCH} == amd64 diff --git a/www/waterfox/distinfo b/www/waterfox/distinfo index 1bab5b32df24..36a01b8b2443 100644 --- a/www/waterfox/distinfo +++ b/www/waterfox/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1753542067 -SHA256 (BrowserWorks-waterfox-6.6.0-beta-3_GH0.tar.gz) = 7094885ecac084c20b9d33808c50f687e0a2490a591bad2b86602d363b5b4a58 -SIZE (BrowserWorks-waterfox-6.6.0-beta-3_GH0.tar.gz) = 919409894 -SHA256 (BrowserWorks-l10n-39f141a_GH0.tar.gz) = 269b2f6c59e19ec07a9e231ab8bfb1d8d834b811136c07720955de0747c2d0fc -SIZE (BrowserWorks-l10n-39f141a_GH0.tar.gz) = 23702129 +TIMESTAMP = 1755193903 +SHA256 (BrowserWorks-waterfox-6.6.0-beta-6_GH0.tar.gz) = b906b3de5d2c4e24e83acce38cb4713350aac310f628f0046fd029a14e4077eb +SIZE (BrowserWorks-waterfox-6.6.0-beta-6_GH0.tar.gz) = 919514150 +SHA256 (BrowserWorks-l10n-3046738_GH0.tar.gz) = f9a16202b73558188af3157d427845153a89b3f3b3269c1e5d8ebc9e60eb9bd1 +SIZE (BrowserWorks-l10n-3046738_GH0.tar.gz) = 19480746 diff --git a/www/waterfox/files/patch-bug1876366 b/www/waterfox/files/patch-bug1876366 deleted file mode 100644 index 78483c3fbab7..000000000000 --- a/www/waterfox/files/patch-bug1876366 +++ /dev/null @@ -1,23 +0,0 @@ -commit 46a89fb0319d673b3139a068e3d89aed9f44fc16 -Author: Christoph Moench-Tegeder <cmt@burggraben.net> - - use gdk legacy cursor interface by default - - Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=1876366#c16 - hints that we could re-test this once we have GTK 3.24.42 (with the - now-current gtk3-3.24.41 the original problem is still reproducable, - but toggling this flag does fix it for me) - -diff --git modules/libpref/init/StaticPrefList.yaml modules/libpref/init/StaticPrefList.yaml -index 835450712a12..f2249006c36d 100644 ---- modules/libpref/init/StaticPrefList.yaml -+++ modules/libpref/init/StaticPrefList.yaml -@@ -16070,7 +16070,7 @@ - # Whether to use gtk legacy cursor API. - - name: widget.gtk.legacy-cursors.enabled - type: bool -- value: false -+ value: true - mirror: always - - # Whether to use gtk high contrast themes to disable content styling like on diff --git a/www/waterfox/files/patch-bug1876632 b/www/waterfox/files/patch-bug1876632 new file mode 100644 index 000000000000..3932b1deccc9 --- /dev/null +++ b/www/waterfox/files/patch-bug1876632 @@ -0,0 +1,35 @@ +commit 4f531ca86d24be5d4de673f6e652ed899151d20c +Author: Jesper Schmitz Mouridsen <jesper@schmitz.computer> +Date: Wed Jul 23 22:01:31 2025 +0000 + + Bug 1876632 Fix aslr allocations on FreeBSD r=spidermonkey-reviewers,sfink + + Without the alignment flag the desired address + gets randomized by aslr in a way which causes it to not + be aligned. Furthermore the TryToAlignChunk almost always + fails. With this fix it never gets to TryToAlignChunk + because the flag guarantees upfront alignment. + + Differential Revision: https://phabricator.services.mozilla.com/D257824 + +diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp +index e790f1784ede..13639c9a6eb4 100644 +--- js/src/gc/Memory.cpp ++++ js/src/gc/Memory.cpp +@@ -608,7 +608,16 @@ static void* MapAlignedPagesRandom(size_t length, size_t alignment) { + for (size_t i = 1; i <= 1024; ++i) { + if (i & 0xf) { + uint64_t desired = alignment * GetNumberInRange(minNum, maxNum); ++# if defined(__FreeBSD__) && defined(__aarch64__) ++ int flags = MAP_PRIVATE | MAP_ANON | ++ MAP_ALIGNED(mozilla::CeilingLog2Size(alignment)); ++ region = MozTaggedAnonymousMmap((void*)(uintptr_t)desired, length, ++ int(PageAccess::ReadWrite), flags, -1, 0, ++ "js-gc-heap"); ++# else + region = MapMemoryAtFuzzy(reinterpret_cast<void*>(desired), length); ++ ++# endif + if (!region) { + continue; + } |