Bug 1324555 - Use the mozilla/browser font instead of our own. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Mon, 19 Dec 2016 21:49:01 +0100
changeset 27195 51767833b635b60e2695ebe9ac8419fa3461b742
parent 27194 c46a741a72139a42eb2001033bead4a3db459c1a
child 27196 e941c4d85867835a21f682492cc1957553a1de7b
push id1878
push userclokep@gmail.com
push dateTue, 07 Mar 2017 14:18:40 +0000
treeherdercomm-beta@ab59ffd05575 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1324555
Bug 1324555 - Use the mozilla/browser font instead of our own. r=jorgk
mail/configure.in
mail/fonts/EmojiOneMozilla.ttf
mail/fonts/README.txt
mail/fonts/moz.build
mail/installer/package-manifest.in
mail/moz.build
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -5,16 +5,17 @@ dnl License, v. 2.0. If a copy of the MP
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 dnl Things we need to carry from confvars.sh
 AC_DEFINE(MOZ_THUNDERBIRD)
 AC_SUBST(MOZ_THUNDERBIRD)
 AC_SUBST(MOZ_COMPOSER)
 AC_SUBST(THUNDERBIRD_VERSION)
 AC_DEFINE(MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES)
+AC_SUBST(MOZ_BUNDLED_FONTS)
 
 dnl Optional parts of the build.
 AC_SUBST(MOZ_MORK)
 if test "$MOZ_MORK"; then
   AC_DEFINE(MOZ_MORK)
 fi
 if test "$OS_ARCH" != "WINNT"; then
   MOZ_MOVEMAIL=1
deleted file mode 100644
index 50356509db04d580db325e6534be3920d657c926..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mail/fonts/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-EmojiOne Mozilla
-================
-
-The upstream repository of EmojiOne Mozilla can be found at
-
-  https://github.com/mozilla/emojione-colr
-
-Please refer commit history for the current version of the font.
-This file purposely omit the version, so there is no need to update it here.
deleted file mode 100644
--- a/mail/fonts/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
-    DIST_SUBDIR = ''
-    FINAL_TARGET_FILES.fonts += [
-        'EmojiOneMozilla.ttf'
-    ]
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -46,17 +46,17 @@
 @RESPATH@/@LPROJ_ROOT@.lproj/*
 #endif
 
 [@AB_CD@]
 @RESPATH@/chrome/@AB_CD@@JAREXT@
 @RESPATH@/chrome/@AB_CD@.manifest
 @RESPATH@/@PREF_DIR@/all-l10n.js
 @RESPATH@/dictionaries/*
-#if defined(XP_WIN) || defined(XP_LINUX)
+#ifdef MOZ_BUNDLED_FONTS
 @RESPATH@/fonts/*
 #endif
 @RESPATH@/hyphenation/*
 #ifdef HAVE_MAKENSISU
 @BINPATH@/uninstall/helper.exe
 #endif
 #ifdef MOZ_UPDATER
 @RESPATH@/update.locale
--- a/mail/moz.build
+++ b/mail/moz.build
@@ -4,20 +4,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 # app is always last as it packages up the built files on mac.
 DIRS += [
     'base',
     'locales',
-    'fonts',
     'extensions',
     'steel',
     'themes',
     'app',
 ]
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
+if CONFIG['MOZ_BUNDLED_FONTS']:
+    DIRS += ['/mozilla/browser/fonts']
+
 TEST_DIRS += ['test/mozmill']