diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index 701c6e55aa40..a8626186bf85 100644 --- a/www/waterfox/Makefile +++ b/www/waterfox/Makefile @@ -1,95 +1,95 @@ PORTNAME= waterfox -DISTVERSION= 6.6.15 +DISTVERSION= 6.6.16 PORTEPOCH= 1 CATEGORIES= www MAINTAINER= freebsd@sysctl.cz COMMENT= Distilled fork of Firefox WWW= https://www.waterfox.net/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.122.0:security/nss \ + nss>=3.124.0:security/nss \ icu>=76.1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=10.1.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.45:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ libvpx>=1.15.0:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasip1/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasip1/libc.a:devel/wasi-libc@${LLVM_VERSION} \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} USE_GECKO= gecko USE_GITHUB= yes GH_ACCOUNT= BrowserWorks GH_TUPLE= BrowserWorks:l10n:a2e5c9b: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 CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" CONFIGURE_ENV+= MOZ_REQUIRE_SIGNING="" FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png MOZILLA_CAP= ${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//} MOZ_EXPORT= MOZ_TELEMETRY_REPORTING="" \ MOZILLA_OFFICIAL="1" \ MOZ_OFFICIAL_BRANDING="1" \ MOZ_APP_DISPLAYNAME="${MOZILLA_CAP}" \ MOZ_APP_NAME="${MOZILLA}" MOZ_OPTIONS= --enable-application=browser \ --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot \ --allow-addon-sideload \ --disable-crashreporter \ --disable-debug \ --disable-default-browser-agent \ --disable-tests \ --disable-updater \ --enable-hardening \ --enable-optimize \ --enable-release \ --with-app-name=${MOZILLA} \ --with-unsigned-addon-scopes=app,system \ --enable-bootstrap \ MOZ_CRASHREPORTER=0 \ MOZ_DATA_REPORTING=0 .include "${.CURDIR}/../../www/firefox/Makefile.options" .include .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 .if ${ARCH} == amd64 MOZ_OPTIONS+= --enable-rust-simd .endif post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/waterfox.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${DESKTOPDIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include diff --git a/www/waterfox/distinfo b/www/waterfox/distinfo index e78a8ea5bd43..2143c20671f7 100644 --- a/www/waterfox/distinfo +++ b/www/waterfox/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1781758274 -SHA256 (BrowserWorks-waterfox-6.6.15_GH0.tar.gz) = 137de83d466e4c3c13c71a7035f17d0f4db10a935e910106451a6a674ef6fa4f -SIZE (BrowserWorks-waterfox-6.6.15_GH0.tar.gz) = 926581884 +TIMESTAMP = 1783661894 +SHA256 (BrowserWorks-waterfox-6.6.16_GH0.tar.gz) = fc969bd20b1ca67b89e448fe0cc3486c496a9e7a2039efb16f29f7142946dacc +SIZE (BrowserWorks-waterfox-6.6.16_GH0.tar.gz) = 926684275 SHA256 (BrowserWorks-l10n-a2e5c9b_GH0.tar.gz) = b59e1ad5a16b3fcfb4266edb7a641098c511ce593b8f2ff291cc7dc3ca054b03 SIZE (BrowserWorks-l10n-a2e5c9b_GH0.tar.gz) = 25811834 diff --git a/www/waterfox/files/patch-bug2046162 b/www/waterfox/files/patch-bug2046162 deleted file mode 100644 index 7e47b1356afc..000000000000 --- a/www/waterfox/files/patch-bug2046162 +++ /dev/null @@ -1,31 +0,0 @@ -diff --git gfx/wr/webrender/src/texture_cache.rs gfx/wr/webrender/src/texture_cache.rs ---- gfx/wr/webrender/src/texture_cache.rs -+++ gfx/wr/webrender/src/texture_cache.rs -@@ -270,23 +270,23 @@ - SharedAlpha16, - Standalone, - } - - impl BudgetType { -- pub const COUNT: usize = 7; -+ const COUNT: usize = 7; - -- pub const VALUES: [BudgetType; BudgetType::COUNT] = [ -+ const VALUES: [BudgetType; BudgetType::COUNT] = [ - BudgetType::SharedColor8Linear, - BudgetType::SharedColor8Nearest, - BudgetType::SharedColor8Glyphs, - BudgetType::SharedAlpha8, - BudgetType::SharedAlpha8Glyphs, - BudgetType::SharedAlpha16, - BudgetType::Standalone, - ]; - -- pub const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [ -+ const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [ - profiler::ATLAS_COLOR8_LINEAR_PRESSURE, - profiler::ATLAS_COLOR8_NEAREST_PRESSURE, - profiler::ATLAS_COLOR8_GLYPHS_PRESSURE, - profiler::ATLAS_ALPHA8_PRESSURE, - profiler::ATLAS_ALPHA8_GLYPHS_PRESSURE, - diff --git a/www/waterfox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/www/waterfox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp deleted file mode 100644 index 8d4ac6407f81..000000000000 --- a/www/waterfox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- gfx/skia/skia/src/core/SkCpu.cpp.orig 2025-02-24 16:56:14 UTC -+++ gfx/skia/skia/src/core/SkCpu.cpp -@@ -89,6 +89,26 @@ - } - #endif - -+#if (SK_CPU_ARM32) && defined(__FreeBSD__) -+ #include -+ -+ static uint32_t read_cpu_features() { -+ unsigned long caps = 0; -+ uint32_t features = 0; -+ -+ elf_aux_info(AT_HWCAP, &caps, sizeof caps); -+ -+ if (caps & HWCAP_NEON) { -+ features |= SkCpu::NEON; -+ if (caps & HWCAP_VFPv4) { -+ features |= SkCpu::NEON_FMA|SkCpu::VFP_FP16; -+ } -+ } -+ -+ return features; -+ } -+#endif -+ - uint32_t SkCpu::gCachedFeatures = 0; - - void SkCpu::CacheRuntimeFeatures() {