diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2015-07-16 06:05:59 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2015-07-16 06:05:59 +0000 |
| commit | ef0a0c91f153782cd38b84d14147dfa8cef8337f (patch) | |
| tree | caa550e9c6de6d456de3b7c58dd8a734b5352b71 /www/firefox-esr/files/patch-bug1103858 | |
| parent | Revert 392050 (diff) | |
- Update NSS and ca_root_nss to 3.19.2
- Update Firefox and gmp-api to 39.0
- Update Firefox ESR and libxul to 38.1.0
Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.19.2_release_notes
Changes: https://www.mozilla.org/firefox/39.0/releasenotes/
Changes: https://www.mozilla.org/firefox/38.1.0/releasenotes/
MFH: 2015Q3
Security: https://vuxml.freebsd.org/freebsd/44d9daee-940c-4179-86bb-6e3ffd617869.html
Notes
Notes:
svn path=/head/; revision=392273
Diffstat (limited to 'www/firefox-esr/files/patch-bug1103858')
| -rw-r--r-- | www/firefox-esr/files/patch-bug1103858 | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/www/firefox-esr/files/patch-bug1103858 b/www/firefox-esr/files/patch-bug1103858 deleted file mode 100644 index 16cfd9973a86..000000000000 --- a/www/firefox-esr/files/patch-bug1103858 +++ /dev/null @@ -1,42 +0,0 @@ -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> |