From 8cf193440e72d00392e20933f0aee1b15473c689 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 18 Aug 2020 00:52:34 +0000 Subject: [PATCH] www/firefox: update to 80.0 Changes: https://www.mozilla.org/firefox/80.0/releasenotes/ --- Mk/bsd.gecko.mk | 2 +- www/firefox/Makefile | 7 +++--- www/firefox/distinfo | 6 ++--- www/firefox/files/patch-bug1550891 | 19 +++++----------- www/firefox/files/patch-bug1659612 | 35 ++++++++++++++++++++++++++++++ 5 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 www/firefox/files/patch-bug1659612 diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index bda32465fb6e..1640b0f423e5 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -77,7 +77,7 @@ BINARY_ALIAS+= python3=python${PYTHON3_DEFAULT} BUNDLE_LIBS= yes BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ - rust-cbindgen>=0.14.1:devel/rust-cbindgen \ + rust-cbindgen>=0.14.3:devel/rust-cbindgen \ ${RUST_DEFAULT}>=1.41:lang/${RUST_DEFAULT} \ ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ node:www/node diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 429668e8db7a..e72ccad76b86 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 79.0 -PORTREVISION= 2 +DISTVERSION= 80.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -13,8 +12,8 @@ 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.54:security/nss \ +BUILD_DEPENDS= nspr>=4.26:devel/nspr \ + nss>=3.55:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.8:print/harfbuzz \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 40e6c90255db..0f292f3d9f07 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1595285412 -SHA256 (firefox-79.0.source.tar.xz) = 12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713 -SIZE (firefox-79.0.source.tar.xz) = 333220776 +TIMESTAMP = 1597695237 +SHA256 (firefox-80.0.source.tar.xz) = a30ec80211fb44e244c075bbf60e71903c4768e1f87ea30871a3f9406d200428 +SIZE (firefox-80.0.source.tar.xz) = 335255404 diff --git a/www/firefox/files/patch-bug1550891 b/www/firefox/files/patch-bug1550891 index 352a9568de15..7162795f7313 100644 --- a/www/firefox/files/patch-bug1550891 +++ b/www/firefox/files/patch-bug1550891 @@ -25,7 +25,7 @@ index 0be9cce0b4bed..89e67483e4c16 100644 --- ipc/chromium/src/base/shared_memory_posix.cc +++ ipc/chromium/src/base/shared_memory_posix.cc @@ -16,6 +16,10 @@ - # include + # include "mozilla/Ashmem.h" #endif +#ifdef __FreeBSD__ @@ -35,16 +35,7 @@ index 0be9cce0b4bed..89e67483e4c16 100644 #include "base/eintr_wrapper.h" #include "base/logging.h" #include "base/string_util.h" -@@ -148,7 +152,7 @@ static int SafeShmUnlink(bool freezeable, const char* name) { - } - } - --#elif !defined(ANDROID) -+#elif !defined(ANDROID) && !defined(__FreeBSD__) - static int SafeShmOpen(bool freezeable, const char* name, int oflag, int mode) { - return shm_open(name, oflag, mode); - } -@@ -160,7 +164,7 @@ static int SafeShmUnlink(bool freezeable, const char* name) { +@@ -77,7 +81,7 @@ SharedMemoryHandle SharedMemory::NULLHandle() { return SharedMemoryHandle(); } // static bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) { @@ -53,7 +44,7 @@ index 0be9cce0b4bed..89e67483e4c16 100644 return false; #else *str += '/'; -@@ -186,7 +190,7 @@ bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) { +@@ -103,7 +107,7 @@ bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) { // enough for this. StringAppendF(str, "org.mozilla.ipc.%d.", static_cast(pid)); return true; @@ -62,7 +53,7 @@ index 0be9cce0b4bed..89e67483e4c16 100644 } bool SharedMemory::CreateInternal(size_t size, bool freezeable) { -@@ -212,6 +216,9 @@ bool SharedMemory::CreateInternal(size_t size, bool freezeable) { +@@ -125,6 +129,9 @@ bool SharedMemory::CreateInternal(size_t size, bool freezeable) { return false; } needs_truncate = false; @@ -72,7 +63,7 @@ index 0be9cce0b4bed..89e67483e4c16 100644 #else // Generic Unix: shm_open + shm_unlink do { -@@ -277,6 +284,14 @@ bool SharedMemory::ReadOnlyCopy(SharedMemory* ro_out) { +@@ -224,6 +231,14 @@ bool SharedMemory::ReadOnlyCopy(SharedMemory* ro_out) { return false; } ro_file = mapped_file_; diff --git a/www/firefox/files/patch-bug1659612 b/www/firefox/files/patch-bug1659612 new file mode 100644 index 000000000000..f8ca9dc2d6ee --- /dev/null +++ b/www/firefox/files/patch-bug1659612 @@ -0,0 +1,35 @@ +media/libcubeb/src/cubeb_alsa.c:613:9: error: implicitly declaring library function 'snprintf' with type 'int (char *, unsigned int, const char *, ...)' [-Werror,-Wimplicit-function-declaration] + r = snprintf(node_name, sizeof(node_name), "pcm.%s", string); + ^ +media/libcubeb/src/cubeb_alsa.c:613:9: note: include the header or explicitly provide a declaration for 'snprintf' +media/libcubeb/src/cubeb_alsa.c:1168:3: error: implicitly declaring library function 'alloca' with type 'void *(unsigned int)' [-Werror,-Wimplicit-function-declaration] + snd_pcm_hw_params_alloca(&hw_params); + ^ +/usr/local/include/alsa/pcm.h:737:39: note: expanded from macro 'snd_pcm_hw_params_alloca' +#define snd_pcm_hw_params_alloca(ptr) __snd_alloca(ptr, snd_pcm_hw_params) + ^ +/usr/local/include/alsa/global.h:106:57: note: expanded from macro '__snd_alloca' +#define __snd_alloca(ptr,type) do { *ptr = (type##_t *) alloca(type##_sizeof()); memset(*ptr, 0, type##_sizeof()); } while (0) + ^ +media/libcubeb/src/cubeb_alsa.c:1168:3: note: include the header or explicitly provide a declaration for 'alloca' +/usr/local/include/alsa/pcm.h:737:39: note: expanded from macro 'snd_pcm_hw_params_alloca' +#define snd_pcm_hw_params_alloca(ptr) __snd_alloca(ptr, snd_pcm_hw_params) + ^ +/usr/local/include/alsa/global.h:106:57: note: expanded from macro '__snd_alloca' +#define __snd_alloca(ptr,type) do { *ptr = (type##_t *) alloca(type##_sizeof()); memset(*ptr, 0, type##_sizeof()); } while (0) + ^ +2 errors generated. + +--- media/libcubeb/src/cubeb_alsa.c~ ++++ media/libcubeb/src/cubeb_alsa.c +@@ -5,9 +5,7 @@ + * accompanying file LICENSE for details. + */ + #undef NDEBUG +-#define _DEFAULT_SOURCE +-#define _BSD_SOURCE +-#define _XOPEN_SOURCE 500 ++#define _GNU_SOURCE 1 + #include + #include + #include