diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 297a9404b898..df89a52409c4 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,60 +1,60 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 90.0 +DISTVERSION= 90.0.1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.26:devel/nspr \ nss>=3.64:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.8.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.37:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr USE_MOZILLA= -sqlite CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 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" 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/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.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/distinfo b/www/firefox/distinfo index 9e067e55bcce..a788fec0cd78 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625645143 -SHA256 (firefox-90.0.source.tar.xz) = 43a943e7d7660c6d7f5b41c95b344b7fd6a4a88ad0bb45dbd844b372ea60d58b -SIZE (firefox-90.0.source.tar.xz) = 378743212 +TIMESTAMP = 1626529297 +SHA256 (firefox-90.0.1.source.tar.xz) = 85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87 +SIZE (firefox-90.0.1.source.tar.xz) = 378978080 diff --git a/www/firefox/files/patch-bug1720441 b/www/firefox/files/patch-bug1720441 new file mode 100644 index 000000000000..a4de649bd5eb --- /dev/null +++ b/www/firefox/files/patch-bug1720441 @@ -0,0 +1,38 @@ +commit ef4af678b2aec19fbe16be083d3c7e85454c1b09 +Author: Emilio Cobos Álvarez +Date: Fri Jul 16 08:29:45 2021 +0000 + + Bug 1720441 - Remove unthemed menubar color. r=stransky + + Menubars on Linux are unthemed by default so they are transparent. Only + themed menubars should use -moz-menubarcolor. + + Differential Revision: https://phabricator.services.mozilla.com/D119873 + +diff --git browser/themes/linux/places/organizer.css browser/themes/linux/places/organizer.css +index 97ee94ecad7b..421ebe9526bc 100644 +--- browser/themes/linux/places/organizer.css ++++ browser/themes/linux/places/organizer.css +@@ -7,6 +7,7 @@ + #placesToolbar { + appearance: auto; + -moz-default-appearance: menubar; ++ color: -moz-menubartext; + } + + @media (-moz-menubar-drag) { +diff --git toolkit/themes/linux/global/menu.css toolkit/themes/linux/global/menu.css +index 2c3d09b4aa54..044cf97c0e0b 100644 +--- toolkit/themes/linux/global/menu.css ++++ toolkit/themes/linux/global/menu.css +@@ -51,10 +51,6 @@ menucaption[disabled="true"] { + color: GrayText; + } + +-menubar { +- color: -moz-menubartext; +-} +- + menubar > menu { + padding: 0 4px; + }