From 3f0536234a6025e844eaf2931b8c36db2ac7c553 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 5 Mar 2016 12:46:59 +0000 Subject: www/firefox{,-esr}: update to 45.0 (rc2) / 38.7.0 Prepare www/firefox a bit for ESR45: - [e10s] Make layers.progressive-paint;true work at least on 11.0-CURRENT - Chase bundled versions for system dependencies - Drop unused/broken system opus and speex support Changes: https://www.mozilla.org/firefox/45.0/releasenotes/ Changes: https://www.mozilla.org/firefox/38.7.0/releasenotes/ Security: 2225c5b4-1e5a-44fc-9920-b3201c384a15 MFH: 2016Q1 (release candidate) --- www/firefox/files/patch-config-baseconfig.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'www/firefox/files/patch-config-baseconfig.mk') diff --git a/www/firefox/files/patch-config-baseconfig.mk b/www/firefox/files/patch-config-baseconfig.mk index 9db69516cbcc..40a81f4587f4 100644 --- a/www/firefox/files/patch-config-baseconfig.mk +++ b/www/firefox/files/patch-config-baseconfig.mk @@ -1,6 +1,9 @@ --- config/baseconfig.mk~ +++ config/baseconfig.mk -@@ -1,7 +1,7 @@ +@@ -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) @@ -9,6 +12,6 @@ +idldir = $(datadir)/idl/%%MOZILLA%% +installdir = $(libdir)/%%MOZILLA%% +sdkdir = $(libdir)/%%MOZILLA%% - ifndef TOP_DIST - TOP_DIST = dist - endif + ifeq (.,$(DEPTH)) + DIST = dist + else -- cgit v1.2.3