diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index ec7b7a639022..54b56452ad98 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -1,65 +1,65 @@ PORTNAME= firefox -DISTVERSION= 153.0 +DISTVERSION= 153.1.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source PKGNAMESUFFIX= -esr DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla WWW= https://www.firefox.com/ NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= fails to build: rust needs more address space than platform can provide BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nss>=3.125:security/nss \ 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 CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox 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" USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding \ --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .include "${.CURDIR}/../../www/firefox/Makefile.options" post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/firefox.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}${PREFIX}/share/applications ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index ab6a53144592..d07e31cc49ad 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1784222975 -SHA256 (firefox-153.0esr.source.tar.xz) = dbe3d9dedcb118a4b623688c559c6f2de280ea3be171e3ff256504cc01626cb5 -SIZE (firefox-153.0esr.source.tar.xz) = 804309272 +TIMESTAMP = 1786551294 +SHA256 (firefox-153.1.0esr.source.tar.xz) = 77adcb2664dda25ca1f01f5a795ae695ed0a0a1464a268c4f13159956407c7ad +SIZE (firefox-153.1.0esr.source.tar.xz) = 801285696 diff --git a/www/firefox-esr/files/patch-toolkit_library_moz.build b/www/firefox-esr/files/patch-toolkit_library_moz.build deleted file mode 100644 index 87ef1afb0840..000000000000 --- a/www/firefox-esr/files/patch-toolkit_library_moz.build +++ /dev/null @@ -1,22 +0,0 @@ -commit 74eeae6c36c1d10a2ef07078ed08c14e637b6d63 -Author: Christoph Moench-Tegeder - - explicitly link against libfreebl3 (from nss) - - contrary to the comment above, rust's usage (via nss-rs) of libfreebl3 - is not sufficient, and the pkg-config file for nss does not hint at - any linking against libfreebl3 either. - -diff --git toolkit/library/moz.build toolkit/library/moz.build -index a38f17407cc8..e8a47c14de4c 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -168,6 +168,8 @@ if not CONFIG["MOZ_SYSTEM_NSS"]: - USE_LIBS += ["freeblpriv3"] - else: - USE_LIBS += ["freebl3"] -+else: -+ OS_LIBS += ["freebl3"] - - if not CONFIG["USE_LIBZ_RS"]: - USE_LIBS += [