diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index deade0e5dd1a..a4729a67b75f 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -1,74 +1,74 @@ PORTNAME= firefox -DISTVERSION= 102.7.0 +DISTVERSION= 102.8.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+= --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 4ca4dfd7b5a2..5a57c5bad85f 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673286650 -SHA256 (firefox-102.7.0esr.source.tar.xz) = a7a4603417fcb42ec37f2cff9034280ce2ec772c0a5fc500fada4286ba3114aa -SIZE (firefox-102.7.0esr.source.tar.xz) = 479538092 +TIMESTAMP = 1675714425 +SHA256 (firefox-102.8.0esr.source.tar.xz) = 2d7e7327edf5802d1ad9ade85e77f766b6b909a53bc185e452e064bffa3339b9 +SIZE (firefox-102.8.0esr.source.tar.xz) = 477458144 diff --git a/www/firefox-esr/files/patch-bug1799982 b/www/firefox-esr/files/patch-bug1799982 deleted file mode 100644 index dac77d73390b..000000000000 --- a/www/firefox-esr/files/patch-bug1799982 +++ /dev/null @@ -1,60 +0,0 @@ -Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag - -Apparently the use of these is being turned into an error in Python 3.11. -Fortunately, our uses appears to be rather trivial. - -For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just -replaced the one use of . with (\n|.). (?s) means DOTALL, which means -that dot includes any character, including a newline. Otherwise it means -dot includes any character except a newline. - -I took the new t_singlelinecomment from IPDL's parser.py, so I assume -it is reasonable enough. t_multilinecomment is also now the same as -in IPDL. - -Differential Revision: https://phabricator.services.mozilla.com/D161738 - -diff --git xpcom/idl-parser/xpidl/xpidl.py xpcom/idl-parser/xpidl/xpidl.py ---- xpcom/idl-parser/xpidl/xpidl.py -+++ xpcom/idl-parser/xpidl/xpidl.py -@@ -1634,36 +1634,36 @@ class IDLParser(object): - t_LSHIFT = r"<<" - t_RSHIFT = r">>" - - literals = '"(){}[]<>,;:=|+-*' - - t_ignore = " \t" - - def t_multilinecomment(self, t): -- r"/\*(?s).*?\*/" -+ r"/\*(\n|.)*?\*/" - t.lexer.lineno += t.value.count("\n") - if t.value.startswith("/**"): - self._doccomments.append(t.value) - - def t_singlelinecomment(self, t): -- r"(?m)//.*?$" -+ r"//[^\n]*" - - def t_IID(self, t): - return t - - t_IID.__doc__ = r"%(c)s{8}-%(c)s{4}-%(c)s{4}-%(c)s{4}-%(c)s{12}" % {"c": hexchar} - - def t_IDENTIFIER(self, t): - r"(unsigned\ long\ long|unsigned\ short|unsigned\ long|long\ long)(?!_?[A-Za-z][A-Za-z_0-9])|_?[A-Za-z][A-Za-z_0-9]*" # NOQA: E501 - t.type = self.keywords.get(t.value, "IDENTIFIER") - return t - - def t_LCDATA(self, t): -- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P.*?\n?)%\}[ ]*(C\+\+)?" -+ r"%\{[ ]*C\+\+[ ]*\n(?P(\n|.)*?\n?)%\}[ ]*(C\+\+)?" - t.type = "CDATA" - t.value = t.lexer.lexmatch.group("cdata") - t.lexer.lineno += t.value.count("\n") - return t - - def t_INCLUDE(self, t): - r'\#include[ \t]+"[^"\n]+"' - inc, value, end = t.value.split('"') -