diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index 7eabe9e4b614..635a8b944c52 100644 --- a/www/waterfox/Makefile +++ b/www/waterfox/Makefile @@ -1,96 +1,95 @@ PORTNAME= waterfox -DISTVERSION= 6.7.1.1 -PORTREVISION= 2 +DISTVERSION= 6.7.3 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.125.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:b70da34:l10n/waterfox/browser/locales +GH_TUPLE= BrowserWorks:l10n:2824d59: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 464c5c9265db..98ac7d29e610 100644 --- a/www/waterfox/distinfo +++ b/www/waterfox/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1787904472 -SHA256 (BrowserWorks-waterfox-6.7.1.1_GH0.tar.gz) = 29e1a024be18cf0ae914873af58c875db637ec0e6e8a594012ed598be22ec240 -SIZE (BrowserWorks-waterfox-6.7.1.1_GH0.tar.gz) = 1053503837 -SHA256 (BrowserWorks-l10n-b70da34_GH0.tar.gz) = 9b4e238c58789db1cbb2265c1e912d3c6fd8d58843ca1a3e410ef7d6246d279f -SIZE (BrowserWorks-l10n-b70da34_GH0.tar.gz) = 93338228 +TIMESTAMP = 1789244444 +SHA256 (BrowserWorks-waterfox-6.7.3_GH0.tar.gz) = 3d2610aca4d4e5d6901892759951d81a352d69b9d615f00b6e230bdc8c9ef91f +SIZE (BrowserWorks-waterfox-6.7.3_GH0.tar.gz) = 1051236814 +SHA256 (BrowserWorks-l10n-2824d59_GH0.tar.gz) = 66c6d5e244f9b2c067a9a5d2c28c4121b051762acc841d831f7189500288257f +SIZE (BrowserWorks-l10n-2824d59_GH0.tar.gz) = 93359470 diff --git a/www/waterfox/files/patch-third__party_pipewire_spa_param_audio_layout-types.h b/www/waterfox/files/patch-third__party_pipewire_spa_param_audio_layout-types.h new file mode 100644 index 000000000000..67741ac6eccf --- /dev/null +++ b/www/waterfox/files/patch-third__party_pipewire_spa_param_audio_layout-types.h @@ -0,0 +1,29 @@ +commit 52803d9c34299eafd54a50dcf70be63db35ce593 +Author: Christoph Moench-Tegeder + + use standard EINVAL instead of linux-only ECHRNG + + directly lifted from multimedia/pipewire + +diff --git third_party/pipewire/spa/param/audio/layout-types.h third_party/pipewire/spa/param/audio/layout-types.h +index 33650202ab85..45cca3a6f335 100644 +--- third_party/pipewire/spa/param/audio/layout-types.h ++++ third_party/pipewire/spa/param/audio/layout-types.h +@@ -87,7 +87,7 @@ spa_audio_layout_info_parse_name(struct spa_audio_layout_info *layout, size_t si + uint32_t i, n_pos; + if (spa_atou32(name+3, &n_pos, 10)) { + if (n_pos > max_position) +- return -ECHRNG; ++ return -EINVAL; + for (i = 0; i < 0x1000 && i < n_pos; i++) + layout->position[i] = SPA_AUDIO_CHANNEL_AUX0 + i; + for (; i < n_pos; i++) +@@ -99,7 +99,7 @@ spa_audio_layout_info_parse_name(struct spa_audio_layout_info *layout, size_t si + SPA_FOR_EACH_ELEMENT_VAR(spa_type_audio_layout_info, i) { + if (spa_streq(name, i->name)) { + if (i->layout.n_channels > max_position) +- return -ECHRNG; ++ return -EINVAL; + *layout = i->layout; + return i->layout.n_channels; + }