diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index ba2b9a952488..0f51dab2ac23 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -1,75 +1,74 @@ PORTNAME= firefox -DISTVERSION= 102.5.0 -PORTREVISION= 1 +DISTVERSION= 102.6.0 PORTEPOCH= 1 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.mozilla.com/firefox BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nss>=3.79.1:security/nss \ icu>=71.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=4.1.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.37:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ libvpx>=1.11.0: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 CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox USE_MOZILLA= -sqlite CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 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 FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" .include .if ${ARCH} == powerpc64 MOZ_OPTIONS+= --disable-webrtc --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13) post-install: ${INSTALL_DATA} ${FIREFOX_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 eeb38ff32112..f9c40f46b14d 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667857532 -SHA256 (firefox-102.5.0esr.source.tar.xz) = 017dd44b1285913f477074802707a4c76ed1a28270ec5a327bbb76574cc057d8 -SIZE (firefox-102.5.0esr.source.tar.xz) = 478705384 +TIMESTAMP = 1670341791 +SHA256 (firefox-102.6.0esr.source.tar.xz) = d23154a4d876d76122161e7be2659de6e88985802d9e5125baf1d133f37f0ffe +SIZE (firefox-102.6.0esr.source.tar.xz) = 478856656 diff --git a/www/firefox-esr/files/patch-bug1773070 b/www/firefox-esr/files/patch-bug1773070 deleted file mode 100644 index fdf8ec9df846..000000000000 --- a/www/firefox-esr/files/patch-bug1773070 +++ /dev/null @@ -1,27 +0,0 @@ -In file included from Unified_cpp_accessible_html0.cpp:29: -In file included from accessible/html/HTMLImageMapAccessible.cpp:14: -In file included from layout/generic/nsImageFrame.h:17: -In file included from ../.build/dist/include/nsDisplayList.h:50: -In file included from ../.build/dist/include/nsCSSRenderingBorders.h:20: -In file included from ../.build/dist/include/gfxUtils.h:22: -In file included from ../.build/dist/include/mozilla/webrender/WebRenderTypes.h:11: -In file included from ../.build/dist/include/mozilla/webrender/webrender_ffi.h:108: -../.build/dist/include/mozilla/webrender/webrender_ffi_generated.h:gmake[4]: Leaving directory '../.build/accessible/aom' -24:33: error: redefinition of 'ROOT_CLIP_CHAIN' -constexpr static const uint64_t ROOT_CLIP_CHAIN = ~0; - ^ -../.build/dist/include/mozilla/webrender/webrender_ffi.h:80:16: note: previous definition is here -const uint64_t ROOT_CLIP_CHAIN = ~0; - ^ - ---- gfx/webrender_bindings/webrender_ffi.h.orig 2022-05-23 17:12:36 UTC -+++ gfx/webrender_bindings/webrender_ffi.h -@@ -77,8 +77,6 @@ using WrPipelineIdEpochs = nsTArray; - --const uint64_t ROOT_CLIP_CHAIN = ~0; -- - } // namespace wr - } // namespace mozilla -