svn commit: r545613 - in branches/2020Q3: Mk www/firefox www/firefox/files

Jan Beich jbeich at FreeBSD.org
Fri Aug 21 16:38:24 UTC 2020 

Author: jbeich
Date: Fri Aug 21 16:38:22 2020
New Revision: 545613
URL: https://svnweb.freebsd.org/changeset/ports/545613

Log:
  MFH: r545203 r545254 r545473
  
  www/firefox: update to 80.0
  
  Changes:	https://www.mozilla.org/firefox/80.0/releasenotes/
  Approved by:	ports-secteam blanket

Added:
  branches/2020Q3/www/firefox/files/patch-bug1659612
     - copied unchanged from r545203, head/www/firefox/files/patch-bug1659612
Modified:
  branches/2020Q3/Mk/bsd.gecko.mk
  branches/2020Q3/www/firefox/Makefile
  branches/2020Q3/www/firefox/distinfo
  branches/2020Q3/www/firefox/files/patch-bug1550891
  branches/2020Q3/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/Mk/bsd.gecko.mk
==============================================================================
--- branches/2020Q3/Mk/bsd.gecko.mk	Fri Aug 21 16:36:17 2020	(r545612)
+++ branches/2020Q3/Mk/bsd.gecko.mk	Fri Aug 21 16:38:22 2020	(r545613)
@@ -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

Modified: branches/2020Q3/www/firefox/Makefile
==============================================================================
--- branches/2020Q3/www/firefox/Makefile	Fri Aug 21 16:36:17 2020	(r545612)
+++ branches/2020Q3/www/firefox/Makefile	Fri Aug 21 16:38:22 2020	(r545613)
@@ -2,18 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	79.0
+DISTVERSION=	80.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko at 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 \

Modified: branches/2020Q3/www/firefox/distinfo
==============================================================================
--- branches/2020Q3/www/firefox/distinfo	Fri Aug 21 16:36:17 2020	(r545612)
+++ branches/2020Q3/www/firefox/distinfo	Fri Aug 21 16:38:22 2020	(r545613)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595285412
-SHA256 (firefox-79.0.source.tar.xz) = 12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713
-SIZE (firefox-79.0.source.tar.xz) = 333220776
+TIMESTAMP = 1597803129
+SHA256 (firefox-80.0.source.tar.xz) = 380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a
+SIZE (firefox-80.0.source.tar.xz) = 335316448

Modified: branches/2020Q3/www/firefox/files/patch-bug1550891
==============================================================================
--- branches/2020Q3/www/firefox/files/patch-bug1550891	Fri Aug 21 16:36:17 2020	(r545612)
+++ branches/2020Q3/www/firefox/files/patch-bug1550891	Fri Aug 21 16:38:22 2020	(r545613)
@@ -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 <linux/ashmem.h>
+ #  include "mozilla/Ashmem.h"
  #endif
  
 +#ifdef __FreeBSD__
@@ -35,17 +35,8 @@ 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) {
-   }
- }
+@@ -77,7 +81,7 @@ SharedMemoryHandle SharedMemory::NULLHandle() { return SharedMemoryHandle(); }
  
--#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) {
- 
  // static
  bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) {
 -#if defined(ANDROID)
@@ -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<int>(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_;

Copied: branches/2020Q3/www/firefox/files/patch-bug1659612 (from r545203, head/www/firefox/files/patch-bug1659612)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q3/www/firefox/files/patch-bug1659612	Fri Aug 21 16:38:22 2020	(r545613, copy of r545203, head/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 <stdio.h> 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 <stdlib.h> 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 <pthread.h>
+ #include <sys/time.h>
+ #include <assert.h>

Modified: branches/2020Q3/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
==============================================================================
--- branches/2020Q3/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp	Fri Aug 21 16:36:17 2020	(r545612)
+++ branches/2020Q3/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp	Fri Aug 21 16:38:22 2020	(r545613)
@@ -19,7 +19,7 @@ index 53fc3c9937f7..b23771ab80fa 100644
 +#elif defined(MOZ_FFMPEG)
 +  RefPtr<PDMFactory> platform = new PDMFactory();
 +  return StaticPrefs::media_flac_enabled() &&
-+         platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
++         platform->SupportsMimeType("audio/flac"_ns,
 +                                    /* DecoderDoctorDiagnostics* */ nullptr);
  #else
    // Until bug 1295886 is fixed.

More information about the svn-ports-branches mailing list