aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2019-08-24 05:55:31 +0800
committerjbeich <jbeich@FreeBSD.org>2019-08-24 05:55:31 +0800
commit44adb6e29d77fc5f52446aa7a1e09ab879f7ba53 (patch)
tree9bcdc7cb7c3d4a9dd30e516ee93888c3ebd67646 /www
parent0d465315450b086b051a6f18a5334716946e1a7e (diff)
downloadfreebsd-ports-gnome-44adb6e29d77fc5f52446aa7a1e09ab879f7ba53.tar.gz
freebsd-ports-gnome-44adb6e29d77fc5f52446aa7a1e09ab879f7ba53.tar.zst
freebsd-ports-gnome-44adb6e29d77fc5f52446aa7a1e09ab879f7ba53.zip
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
Diffstat (limited to 'www')
-rw-r--r--www/firefox-esr/files/patch-bug157587622
-rw-r--r--www/firefox/files/patch-bug157587622
2 files changed, 44 insertions, 0 deletions
diff --git a/www/firefox-esr/files/patch-bug1575876 b/www/firefox-esr/files/patch-bug1575876
new file mode 100644
index 000000000000..f16560ac241e
--- /dev/null
+++ b/www/firefox-esr/files/patch-bug1575876
@@ -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>
diff --git a/www/firefox/files/patch-bug1575876 b/www/firefox/files/patch-bug1575876
new file mode 100644
index 000000000000..f16560ac241e
--- /dev/null
+++ b/www/firefox/files/patch-bug1575876
@@ -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>