4 files changed, 37 insertions, 11 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index e5713403ebd..9e8488545be 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.264 2021/01/01 09:52:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.265 2021/01/01 12:58:32 ryoon Exp $
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-PKGREVISION=	1
-TB_VER=		78.5.1
+TB_VER=		78.6.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 685a03f6ec7..f2890271187 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.83 2020/12/07 12:30:56 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.84 2021/01/01 12:58:32 ryoon Exp $
 bin/thunderbird
 lib/thunderbird/actors/AboutHttpsOnlyErrorChild.jsm
 lib/thunderbird/actors/AboutHttpsOnlyErrorParent.jsm
@@ -429,7 +429,6 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/icons/center-align.svg
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/cert-error.svg
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/chat.svg
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/checkbox.svg
-lib/thunderbird/chrome/classic/skin/classic/messenger/icons/close-button.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/compact.svg
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/connecting.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/connection-insecure.svg
@@ -707,7 +706,6 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/shared/messenger.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/shared/messengercompose.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/shared/newInstall.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/shared/newInstallPage.css
-lib/thunderbird/chrome/classic/skin/classic/messenger/shared/newmailalert.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/shared/preferences/applications.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/shared/preferences/calendar.svg
 lib/thunderbird/chrome/classic/skin/classic/messenger/shared/preferences/chat.svg
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 9a701b209f6..7cd8ebb937c 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.238 2020/12/07 12:30:56 ryoon Exp $
+$NetBSD: distinfo,v 1.239 2021/01/01 12:58:32 ryoon Exp $
 
-SHA1 (thunderbird-78.5.1.source.tar.xz) = e8d69a4f656ef0607cc4c578d5d614b451081a1d
-RMD160 (thunderbird-78.5.1.source.tar.xz) = fdcf79b5670209254d0d9d9b979cb0883a994086
-SHA512 (thunderbird-78.5.1.source.tar.xz) = 3fb50ee1b5ec4bedaca0c68a86286f5141d3e350025b9d928348c55e57e07013124ef8b0315ee6cb16c08777ba8b0fb715ddc4b5fef2481e32f2b676090a2d80
-Size (thunderbird-78.5.1.source.tar.xz) = 352743032 bytes
+SHA1 (thunderbird-78.6.0.source.tar.xz) = 12bb1be74b705104e42afc84bbf1cbf0f21539a8
+RMD160 (thunderbird-78.6.0.source.tar.xz) = a96708b07686ff03739a4a02e52b732dd1e2f156
+SHA512 (thunderbird-78.6.0.source.tar.xz) = 36194e8bf58117d8accbd6d8dc52a6241d8c572c023db1b271db3b73098652a608da28134865099792fbeb0a2f0d3705d98093447b64fa19eab7efb3e3bdd421
+Size (thunderbird-78.6.0.source.tar.xz) = 353496712 bytes
 SHA1 (patch-browser_app_profile_firefox.js) = d53fae5544563888d030af7483f00283a712235c
 SHA1 (patch-build_moz.configure_rust.configure) = c9cd5e74aaeef4b42ef86db9e3814868a27847fd
 SHA1 (patch-comm_third__party_botan_configure.py) = 262f560c514d221d0df15a1906100b5e716bfdab
@@ -12,6 +12,7 @@ SHA1 (patch-config_makefiles_rust.mk) = 127f70d36b7784e5b3ba7637e3ccbca76ddd7894
 SHA1 (patch-configure.in) = 92f1603733320d96c424465ac62f9aa22543150e
 SHA1 (patch-dom_base_nsAttrName.h) = 4e2326542d4dbba1ac2af5b33505267ee177b094
 SHA1 (patch-dom_media_CubebUtils.cpp) = 7af2f852bba53dcb313ee6353cd111fb1b1ef735
+SHA1 (patch-dom_webgpu_ipc_WebGPUParent.cpp) = 236743c74610812bb7bdd577112092401dc1e587
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = d08f170629dda585dc3e11706688527fe3dc0e78
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 434ba731268ad3e5a9f20ef3a44c9057b61aba74
 SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 92287c76edfecf2de6aebdd401d77c26f69b2e81
diff --git a/mail/thunderbird/patches/patch-dom_webgpu_ipc_WebGPUParent.cpp b/mail/thunderbird/patches/patch-dom_webgpu_ipc_WebGPUParent.cpp
new file mode 100644
index 00000000000..a3dbb6355b5
--- /dev/null
+++ b/mail/thunderbird/patches/patch-dom_webgpu_ipc_WebGPUParent.cpp
@@ -0,0 +1,28 @@
+$NetBSD: patch-dom_webgpu_ipc_WebGPUParent.cpp,v 1.1 2021/01/01 12:58:32 ryoon Exp $
+
+* Fix build with devel/cbindgen-0.16.0.
+  From https://bugzilla.mozilla.org/show_bug.cgi?id=1684180
+
+--- dom/webgpu/ipc/WebGPUParent.cpp.orig	2020-12-08 01:14:39.000000000 +0000
++++ dom/webgpu/ipc/WebGPUParent.cpp
+@@ -423,17 +423,15 @@ ipc::IPCResult WebGPUParent::RecvDeviceC
+     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");