Index: head/www/firefox/Makefile =================================================================== --- head/www/firefox/Makefile (revision 540399) +++ head/www/firefox/Makefile (revision 540400) @@ -1,60 +1,61 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 78.0 +PORTREVISION= 1 PORTEPOCH= 1 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.25:devel/nspr \ nss>=3.53.1:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.6:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ py${PYTHON3_DEFAULT:S/.//}-sqlite3>0:databases/py-sqlite3@py${PYTHON3_DEFAULT:S/.//} \ 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 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 Index: head/www/firefox/files/patch-bug1618914 =================================================================== --- head/www/firefox/files/patch-bug1618914 (revision 540399) +++ head/www/firefox/files/patch-bug1618914 (revision 540400) @@ -1,39 +1,41 @@ [Wayland] Fall back to ftruncate if posix_fallocate isn't supported by filesystem. diff --git widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.cpp index 9a73326399bd5..9e42a7f1c5d18 100644 --- widget/gtk/WindowSurfaceWayland.cpp +++ widget/gtk/WindowSurfaceWayland.cpp -@@ -222,19 +222,20 @@ static int WaylandAllocateShmMemory(int aSize) { +@@ -222,20 +222,21 @@ static int WaylandAllocateShmMemory(int aSize) { + #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 != EINVAL && ret != EOPNOTSUPP) { ++ } else if (ret != ENODEV && ret != EINVAL && ret != EOPNOTSUPP) { close(fd); MOZ_CRASH("posix_fallocate() fails to allocate shm memory"); } -#else +#endif do { ret = ftruncate(fd, aSize); } while (ret < 0 && errno == EINTR); if (ret < 0) { close(fd); MOZ_CRASH("ftruncate() fails to allocate shm memory"); } -#endif return fd; } -@@ -265,7 +266,7 @@ bool WaylandShmPool::Resize(int aSize) { +@@ -265,8 +266,8 @@ bool WaylandShmPool::Resize(int aSize) { + #ifdef HAVE_POSIX_FALLOCATE do { errno = posix_fallocate(mShmPoolFd, 0, aSize); } while (errno == EINTR); - if (errno != 0) return false; -+ if (errno != 0 && errno != EINVAL && errno != EOPNOTSUPP) return false; ++ if (errno != 0 && errno != ENODEV && errno != EINVAL && errno != EOPNOTSUPP) return false; #endif wl_shm_pool_resize(mShmPool, aSize);