kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/firefox: unbreak on -CURRENT

Browse source 
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
This commit is contained in:
Jan Beich 2019-08-23 21:55:31 +00:00
parent 8e82e590e9
commit 2eef82df1e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=509662
3 changed files with 66 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mail/thunderbird/files/patch-bug1575876 Normal file
View file

@ -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>

22
www/firefox-esr/files/patch-bug1575876 Normal file
View file

@ -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>

22
www/firefox/files/patch-bug1575876 Normal file
View file

@ -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>