Browse Source

Issue #1306 - Move bundled fonts to toolkit

pull/24/head
Matt A. Tobin 3 years ago committed by Roy Tam
parent
commit
a4b95f5c0a
  1. 9
      application/basilisk/fonts/README.txt
  2. 11
      application/basilisk/fonts/moz.build
  3. 1
      application/basilisk/moz.build
  4. BIN
      application/palemoon/fonts/TwemojiMozilla.ttf
  5. 1
      application/palemoon/moz.build
  6. 2
      old-configure.in
  7. 0
      toolkit/fonts/README.txt
  8. 0
      toolkit/fonts/TwemojiMozilla.ttf
  9. 1
      toolkit/fonts/moz.build
  10. 3
      toolkit/moz.build

9
application/basilisk/fonts/README.txt

@ -1,9 +0,0 @@
Twemoji Mozilla
================
The upstream repository of Twemoji Mozilla can be found at
https://github.com/mozilla/twemoji-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.

11
application/basilisk/fonts/moz.build

@ -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 += [
'TwemojiMozilla.ttf'
]

1
application/basilisk/moz.build

@ -11,7 +11,6 @@ SPHINX_TREES['browser'] = 'docs'
DIRS += [
'base',
'components',
'fonts',
'locales',
'modules',
'themes',

BIN
application/palemoon/fonts/TwemojiMozilla.ttf

Binary file not shown.

1
application/palemoon/moz.build

@ -9,7 +9,6 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile']
DIRS += [
'base',
'components',
'fonts',
'locales',
'modules',
'themes',

2
old-configure.in

@ -3774,6 +3774,8 @@ if test -n "$MOZ_BUNDLED_FONTS"; then
AC_DEFINE(MOZ_BUNDLED_FONTS)
fi
AC_SUBST(MOZ_BUNDLED_FONTS)
dnl ========================================================
dnl Verify MAR signatures
dnl ========================================================

0
application/palemoon/fonts/README.txt → toolkit/fonts/README.txt

0
application/basilisk/fonts/TwemojiMozilla.ttf → toolkit/fonts/TwemojiMozilla.ttf

1
application/palemoon/fonts/moz.build → toolkit/fonts/moz.build

@ -5,5 +5,4 @@
# 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 += ['TwemojiMozilla.ttf']

3
toolkit/moz.build

@ -19,6 +19,9 @@ DIRS += [
'themes',
]
if CONFIG['MOZ_BUNDLED_FONTS']:
DIRS += ['fonts']
if CONFIG['MOZ_JETPACK']:
DIRS += ['jetpack']

Loading…
Cancel
Save