diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index c986917602da..36d90d8c9a7b 100644 --- a/www/waterfox/Makefile +++ b/www/waterfox/Makefile @@ -1,105 +1,105 @@ PORTNAME= waterfox -DISTVERSION= 6.5.2 +DISTVERSION= 6.5.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.101:security/nss \ + nss>=3.107:security/nss \ icu>=74.2:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=8.5.0:print/harfbuzz \ + harfbuzz>=10.1.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ - png>=1.6.43:graphics/png \ + png>=1.6.44:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ - libvpx>=1.14.0:multimedia/libvpx \ + libvpx>=1.14.1:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf2.13:devel/autoconf2.13 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip USE_GECKO= gecko USE_GITHUB= yes GH_ACCOUNT= BrowserWorks GH_PROJECT= Waterfox 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 CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" \ MOZ_REQUIRE_SIGNING="" CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 BINARY_ALIAS+= python3=${PYTHON_CMD} 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 \ --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 FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop .include "${.CURDIR}/../../www/firefox/Makefile.options" .include .if ${ARCH} == amd64 MOZ_OPTIONS+= --enable-rust-simd .endif .if ${ARCH} == powerpc64 CFLAGS+= -DHWY_COMPILE_ONLY_SCALAR MOZ_OPTIONS+= --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e 's/firefox/${MOZILLA}/' \ -e 's/Firefox/${MOZILLA_CAP}/' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${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 9686a70797f7..42372e87cabb 100644 --- a/www/waterfox/distinfo +++ b/www/waterfox/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1734107781 -SHA256 (BrowserWorks-Waterfox-6.5.2_GH0.tar.gz) = 33c8d47d5955f4e2f1568eb1ae2780b3d6e65ffab3ec145672dd29e0dbb1f122 -SIZE (BrowserWorks-Waterfox-6.5.2_GH0.tar.gz) = 824023785 +TIMESTAMP = 1736354954 +SHA256 (BrowserWorks-Waterfox-6.5.3_GH0.tar.gz) = 4e00bbf6d875ac88e21eebc7e91fcd5f875d70c2ef357cc6c5fa99fecbbc1505 +SIZE (BrowserWorks-Waterfox-6.5.3_GH0.tar.gz) = 824110670 SHA256 (BrowserWorks-l10n-3046738_GH0.tar.gz) = f9a16202b73558188af3157d427845153a89b3f3b3269c1e5d8ebc9e60eb9bd1 SIZE (BrowserWorks-l10n-3046738_GH0.tar.gz) = 19480746 diff --git a/www/waterfox/files/patch-python_mozversioncontrol_mozversioncontrol_____init____.py b/www/waterfox/files/patch-python_mozversioncontrol_mozversioncontrol_____init____.py deleted file mode 100644 index ee58a0aab6aa..000000000000 --- a/www/waterfox/files/patch-python_mozversioncontrol_mozversioncontrol_____init____.py +++ /dev/null @@ -1,15 +0,0 @@ ---- python/mozversioncontrol/mozversioncontrol/__init__.py.orig 2024-12-13 13:44:42 UTC -+++ python/mozversioncontrol/mozversioncontrol/__init__.py -@@ -1019,9 +1019,10 @@ class SrcRepository(Repository): - """ - res = [] - # move away the .git or .hg folder from path to more easily test in a hg/git repo -- for root, dirs, files in os.walk("."): -+ for root, dirs, files in os.walk(self.path): -+ base = os.path.relpath(root, self.path) - for name in files: -- res.append(os.path.join(root, name)) -+ res.append(os.path.join(base, name)) - return res - - def get_tracked_files_finder(self, path):