From 5af8b76db8909a3d551bfbc30138d2d397d27c94 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 8 Sep 2015 20:11:45 +0300 Subject: [PATCH] browser: introduce firefox-esr support FX_FLAVOUR variable can be set anywhere to switch use/browser/firefox to prefer ESR packages, including the appropriate localization ones. Note that there's no dependency as it can be set in e.g. starterkits (still unset in regular builds) wholesale but shouldn't affect those of them lacking firefox. --- features.in/browser/config.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/features.in/browser/config.mk b/features.in/browser/config.mk index 4df29fd6..ef7c15f3 100644 --- a/features.in/browser/config.mk +++ b/features.in/browser/config.mk @@ -3,7 +3,11 @@ use/browser: @$(call add,THE_PACKAGES_REGEXP,$$(THE_BROWSER)) @$(call try,THE_BROWSER,webclient) # fallback -use/browser/firefox use/browser/seamonkey \ +# support both firefox and firefox-esr +use/browser/firefox: use/browser + @$(call set,THE_BROWSER,firefox$$(FX_FLAVOUR)) + +use/browser/seamonkey \ use/browser/chromium use/browser/epiphany \ use/browser/qupzilla use/browser/rekonq \ use/browser/elinks use/browser/links2: \ @@ -16,12 +20,19 @@ use/browser/konqueror: use/browser use/browser/konqueror4: use/browser @$(call set,THE_BROWSER,kde4base-konqueror) +# the complete lack of dependencies is intentional +use/browser/firefox/esr: + @$(call set,FX_FLAVOUR,-esr) + use/browser/firefox/live: use/browser/firefox @$(call add,THE_BROWSER,livecd-firefox) # scarey, and will have to be done otherwise when l10n feature is there use/browser/firefox/i18n: use/browser/firefox - @$(call add,THE_BROWSER,firefox-be firefox-kk firefox-ru firefox-uk) + @$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-be) + @$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-kk) + @$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-ru) + @$(call add,THE_BROWSER,firefox$$(FX_FLAVOUR)-uk) # fx29+ use/browser/firefox/classic: use/browser/firefox