www/firefox: update to 59.0

Changes:	https://www.mozilla.org/firefox/59.0/releasenotes/
Security:	c71cdc95-3c18-45b7-866a-af28b59aabb5
MFH:		2018Q1

7 files changed, 21 insertions, 93 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 499383844e38..194762a47802 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,12 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	58.0.2
+DISTVERSION=	59.0
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
-MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
-DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
+MASTER_SITES=	https://hg.mozilla.org/releases/mozilla-release/archive/
+DISTNAME=	${MASTER_SITES:M*hg*:S,/archive/,,:T}-2f6a4d2cf42c9d59626061d45c043817cb220814
+DISTFILES=	${DISTNAME:C/.*-//}${EXTRACT_SUFX}
+DIST_SUBDIR=	firefox
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -34,10 +35,10 @@ LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-soundtouch
+USE_MOZILLA=	-cairo -soundtouch
 
 USE_GL=		gl
-USES=		tar:xz
+USES=		tar:bz2
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
@@ -45,12 +46,13 @@ FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
-OPTIONS_DEFAULT=	BUNDLED_CAIRO
+OPTIONS_EXCLUDE=	BUNDLED_CAIRO
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
+		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 86e92b9e4e77..f70bdacbe519 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517954713
-SHA256 (firefox-58.0.2.source.tar.xz) = 2b7794e4c2a24fa388f3acb2956c96bb2c3eae455467f0e386788ebaea7240c3
-SIZE (firefox-58.0.2.source.tar.xz) = 247576952
+TIMESTAMP = 1520278307
+SHA256 (firefox/2f6a4d2cf42c9d59626061d45c043817cb220814.tar.bz2) = b605ea4d22a88b483abf2cbcc4cd8c7927bdbef137ef977037d08d80dc0c81f3
+SIZE (firefox/2f6a4d2cf42c9d59626061d45c043817cb220814.tar.bz2) = 304997740
diff --git a/www/firefox/files/patch-bug1388744 b/www/firefox/files/patch-bug1388744
deleted file mode 100644
index abee54061188..000000000000
--- a/www/firefox/files/patch-bug1388744
+++ /dev/null
@@ -1,14 +0,0 @@
-Unbreak pingsender build on Tier3 archs
-
---- toolkit/crashreporter/google-breakpad/src/third_party/curl/curlbuild.h
-+++ toolkit/crashreporter/google-breakpad/src/third_party/curl/curlbuild.h
-@@ -154,8 +154,7 @@
- #endif
- 
- /* The size of `long', as computed by sizeof. */
--#if defined(_M_X64) || (defined(__x86_64__) && !defined(__ILP32__)) ||      \
--    defined(__aarch64__) || (defined(__mips__) && _MIPS_SIM == _ABI64)
-+#if defined(_M_X64) || defined(__LP64__)
- #define CURL_SIZEOF_LONG 8
- #else
- #define CURL_SIZEOF_LONG 4
diff --git a/www/firefox/files/patch-bug1434619 b/www/firefox/files/patch-bug1434619
deleted file mode 100644
index e072d5d5e908..000000000000
--- a/www/firefox/files/patch-bug1434619
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 98c3940f8b16
-Author: Simon Sapin <simon.sapin@exyr.org>
-Date:   Wed Jan 31 11:01:26 2018 -0600
-
-    servo: Merge #19914 - Remove #![deny(warnings)] (from servo:dont-deny); r=nox
-    
-    We already have https://github.com/servo/servo/pull/19612 to deny warnings at the time of landing into master. But it’s not useful to break the build when later compiler with a more recent Rust version that has introduced new warnings:
-    
-    https://bugzilla.mozilla.org/show_bug.cgi?id=1434619
-    
-    Source-Repo: https://github.com/servo/servo
-    Source-Revision: 7546c37f1e921a112fef5828c59c6738a98c3f30
----
- servo/components/style/lib.rs           | 1 -
- servo/ports/geckolib/lib.rs             | 1 -
- servo/support/gecko/nsstring/src/lib.rs | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git servo/ports/geckolib/lib.rs servo/ports/geckolib/lib.rs
-index ca57307c245a..15c42509a811 100644
---- servo/ports/geckolib/lib.rs
-+++ servo/ports/geckolib/lib.rs
-@@ -2,7 +2,6 @@
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
--#![deny(warnings)]
- 
- extern crate cssparser;
- extern crate env_logger;
-diff --git servo/support/gecko/nsstring/src/lib.rs servo/support/gecko/nsstring/src/lib.rs
-index 0321e38f8bbf..d5c5f147c480 100644
---- servo/support/gecko/nsstring/src/lib.rs
-+++ servo/support/gecko/nsstring/src/lib.rs
-@@ -113,7 +113,6 @@
- //! which invoke their member's destructors through C++ code.
- 
- #![allow(non_camel_case_types)]
--#![deny(warnings)]
- 
- #[macro_use]
- extern crate bitflags;
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index b9752599971c..a88051237d2a 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -118,7 +118,7 @@ index e06ae3457a47..93faa61594a3 100755
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
      CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
      CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 diff --git gfx/skia/moz.build gfx/skia/moz.build
@@ -132,7 +132,7 @@ index 2118677ca3a8..e4978b413784 100644
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'):
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'):
      CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
      CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 diff --git gfx/thebes/moz.build gfx/thebes/moz.build
@@ -152,7 +152,7 @@ index 56f1b9fe3f4b..0ac1100b0df3 100644
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
  
- if CONFIG['CLANG_CXX']:
+ if CONFIG['CC_TYPE'] == 'clang':
      # Suppress warnings from Skia header files.
 diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build
 index cb1233c56d7e..06fb1f9f174b 100644
@@ -172,7 +172,7 @@ index 79c26e3e7001..c4d93bc5f7dc 100644
 +++ netwerk/dns/moz.build
 @@ -73,3 +73,6 @@ USE_LIBS += ['icu']
  
- if CONFIG['GNU_CXX']:
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
      CXXFLAGS += ['-Wno-error=shadow']
 +
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
diff --git a/www/firefox/files/patch-config-baseconfig.mk b/www/firefox/files/patch-config-baseconfig.mk
deleted file mode 100644
index 40a81f4587f4..000000000000
--- a/www/firefox/files/patch-config-baseconfig.mk
+++ /dev/null
@@ -1,17 +0,0 @@
---- config/baseconfig.mk~
-+++ config/baseconfig.mk
-@@ -2,10 +2,10 @@
- # directly in python/mozbuild/mozbuild/base.py for gmake validation.
- # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
- # whether a normal build is happening or whether the check is running.
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/%%MOZILLA%%
-+idldir = $(datadir)/idl/%%MOZILLA%%
-+installdir = $(libdir)/%%MOZILLA%%
-+sdkdir = $(libdir)/%%MOZILLA%%
- ifeq (.,$(DEPTH))
- DIST = dist
- else
diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422
index 3e37f43324e7..a3ce1fe5b450 100644
--- a/www/firefox/files/patch-z-bug517422
+++ b/www/firefox/files/patch-z-bug517422
@@ -45,7 +45,7 @@ index 029ff8504795..2c3a40caa1ba 100644
  if CONFIG['MOZ_WEBM_ENCODER']:
      external_dirs += ['media/libmkv']
  
-@@ -51,12 +60,9 @@ external_dirs += [
+@@ -51,11 +60,8 @@ external_dirs += [
      'media/kiss_fft',
      'media/libcubeb',
      'media/libnestegg',
@@ -53,11 +53,10 @@ index 029ff8504795..2c3a40caa1ba 100644
      'media/libopus',
 -    'media/libtheora',
      'media/libspeex_resampler',
-     'media/libstagefright',
 -    'media/libsoundtouch',
+     'media/mp4parse-rust',
      'media/psshparser'
  ]
- 
 diff --git config/system-headers.mozbuild config/system-headers.mozbuild
 index 09d3db5ca8c0..c6533b84c470 100644
 --- config/system-headers.mozbuild
@@ -180,7 +179,7 @@ index 86b051c58d33..fb6186dce78b 100644
 +if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
 +    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
 +
- if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
+ if CONFIG['MOZ_ANDROID_HLS_SUPPORT'] and CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
      DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
  
 diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
@@ -280,7 +279,7 @@ index c7f85eebff95..aae7b814adb5 100644
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
 +
  # Suppress warnings in third-party code.
- if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
+ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl', 'gcc'):
      CFLAGS += ['-Wno-type-limits']
 diff --git media/libtremor/README_MOZILLA media/libtremor/README_MOZILLA
 index ee67b53a05c5..81c971773d55 100644
@@ -320,7 +319,7 @@ index adf393782cc9..923b76231107 100644
 +++ media/libvorbis/moz.build
 @@ -56,3 +56,6 @@ FINAL_LIBRARY = 'gkmedias'
  # Suppress warnings in third-party code.
- if CONFIG['GNU_CC']:
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
      CFLAGS += ['-Wno-uninitialized']
 +
 +if CONFIG['MOZ_SYSTEM_OGG']: