Fix recent llvm/clang from FreeBSD 12

* Bump PKGREVISION
* Fix PR pkg/52487

4 files changed, 50 insertions, 2 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 607e1903d18..433667388ca 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.302 2017/08/12 04:58:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.303 2017/08/16 14:13:44 ryoon Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		55.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=	.1
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 75836041b71..c062f9a692d 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.289 2017/08/15 01:24:47 ryoon Exp $
+$NetBSD: distinfo,v 1.290 2017/08/16 14:13:44 ryoon Exp $
 
 SHA1 (firefox-55.0.1.source.tar.xz) = 8ec2a864e277b4acc31ea96806aae3b90f1a4038
 RMD160 (firefox-55.0.1.source.tar.xz) = 38156cc7207d0ac4c9df2d5f997912aef40c22b1
@@ -38,6 +38,8 @@ SHA1 (patch-dom_media_MediaPrefs.h) = b5815efdfbf79a7ff92197bbd906f702565ea46f
 SHA1 (patch-dom_media_gtest_moz.build) = 6a58e050327ffcdcf2a4041946ddb79d6793d2d9
 SHA1 (patch-dom_media_moz.build) = 844dbb94463b8aab11649a5aa11142de0179d86c
 SHA1 (patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = f2965930c50961b42576a983e93a08d67da50a2a
+SHA1 (patch-dom_messagechannel_MessagePort.cpp) = 1710b4da694aaeb8d929f1a143f24f8a615c2776
+SHA1 (patch-dom_messagechannel_MessagePortChild.h) = 73a2ac4702677ad68af0b1fa1247fd0a1d4e4d95
 SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 30abff0aaabff07e13939a1571cefc5216760109
 SHA1 (patch-gfx_2d_ScaledFontBase.cpp) = 9684d54aa70e3b9b968f121287611cdd9e277f94
 SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 6e91ca436b73affe42ed4e683b3400beb28c4bc6
diff --git a/www/firefox/patches/patch-dom_messagechannel_MessagePort.cpp b/www/firefox/patches/patch-dom_messagechannel_MessagePort.cpp
new file mode 100644
index 00000000000..38787a3253f
--- /dev/null
+++ b/www/firefox/patches/patch-dom_messagechannel_MessagePort.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-dom_messagechannel_MessagePort.cpp,v 1.1 2017/08/16 14:13:44 ryoon Exp $
+
+Undefined symbols for architecture x86_64 "vtable for mozilla::dom::MessagePortChild"
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1382863
+
+Bug 1382863 Part 1: Move MessagePortChild constructor out of inline, creating a vtable needed for clang compilation.
+
+Already committed for Firefox 56.
+
+--- dom/messagechannel/MessagePort.cpp.orig	2017-07-31 16:20:53.000000000 +0000
++++ dom/messagechannel/MessagePort.cpp
+@@ -47,6 +47,11 @@ using namespace mozilla::dom::workers;
+ namespace mozilla {
+ namespace dom {
+ 
++MessagePortChild::MessagePortChild()
++  : mPort(nullptr)
++{
++}
++
+ class PostMessageRunnable final : public CancelableRunnable
+ {
+   friend class MessagePort;
diff --git a/www/firefox/patches/patch-dom_messagechannel_MessagePortChild.h b/www/firefox/patches/patch-dom_messagechannel_MessagePortChild.h
new file mode 100644
index 00000000000..14d3d8221e6
--- /dev/null
+++ b/www/firefox/patches/patch-dom_messagechannel_MessagePortChild.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-dom_messagechannel_MessagePortChild.h,v 1.1 2017/08/16 14:13:44 ryoon Exp $
+
+defined symbols for architecture x86_64 "vtable for mozilla::dom::MessagePortChild"
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1382863
+
+Bug 1382863 Part 1: Move MessagePortChild constructor out of inline, creating a vtable needed for clang compilation.
+
+Already committed for Firefox 56.
+
+--- dom/messagechannel/MessagePortChild.h.orig	2017-06-15 20:52:23.000000000 +0000
++++ dom/messagechannel/MessagePortChild.h
+@@ -19,7 +19,7 @@ class MessagePortChild final : public PM
+ public:
+   NS_INLINE_DECL_REFCOUNTING(MessagePortChild)
+ 
+-  MessagePortChild() : mPort(nullptr) {}
++  MessagePortChild();
+ 
+   void SetPort(MessagePort* aPort)
+   {