summaryrefslogtreecommitdiffstats
path: root/exlibs
diff options
context:
space:
mode:
authorQuentin Glidic2017-10-19 13:50:54 +0200
committerQuentin Glidic2017-10-20 12:53:04 +0200
commit9dd0a5dd4e71fed26de067a83bd8b9c5967dbb6d (patch)
treeb193f67e24cf3b5aca772e22432ef6551354fb41 /exlibs
parentfef520eea424d72e713cb3d589499d90da757b80 (diff)
downloadsardemff7-pending-9dd0a5dd4e71fed26de067a83bd8b9c5967dbb6d.tar.xz
mozilla-app: Update for Nightly branding becoming official
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'exlibs')
-rw-r--r--exlibs/mozilla-app.exlib13
1 files changed, 4 insertions, 9 deletions
diff --git a/exlibs/mozilla-app.exlib b/exlibs/mozilla-app.exlib
index 563abc6..13d5438 100644
--- a/exlibs/mozilla-app.exlib
+++ b/exlibs/mozilla-app.exlib
@@ -46,6 +46,7 @@ LICENCES="MPL-2.0"
SLOT="0"
MYOPTIONS="
+ bindist [[ description = [ Disable official branding, allowing binary redistribution ] ]]
dbus
pulseaudio
raw [[ description = [ RAW image formats ] ]]
@@ -64,12 +65,6 @@ if exparam -b comm; then
"
fi
-if ! ever is_scm; then
- MYOPTIONS+="
- bindist [[ description = [ Disable official branding, allowing binary redistribution ] ]]
- "
-fi
-
DEPENDENCIES="
build:
app-arch/zip
@@ -120,14 +115,14 @@ DEFAULT_SRC_COMPILE_PARAMS=(
)
mozilla-app_pkg_setup() {
- if ever is_scm; then
- MOZ_BRANDING=${MOZ_APPLICATION}/branding/nightly
- elif option bindist; then
+ if option bindist; then
if [[ -d "${ECONF_SOURCE}"/${MOZ_APPLICATION}/branding/unofficial ]]; then
MOZ_BRANDING=${MOZ_APPLICATION}/branding/unofficial
else
MOZ_BRANDING=${MOZ_APPLICATION}/branding/nightly
fi
+ elif ever is_scm; then
+ MOZ_BRANDING=${MOZ_APPLICATION}/branding/nightly
else
case ${MOZ_APPLICATION} in
mail)