Index: branches/2021Q1/www/firefox-esr/Makefile
===================================================================
--- branches/2021Q1/www/firefox-esr/Makefile	(revision 560551)
+++ branches/2021Q1/www/firefox-esr/Makefile	(revision 560552)
@@ -1,64 +1,63 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	78.6.0
-PORTREVISION=	1
+DISTVERSION=	78.6.1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
 PKGNAMESUFFIX=	-esr
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.26:devel/nspr \
 		nss>=3.56:security/nss \
 		icu>=67.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=2.6.6:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.8.2:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
 CONFLICTS_INSTALL=	firefox
 USE_MOZILLA=	-sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 
 USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
 
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
Index: branches/2021Q1/www/firefox-esr/distinfo
===================================================================
--- branches/2021Q1/www/firefox-esr/distinfo	(revision 560551)
+++ branches/2021Q1/www/firefox-esr/distinfo	(revision 560552)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607518653
-SHA256 (firefox-78.6.0esr.source.tar.xz) = 5e69f9bfd1a35decdae8d4b28da8100820e58b429f539fa9884802347631cf53
-SIZE (firefox-78.6.0esr.source.tar.xz) = 338098664
+TIMESTAMP = 1609890560
+SHA256 (firefox-78.6.1esr.source.tar.xz) = 0d07b74cb66b94018e3d7f11531f95c76a955e0016a3c401241d0d85062ae7ce
+SIZE (firefox-78.6.1esr.source.tar.xz) = 333378012
Index: branches/2021Q1/www/firefox-esr/files/patch-bug1684180
===================================================================
--- branches/2021Q1/www/firefox-esr/files/patch-bug1684180	(revision 560551)
+++ branches/2021Q1/www/firefox-esr/files/patch-bug1684180	(nonexistent)
@@ -1,34 +0,0 @@
-commit 383a82da4808
-Author: Emilio Cobos Álvarez <emilio@crisal.io>
-Date:   Mon Dec 28 04:39:00 2020 -0800
-
-    Bug 1684180 - Fix ESR build with newer versions of cbindgen. r=kvark
----
- dom/webgpu/ipc/WebGPUParent.cpp | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git dom/webgpu/ipc/WebGPUParent.cpp dom/webgpu/ipc/WebGPUParent.cpp
-index ff93c0630d02..17c2ace6b4ae 100644
---- dom/webgpu/ipc/WebGPUParent.cpp
-+++ dom/webgpu/ipc/WebGPUParent.cpp
-@@ -423,17 +423,15 @@ ipc::IPCResult WebGPUParent::RecvDeviceCreateBindGroup(
-     switch (entry.mType) {
-       case SerialBindGroupEntryType::Buffer:
-         bgb.resource.tag = ffi::WGPUBindingResource_Buffer;
--        bgb.resource.buffer._0.buffer = entry.mValue;
--        bgb.resource.buffer._0.offset = entry.mBufferOffset;
--        bgb.resource.buffer._0.size = entry.mBufferSize;
-+        bgb.resource.buffer = {entry.mValue, entry.mBufferOffset, entry.mBufferSize};
-         break;
-       case SerialBindGroupEntryType::Texture:
-         bgb.resource.tag = ffi::WGPUBindingResource_TextureView;
--        bgb.resource.texture_view._0 = entry.mValue;
-+        bgb.resource.texture_view = {entry.mValue};
-         break;
-       case SerialBindGroupEntryType::Sampler:
-         bgb.resource.tag = ffi::WGPUBindingResource_Sampler;
--        bgb.resource.sampler._0 = entry.mValue;
-+        bgb.resource.sampler = {entry.mValue};
-         break;
-       default:
-         MOZ_CRASH("unreachable");

Property changes on: branches/2021Q1/www/firefox-esr/files/patch-bug1684180
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2021Q1
===================================================================
--- branches/2021Q1	(revision 560551)
+++ branches/2021Q1	(revision 560552)

Property changes on: branches/2021Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r560548