From 0ccec1792b8fba8fc60c7a879953c57f10fbfc9c Mon Sep 17 00:00:00 2001
From: Beat Gaetzi <beat@FreeBSD.org>
Date: Wed, 3 Dec 2014 14:55:25 +0000
Subject: - Update Thunderbird to 31.3.0 - Update gmp-api to 35.0 - Update
 openh264 to 1.2 - Update NSS to 3.17.3 - Update Firefox to 34.0.5 - Update
 Firefox ESR 31.3.0 - Update libxul to 31.3.0 - Improve CONFIGURE_TARGET
 handling - Always build using client.mk - Switch to clang by default on
 systems without libc++   (/stable/8 and /stable/9) - Drop lang/python2
 dependency, only lang/python27 is required   to build - Use DuckDuckGo
 searchplugin from upstream (has suggestions   and purposes) - Backport a few
 about:memory fixes - Backport Web Notifications libnotify integration - Add
 GTK3 option for www/firefox. Adwaita is a bit broken   since Gtk 3.14, see:  
 https://bugzilla.mozilla.org/show_bug.cgi?id=1073117

PR:		195559
Submitted by:	Jan Beich
MFH:		2014Q4
Security:	http://vuxml.org/freebsd/7ae61870-9dd2-4884-a2f2-f19bb5784d09.html
---
 www/libxul/files/patch-bug1103858 | 42 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 www/libxul/files/patch-bug1103858

(limited to 'www/libxul/files/patch-bug1103858')

diff --git a/www/libxul/files/patch-bug1103858 b/www/libxul/files/patch-bug1103858
new file mode 100644
index 000000000000..16cfd9973a86
--- /dev/null
+++ b/www/libxul/files/patch-bug1103858
@@ -0,0 +1,42 @@
+diff --git configure.in configure.in
+index b2b45e7..dcfdfb7 100644
+--- configure.in
++++ configure.in
+@@ -8346,7 +8346,7 @@ case "$OS_TARGET" in
+       NECKO_WIFI=1
+     fi
+     ;;
+-  Darwin|FreeBSD|SunOS|WINNT)
++  Darwin|DragonFly|FreeBSD|SunOS|WINNT)
+     NECKO_WIFI=1
+     ;;
+   Linux)
+diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
+index d4de063..3949380 100644
+--- netwerk/wifi/moz.build
++++ netwerk/wifi/moz.build
+@@ -35,7 +35,7 @@ if CONFIG['OS_ARCH'] == 'Darwin':
+     UNIFIED_SOURCES += [
+         'osx_corewlan.mm',
+     ]
+-elif CONFIG['OS_ARCH'] == 'FreeBSD':
++elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'):
+     UNIFIED_SOURCES += [
+         'nsWifiScannerFreeBSD.cpp',
+     ]
+diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp
+index bdf171e..4185d69 100644
+--- netwerk/wifi/nsWifiScannerFreeBSD.cpp
++++ netwerk/wifi/nsWifiScannerFreeBSD.cpp
+@@ -13,7 +13,11 @@
+ #include <sys/socket.h>
+ #include <net/if.h>
+ #include <net/if_media.h>
++#ifdef __DragonFly__
++#include <netproto/802_11/ieee80211_ioctl.h>
++#else
+ #include <net80211/ieee80211_ioctl.h>
++#endif
+ 
+ #include <ifaddrs.h>
+ #include <string.h>
-- 
cgit v1.2.3