summaryrefslogtreecommitdiff
path: root/mail/thunderbird/files/patch-bug1618914
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2020-09-18 10:02:23 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2020-09-18 10:02:23 +0000
commitba9052fd395d0d0f38e9d6491692869344e882fc (patch)
treec151e5e393e8d42361da19096a57911a1fd29eea /mail/thunderbird/files/patch-bug1618914
parentFix a typo in a comment (diff)
update mail/thunderbird to 78.2.2
See https://support.mozilla.org/en-US/kb/new-thunderbird-78 for major changes in Thunderbird 78, the release announcement in https://blog.thunderbird.net/2020/07/whats-new-in-thunderbird-78/ and https://blog.thunderbird.net/2020/09/openpgp-in-thunderbird-78/ info for OpenPGP users. Also check UPDATING 20200918. Current release notes are in https://www.thunderbird.net/en-US/thunderbird/78.2.2/releasenotes/ PR: 249346 Submitted by: jbeich
Notes
Notes: svn path=/head/; revision=548882
Diffstat (limited to 'mail/thunderbird/files/patch-bug1618914')
-rw-r--r--mail/thunderbird/files/patch-bug161891416
1 files changed, 7 insertions, 9 deletions
diff --git a/mail/thunderbird/files/patch-bug1618914 b/mail/thunderbird/files/patch-bug1618914
index a2966b44f5e7..817d00032222 100644
--- a/mail/thunderbird/files/patch-bug1618914
+++ b/mail/thunderbird/files/patch-bug1618914
@@ -4,7 +4,7 @@ diff --git widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.c
index 9a73326399bd5..9e42a7f1c5d18 100644
--- widget/gtk/WindowSurfaceWayland.cpp
+++ widget/gtk/WindowSurfaceWayland.cpp
-@@ -235,23 +235,24 @@
+@@ -222,20 +222,21 @@ static int WaylandAllocateShmMemory(int aSize) {
#ifdef HAVE_POSIX_FALLOCATE
do {
ret = posix_fallocate(fd, 0, aSize);
@@ -12,11 +12,9 @@ index 9a73326399bd5..9e42a7f1c5d18 100644
- 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_UNSAFE_PRINTF(
- "posix_fallocate() fails on %s size %d error code %d\n", filename,
- aSize, ret);
+ MOZ_CRASH("posix_fallocate() fails to allocate shm memory");
}
-#else
+#endif
@@ -25,19 +23,19 @@ index 9a73326399bd5..9e42a7f1c5d18 100644
} 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);
+ 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);