Update to 48.0.1

* Remove dbus-glib dependency and add dbus option (from Robert Swindells)
* Fix potential build failure in skia (from Robert Swindells)

Changelog:
Fixed
    Fix an audio regression impacting some major websites (bug 1295296)
    Fix a top crash in the JavaScript engine (Bug 1290469)
    Fix a startup crash issue caused by Websense (Bug 1291738)
    Fix a different behavior with e10s / non-e10s on <select> and mouse events (Bug 1291078)
    Fix a top crash caused by plugin issues (Bug 1264530)
    Fix an unsigned add-ons issue on Windows
    Fix a shutdown issue (Bug 1276920)
    Fix a crash in WebRTC

6 files changed, 43 insertions, 16 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index f1294ef94eb..6747fb436fa 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.264 2016/08/17 00:06:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.265 2016/08/20 11:17:32 ryoon Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	48.0
-MOZ_BRANCH_MINOR=	
+MOZ_BRANCH_MINOR=	.1
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index a2d09438ebb..6a8470cfc1f 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.108 2016/08/06 08:46:59 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.109 2016/08/20 11:17:32 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -2435,6 +2435,8 @@ lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/vendor/sdk-c
 lib/firefox/browser/features/loop@mozilla.org/chrome/content/shared/vendor/sdk.js
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/linux/menuPanel.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/linux/menuPanel@2x.png
+lib/firefox/browser/features/loop@mozilla.org/chrome/skin/linux/panelarrow-vertical-warning.png
+lib/firefox/browser/features/loop@mozilla.org/chrome/skin/linux/panelarrow-vertical-warning@2x.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/linux/platform.css
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/linux/toolbar-inverted.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/linux/toolbar-inverted@2x.png
@@ -2444,6 +2446,8 @@ lib/firefox/browser/features/loop@mozilla.org/chrome/skin/osx/menuPanel-yosemite
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/osx/menuPanel-yosemite@2x.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/osx/menuPanel.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/osx/menuPanel@2x.png
+lib/firefox/browser/features/loop@mozilla.org/chrome/skin/osx/panelarrow-vertical-warning.png
+lib/firefox/browser/features/loop@mozilla.org/chrome/skin/osx/panelarrow-vertical-warning@2x.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/osx/platform.css
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/osx/toolbar-inverted.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/osx/toolbar-inverted@2x.png
@@ -2456,6 +2460,8 @@ lib/firefox/browser/features/loop@mozilla.org/chrome/skin/windows/menuPanel-aero
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/windows/menuPanel-aero@2x.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/windows/menuPanel.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/windows/menuPanel@2x.png
+lib/firefox/browser/features/loop@mozilla.org/chrome/skin/windows/panelarrow-vertical-warning.png
+lib/firefox/browser/features/loop@mozilla.org/chrome/skin/windows/panelarrow-vertical-warning@2x.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/windows/platform.css
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/windows/toolbar-XP.png
 lib/firefox/browser/features/loop@mozilla.org/chrome/skin/windows/toolbar-XP@2x.png
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 4e0a6d9cdc0..f35080d7555 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.251 2016/08/16 09:34:12 tnn Exp $
+$NetBSD: distinfo,v 1.252 2016/08/20 11:17:32 ryoon Exp $
 
-SHA1 (firefox-48.0.source.tar.xz) = 2b73cfc996861fe895ad7564d485bf9e35190767
-RMD160 (firefox-48.0.source.tar.xz) = 7f1754fd11849c4894b4cb234fe1c3fc4be47ba6
-SHA512 (firefox-48.0.source.tar.xz) = 51bbb1954920b4d0e49e2834939748e596ed27c09a45adeea2be2cfbd32898dae41f13db17318e9699fa96c41fb50fba9966df1f88deeadc0ae3bdd679bd79c5
-Size (firefox-48.0.source.tar.xz) = 188339876 bytes
+SHA1 (firefox-48.0.1.source.tar.xz) = 95714df71633aac57219c88a0f799652da53901d
+RMD160 (firefox-48.0.1.source.tar.xz) = 3671f0317c0b2ef09eca7e709e6d33c0b3eb89ef
+SHA512 (firefox-48.0.1.source.tar.xz) = 819f726a7e630f62e3d4019d8289341019941df2288e67b1d88d5b16c3ce8636a852ae098905be4f8f2f2049070ffcd008e49cf148f7a6fea7332d223f14a890
+Size (firefox-48.0.1.source.tar.xz) = 189465944 bytes
 SHA1 (patch-aa) = 7d2f0f38668daaaa808f68bea0c0b47dee2c8913
 SHA1 (patch-ao) = 1564bc503670dc07ec8b9b43927f0c5879f3a44d
 SHA1 (patch-as) = bebba8483c1881198066f4022a0da8f95398f38f
@@ -26,6 +26,7 @@ SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 0c1151708420b
 SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 6e91ca436b73affe42ed4e683b3400beb28c4bc6
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426
 SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 9b357196b795f7698f0763cb6cfcd39b4aea6420
+SHA1 (patch-gfx_skia_skia_src_core_SkScaleToSides.h) = 9776f351f86ee1e60c93938b9077693a3542bd3b
 SHA1 (patch-gfx_skia_skia_src_core_SkUtilsArm.cpp) = 94a5a88f1177e09ef7b8dbdb6439153933004356
 SHA1 (patch-gfx_ycbcr_moz.build) = 705c36b972ef1533330e4a180002cef1c22755bf
 SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = f3bf72cb9b52b0c64d8ea5d3a25a797409da9d5a
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index 74ce8a2718b..1be3635c265 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.81 2016/08/07 01:25:41 szptvlfn Exp $
+# $NetBSD: mozilla-common.mk,v 1.82 2016/08/20 11:17:32 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -197,7 +197,6 @@ BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.10.2nb4
 BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.3.0
 .include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=  gtk2+>=2.18.3nb1
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/firefox/options.mk b/www/firefox/options.mk
index f0fa3bb3b6c..2722838c9ae 100644
--- a/www/firefox/options.mk
+++ b/www/firefox/options.mk
@@ -1,15 +1,15 @@
-# $NetBSD: options.mk,v 1.31 2016/08/06 08:46:59 ryoon Exp $
+# $NetBSD: options.mk,v 1.32 2016/08/20 11:17:32 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.firefox
 PKG_SUPPORTED_OPTIONS=	official-mozilla-branding
 PKG_SUPPORTED_OPTIONS+=	debug debug-info mozilla-jemalloc webrtc
-PKG_SUPPORTED_OPTIONS+=	alsa oss pulseaudio
+PKG_SUPPORTED_OPTIONS+=	alsa oss pulseaudio dbus
 PLIST_VARS+=		gnome jemalloc debug
 
 .if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	alsa mozilla-jemalloc
+PKG_SUGGESTED_OPTIONS+=	alsa mozilla-jemalloc dbus
 .else
-PKG_SUGGESTED_OPTIONS+= pulseaudio
+PKG_SUGGESTED_OPTIONS+= pulseaudio dbus
 .endif
 
 # On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
@@ -74,7 +74,13 @@ CONFIGURE_ARGS+=	--enable-pulseaudio
 .else
 CONFIGURE_ARGS+=	--disable-pulseaudio
 .endif
-# XXX end
+
+.if !empty(PKG_OPTIONS:Mdbus)
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-dbus
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
 
 PLIST_VARS+=		branding nobranding
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
diff --git a/www/firefox/patches/patch-gfx_skia_skia_src_core_SkScaleToSides.h b/www/firefox/patches/patch-gfx_skia_skia_src_core_SkScaleToSides.h
new file mode 100644
index 00000000000..76e547b1c84
--- /dev/null
+++ b/www/firefox/patches/patch-gfx_skia_skia_src_core_SkScaleToSides.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-gfx_skia_skia_src_core_SkScaleToSides.h,v 1.1 2016/08/20 11:17:32 ryoon Exp $
+
+--- gfx/skia/skia/src/core/SkScaleToSides.h.orig	2016-06-01 04:11:44.000000000 +0000
++++ gfx/skia/skia/src/core/SkScaleToSides.h
+@@ -46,10 +46,8 @@ public:
+ 
+             // If newMaxRadius forces the total over the limit, then it needs to be
+             // reduced by one ULP to be less than limit - newMinRadius.
+-            // Note: nexttowardf is a c99 call and should be std::nexttoward, but this is not
+-            // implemented in the ARM compiler.
+             if ((double)newMaxRadius + (double)newMinRadius > limit) {
+-                newMaxRadius = nexttowardf(newMaxRadius, 0.0);
++                newMaxRadius = nextafterf(newMaxRadius, 0.0);
+             }
+             *maxRadius = newMaxRadius;
+         }