Date: Fri, 23 Aug 2019 21:55:32 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509662 - in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files Message-ID: <201908232155.x7NLtWqh099204@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Aug 23 21:55:31 2019 New Revision: 509662 URL: https://svnweb.freebsd.org/changeset/ports/509662 Log: www/firefox: unbreak on -CURRENT In file included from media/mtransport/nricectx.cpp:82: In file included from media/mtransport/third_party/nICEr/src/stun/stun_client_ctx.h:41: In file included from media/mtransport/third_party/nICEr/src/stun/stun.h:45: In file included from /usr/include/net/if_var.h:84: /usr/include/sys/lock.h:68:15: error: reference to 'thread' is ambiguous struct thread **owner); ^ /usr/include/sys/lock.h:42:8: note: candidate found by name lookup is 'thread' struct thread; ^ /usr/include/c++/v1/__threading_support:397:24: note: candidate found by name lookup is 'std::__1::thread' class _LIBCPP_TYPE_VIS thread; ^ 1 error generated. Reported by: tijl, pkg-fallout, madpilot Submitted by: tijl Tested by: madpilot Added: head/mail/thunderbird/files/patch-bug1575876 (contents, props changed) head/www/firefox-esr/files/patch-bug1575876 (contents, props changed) head/www/firefox/files/patch-bug1575876 (contents, props changed) Added: head/mail/thunderbird/files/patch-bug1575876 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1575876 Fri Aug 23 21:55:31 2019 (r509662) @@ -0,0 +1,22 @@ +commit b588aee56dcb +Author: Tijl Coosemans <tijl@FreeBSD.org> +Date: Wed Aug 21 23:46:52 2019 +0200 + + Bug 1575876 - Drop header unused on FreeBSD that breaks with new libc++. +--- + media/mtransport/third_party/nICEr/src/stun/stun.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h +index 0d55b63a94c1a..a32751d7950f6 100644 +--- media/mtransport/third_party/nICEr/src/stun/stun.h ++++ media/mtransport/third_party/nICEr/src/stun/stun.h +@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <sys/socket.h> + #ifndef LINUX + #include <net/if.h> +-#if !defined(__OpenBSD__) && !defined(__NetBSD__) ++#ifdef DARWIN + #include <net/if_var.h> + #endif + #include <net/if_dl.h> Added: head/www/firefox-esr/files/patch-bug1575876 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-bug1575876 Fri Aug 23 21:55:31 2019 (r509662) @@ -0,0 +1,22 @@ +commit b588aee56dcb +Author: Tijl Coosemans <tijl@FreeBSD.org> +Date: Wed Aug 21 23:46:52 2019 +0200 + + Bug 1575876 - Drop header unused on FreeBSD that breaks with new libc++. +--- + media/mtransport/third_party/nICEr/src/stun/stun.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h +index 0d55b63a94c1a..a32751d7950f6 100644 +--- media/mtransport/third_party/nICEr/src/stun/stun.h ++++ media/mtransport/third_party/nICEr/src/stun/stun.h +@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <sys/socket.h> + #ifndef LINUX + #include <net/if.h> +-#if !defined(__OpenBSD__) && !defined(__NetBSD__) ++#ifdef DARWIN + #include <net/if_var.h> + #endif + #include <net/if_dl.h> Added: head/www/firefox/files/patch-bug1575876 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1575876 Fri Aug 23 21:55:31 2019 (r509662) @@ -0,0 +1,22 @@ +commit b588aee56dcb +Author: Tijl Coosemans <tijl@FreeBSD.org> +Date: Wed Aug 21 23:46:52 2019 +0200 + + Bug 1575876 - Drop header unused on FreeBSD that breaks with new libc++. +--- + media/mtransport/third_party/nICEr/src/stun/stun.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h +index 0d55b63a94c1a..a32751d7950f6 100644 +--- media/mtransport/third_party/nICEr/src/stun/stun.h ++++ media/mtransport/third_party/nICEr/src/stun/stun.h +@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include <sys/socket.h> + #ifndef LINUX + #include <net/if.h> +-#if !defined(__OpenBSD__) && !defined(__NetBSD__) ++#ifdef DARWIN + #include <net/if_var.h> + #endif + #include <net/if_dl.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908232155.x7NLtWqh099204>