diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-05-29 23:25:58 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-05-29 23:25:58 +0000 |
| commit | 8b3080036e540d26597157e8b71450b0759bcdb5 (patch) | |
| tree | f8c700cb980f439acc6b668724512a1dd21ee9ea | |
| parent | Mark as BROKEN on powerpc64-12. It seems to build everywhere else. (diff) | |
www/firefox: also check posix_fallocate error in WaylandShmPool::Resize
PR: 240884
Submitted by: Greg V
Notes
Notes:
svn path=/head/; revision=537006
| -rw-r--r-- | mail/thunderbird/Makefile | 1 | ||||
| -rw-r--r-- | mail/thunderbird/files/patch-bug1618914 | 9 | ||||
| -rw-r--r-- | www/firefox-esr/Makefile | 1 | ||||
| -rw-r--r-- | www/firefox-esr/files/patch-bug1618914 | 9 | ||||
| -rw-r--r-- | www/firefox/Makefile | 2 | ||||
| -rw-r--r-- | www/firefox/files/patch-bug1618914 | 9 |
6 files changed, 30 insertions, 1 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index a5224d41ba7f..b58d552a9ed5 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 68.8.1 +PORTREVISION= 1 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source diff --git a/mail/thunderbird/files/patch-bug1618914 b/mail/thunderbird/files/patch-bug1618914 index 28d722fa6255..dda6b52abe2d 100644 --- a/mail/thunderbird/files/patch-bug1618914 +++ b/mail/thunderbird/files/patch-bug1618914 @@ -32,3 +32,12 @@ index 9a73326399bd5..9e42a7f1c5d18 100644 return fd; } +@@ -265,7 +266,7 @@ bool WaylandShmPool::Resize(int aSize) { + do { + errno = posix_fallocate(mShmPoolFd, 0, aSize); + } while (errno == EINTR); +- if (errno != 0) return false; ++ if (errno != EINVAL && errno != EOPNOTSUPP) return false; + #endif + + wl_shm_pool_resize(mShmPool, aSize); diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 393b199823c9..abb64c3ff7bf 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 68.9.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox-esr/files/patch-bug1618914 b/www/firefox-esr/files/patch-bug1618914 index 28d722fa6255..dda6b52abe2d 100644 --- a/www/firefox-esr/files/patch-bug1618914 +++ b/www/firefox-esr/files/patch-bug1618914 @@ -32,3 +32,12 @@ index 9a73326399bd5..9e42a7f1c5d18 100644 return fd; } +@@ -265,7 +266,7 @@ bool WaylandShmPool::Resize(int aSize) { + do { + errno = posix_fallocate(mShmPoolFd, 0, aSize); + } while (errno == EINTR); +- if (errno != 0) return false; ++ if (errno != EINVAL && errno != EOPNOTSUPP) return false; + #endif + + wl_shm_pool_resize(mShmPool, aSize); diff --git a/www/firefox/Makefile b/www/firefox/Makefile index de375007fd71..abe481f73b28 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 77.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/firefox/files/patch-bug1618914 b/www/firefox/files/patch-bug1618914 index 28d722fa6255..dda6b52abe2d 100644 --- a/www/firefox/files/patch-bug1618914 +++ b/www/firefox/files/patch-bug1618914 @@ -32,3 +32,12 @@ index 9a73326399bd5..9e42a7f1c5d18 100644 return fd; } +@@ -265,7 +266,7 @@ bool WaylandShmPool::Resize(int aSize) { + do { + errno = posix_fallocate(mShmPoolFd, 0, aSize); + } while (errno == EINTR); +- if (errno != 0) return false; ++ if (errno != EINVAL && errno != EOPNOTSUPP) return false; + #endif + + wl_shm_pool_resize(mShmPool, aSize); |