diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index c3463bd27162..4ae0cdd34dfa 100644 --- a/www/waterfox/Makefile +++ b/www/waterfox/Makefile @@ -1,98 +1,95 @@ PORTNAME= waterfox -DISTVERSION= 6.6.13 -PORTREVISION= 1 +DISTVERSION= 6.6.14 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 \ 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:f17435e:l10n/waterfox/browser/locales +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 - @${REINPLACE_CMD} -e 's|wasm32-wasi|&p1|' \ - ${WRKSRC}/build/moz.configure/toolchain.configure 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 3ea6f6b5101a..583407a596bb 100644 --- a/www/waterfox/distinfo +++ b/www/waterfox/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1779255352 -SHA256 (BrowserWorks-waterfox-6.6.13_GH0.tar.gz) = 1e2863d4c533af73995f66e1b517416b501573956eec1619e8854c6b4ecf3f77 -SIZE (BrowserWorks-waterfox-6.6.13_GH0.tar.gz) = 926517089 -SHA256 (BrowserWorks-l10n-f17435e_GH0.tar.gz) = 384e019dd86975c093b2177fb72f27d20c63c8cc126fd7a9e47e0b5aa9434338 -SIZE (BrowserWorks-l10n-f17435e_GH0.tar.gz) = 25801987 +TIMESTAMP = 1781126472 +SHA256 (BrowserWorks-waterfox-6.6.14_GH0.tar.gz) = 148fc4ecc545f3e6f373a87c774c86fee5e94badd438e1445e6b502a72a0ffa9 +SIZE (BrowserWorks-waterfox-6.6.14_GH0.tar.gz) = 926682087 +SHA256 (BrowserWorks-l10n-a2e5c9b_GH0.tar.gz) = b59e1ad5a16b3fcfb4266edb7a641098c511ce593b8f2ff291cc7dc3ca054b03 +SIZE (BrowserWorks-l10n-a2e5c9b_GH0.tar.gz) = 25811834 diff --git a/www/waterfox/files/patch-bug2023597 b/www/waterfox/files/patch-bug2023597 new file mode 100644 index 000000000000..e4dd6184fe39 --- /dev/null +++ b/www/waterfox/files/patch-bug2023597 @@ -0,0 +1,25 @@ +commit c41de3cb5bd2b6fb243e10b150b705435d2db63c +Author: Alex Hochheiden +Date: Wed Apr 1 18:11:37 2026 +0000 + + Bug 2023597 - Use `wasm32-wasip1` target for clang >= 22.1 r=firefox-build-system-reviewers,sergesanspaille + + https://github.com/llvm/llvm-project/pull/165345 + https://releases.llvm.org/22.1.0/tools/clang/docs/ReleaseNotes.html + + Differential Revision: https://phabricator.services.mozilla.com/D291023 + +diff --git build/moz.configure/toolchain.configure build/moz.configure/toolchain.configure +index 10d715866b1f..4b07f9d7a8de 100644 +--- build/moz.configure/toolchain.configure ++++ build/moz.configure/toolchain.configure +@@ -695,6 +695,9 @@ def check_compiler(configure_cache, compiler, language, target, android_version) + # This makes clang define __ANDROID_API__ and use versioned library + # directories from the NDK. + toolchain = "%s%d" % (target.toolchain, android_version) ++ elif target.kernel == "WASI" and info.type == "clang" and info.version >= Version("22.1"): ++ # The wasm32-wasi target was renamed to wasm32-wasip1 in LLVM 22.1. ++ toolchain = "wasm32-wasip1" + else: + toolchain = target.toolchain + diff --git a/www/waterfox/files/patch-build_moz.configure_toolchain.configure b/www/waterfox/files/patch-build_moz.configure_toolchain.configure new file mode 100644 index 000000000000..c71acbccc37b --- /dev/null +++ b/www/waterfox/files/patch-build_moz.configure_toolchain.configure @@ -0,0 +1,46 @@ +commit 7503d73295e6a6fd84c35ffabce08e3d2f3b56de +Author: Christoph Moench-Tegeder + + catch wasm32-wasi target naming in FreeBSD + + Freebsd ports 7c5b2039a45ad renamed the WebAssemply target to + wasm32-wasip1 in all LLVM versions when LLVM 22.1 switched to + the new name. Make sure to catch it in toolchain.configure, so + the compiler can find it's assorted files. + +diff --git build/moz.configure/toolchain.configure build/moz.configure/toolchain.configure +index 5ca00b2b62a1..0e66441d8692 100644 +--- build/moz.configure/toolchain.configure ++++ build/moz.configure/toolchain.configure +@@ -653,6 +653,7 @@ def same_arch_different_bits(): + + @imports(_from="mozshellutil", _import="quote") + @imports(_from="mozbuild.configure.constants", _import="OS_preprocessor_checks") ++@imports(_from="sys", _import="platform") + def check_compiler(configure_cache, compiler, language, target, android_version): + info = get_compiler_info(configure_cache, compiler, language) + +@@ -695,8 +696,9 @@ def check_compiler(configure_cache, compiler, language, target, android_version) + # This makes clang define __ANDROID_API__ and use versioned library + # directories from the NDK. + toolchain = "%s%d" % (target.toolchain, android_version) +- elif target.kernel == "WASI" and info.type == "clang" and info.version >= Version("22.1"): +- # The wasm32-wasi target was renamed to wasm32-wasip1 in LLVM 22.1. ++ elif (target.kernel == "WASI" and info.type == "clang") and (info.version >= Version("22.1") or platform.startswith("freebsd")): ++ # The wasm32-wasi target was renamed to wasm32-wasip1 in LLVM 22.1 ++ # and FreeBSD uses it since ports 7c5b2039a45ad for all LLVM ports + toolchain = "wasm32-wasip1" + else: + toolchain = target.toolchain +@@ -954,8 +956,10 @@ def compiler_wrapper(wrapper, ccache): + + + @dependable ++@imports(_from="sys", _import="platform") + def wasm(): +- return split_triplet("wasm32-wasi", allow_wasi=True) ++ log.warning("USING PLATFORM %s" % platform) ++ return split_triplet("wasm32-wasip1" if platform.startswith("freebsd") else "wasm32-wasi", allow_wasi=True) + + + @template