diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index ee4011d5141c..89a26d5e4d07 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -1,62 +1,62 @@ # Created by: Alan Eldridge PORTNAME= firefox -DISTVERSION= 91.4.1 +DISTVERSION= 91.5.0 PORTEPOCH= 1 CATEGORIES= www 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 BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nss>=3.68:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.8.1: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 CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox 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-esr/distinfo b/www/firefox-esr/distinfo index ab5c3031fc1e..49475234db73 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639658837 -SHA256 (firefox-91.4.1esr.source.tar.xz) = 75e98daf53c5aea19d711a625d5d5e6dfdc8335965d3a19567c62f9d2961fc75 -SIZE (firefox-91.4.1esr.source.tar.xz) = 378159528 +TIMESTAMP = 1641929589 +SHA256 (firefox-91.5.0esr.source.tar.xz) = f45cd9c96227e3e6eabe37962ce924b7a7ca86b6c191326c1bab18e082b4c813 +SIZE (firefox-91.5.0esr.source.tar.xz) = 381371300 diff --git a/www/firefox-esr/files/patch-bug1618914 b/www/firefox-esr/files/patch-bug1618914 deleted file mode 100644 index c52ac49018b2..000000000000 --- a/www/firefox-esr/files/patch-bug1618914 +++ /dev/null @@ -1,50 +0,0 @@ -From cea8e6a01bb03bbe565c9bf5dd4f439f30ca953f Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Fri, 28 Feb 2020 16:49:38 +0000 -Subject: Bug 1618914 - [Wayland] Fall back to ftruncate if posix_fallocate isn't supported by filesystem. - -diff --git widget/gtk/WaylandShmBuffer.cpp widget/gtk/WaylandShmBuffer.cpp -index 42eeedd3429ac..2a5c23d287413 100644 ---- widget/gtk/WaylandShmBuffer.cpp -+++ widget/gtk/WaylandShmBuffer.cpp -@@ -67,36 +67,37 @@ static int WaylandAllocateShmMemory(int aSize) { - return -1; - } - - int ret = 0; - #ifdef HAVE_POSIX_FALLOCATE - do { - ret = posix_fallocate(fd, 0, aSize); - } while (ret == EINTR); -- if (ret != 0) { -+ if (ret == 0) { -+ return fd; -+ } else if (ret != ENODEV && ret != EINVAL && ret != EOPNOTSUPP) { - NS_WARNING( - nsPrintfCString("posix_fallocate() fails to allocate shm memory: %s", - strerror(ret)) - .get()); - close(fd); - return -1; - } --#else -+#endif - do { - ret = ftruncate(fd, aSize); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - NS_WARNING(nsPrintfCString("ftruncate() fails to allocate shm memory: %s", - strerror(ret)) - .get()); - close(fd); - fd = -1; - } --#endif - - return fd; - } - - /* static */ - RefPtr WaylandShmPool::Create( - const RefPtr& aWaylandDisplay, int aSize) { - RefPtr shmPool = new WaylandShmPool(aSize);