Date: Fri, 28 Feb 2020 18:20:54 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527346 - in head: mail/thunderbird mail/thunderbird/files www/cliqz www/cliqz/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files Message-ID: <202002281820.01SIKsZb059827@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Feb 28 18:20:53 2020 New Revision: 527346 URL: https://svnweb.freebsd.org/changeset/ports/527346 Log: www/firefox: unbreak native Wayland if XDG_RUNTIME_DIR on ZFS XDG_RUNTIME_DIR should be on tmpfs(5) for optimal performance but if users want on permanent storage like ZFS don't abort. PR: 240884 Reported by: jsm Added: head/mail/thunderbird/files/patch-bug1618914 (contents, props changed) head/www/cliqz/files/patch-bug1618914 (contents, props changed) head/www/firefox-esr/files/patch-bug1618914 (contents, props changed) head/www/firefox/files/patch-bug1618914 (contents, props changed) Modified: head/mail/thunderbird/Makefile (contents, props changed) head/www/cliqz/Makefile (contents, props changed) head/www/firefox-esr/Makefile (contents, props changed) head/www/firefox/Makefile (contents, props changed) Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Fri Feb 28 18:00:28 2020 (r527345) +++ head/mail/thunderbird/Makefile Fri Feb 28 18:20:53 2020 (r527346) @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 68.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Added: head/mail/thunderbird/files/patch-bug1618914 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1618914 Fri Feb 28 18:20:53 2020 (r527346) @@ -0,0 +1,34 @@ +[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 +@@ -235,23 +235,24 @@ + #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) { + close(fd); + MOZ_CRASH_UNSAFE_PRINTF( + "posix_fallocate() fails on %s size %d error code %d\n", filename, + aSize, ret); + } +-#else ++#endif + do { + ret = ftruncate(fd, aSize); + } while (ret < 0 && errno == EINTR); + if (ret < 0) { + close(fd); + MOZ_CRASH_UNSAFE_PRINTF("ftruncate() fails on %s size %d error code %d\n", + filename, aSize, ret); + } +-#endif + + return fd; + } Modified: head/www/cliqz/Makefile ============================================================================== --- head/www/cliqz/Makefile Fri Feb 28 18:00:28 2020 (r527345) +++ head/www/cliqz/Makefile Fri Feb 28 18:20:53 2020 (r527346) @@ -2,7 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.33.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz Added: head/www/cliqz/files/patch-bug1618914 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cliqz/files/patch-bug1618914 Fri Feb 28 18:20:53 2020 (r527346) @@ -0,0 +1,34 @@ +[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 +--- mozilla-release/widget/gtk/WindowSurfaceWayland.cpp ++++ mozilla-release/widget/gtk/WindowSurfaceWayland.cpp +@@ -235,23 +235,24 @@ + #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) { + close(fd); + MOZ_CRASH_UNSAFE_PRINTF( + "posix_fallocate() fails on %s size %d error code %d\n", filename, + aSize, ret); + } +-#else ++#endif + do { + ret = ftruncate(fd, aSize); + } while (ret < 0 && errno == EINTR); + if (ret < 0) { + close(fd); + MOZ_CRASH_UNSAFE_PRINTF("ftruncate() fails on %s size %d error code %d\n", + filename, aSize, ret); + } +-#endif + + return fd; + } Modified: head/www/firefox-esr/Makefile ============================================================================== --- head/www/firefox-esr/Makefile Fri Feb 28 18:00:28 2020 (r527345) +++ head/www/firefox-esr/Makefile Fri Feb 28 18:20:53 2020 (r527346) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 68.5.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Added: head/www/firefox-esr/files/patch-bug1618914 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-bug1618914 Fri Feb 28 18:20:53 2020 (r527346) @@ -0,0 +1,34 @@ +[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 +@@ -235,23 +235,24 @@ + #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) { + close(fd); + MOZ_CRASH_UNSAFE_PRINTF( + "posix_fallocate() fails on %s size %d error code %d\n", filename, + aSize, ret); + } +-#else ++#endif + do { + ret = ftruncate(fd, aSize); + } while (ret < 0 && errno == EINTR); + if (ret < 0) { + close(fd); + MOZ_CRASH_UNSAFE_PRINTF("ftruncate() fails on %s size %d error code %d\n", + filename, aSize, ret); + } +-#endif + + return fd; + } Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Fri Feb 28 18:00:28 2020 (r527345) +++ head/www/firefox/Makefile Fri Feb 28 18:20:53 2020 (r527346) @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 73.0.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Added: head/www/firefox/files/patch-bug1618914 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1618914 Fri Feb 28 18:20:53 2020 (r527346) @@ -0,0 +1,34 @@ +[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 +@@ -235,23 +235,24 @@ + #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) { + close(fd); + MOZ_CRASH_UNSAFE_PRINTF( + "posix_fallocate() fails on %s size %d error code %d\n", filename, + aSize, ret); + } +-#else ++#endif + do { + ret = ftruncate(fd, aSize); + } while (ret < 0 && errno == EINTR); + if (ret < 0) { + close(fd); + MOZ_CRASH_UNSAFE_PRINTF("ftruncate() fails on %s size %d error code %d\n", + filename, aSize, ret); + } +-#endif + + return fd; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002281820.01SIKsZb059827>