From 5102aa579d3d02b9c3e24008342b28c5d6fc455c Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 30 Nov 2019 09:13:54 -0500
Subject: Issue #1306 - Move bundled fonts to toolkit

---
 toolkit/fonts/README.txt         |   9 +++++++++
 toolkit/fonts/TwemojiMozilla.ttf | Bin 0 -> 1244336 bytes
 toolkit/fonts/moz.build          |   8 ++++++++
 toolkit/moz.build                |   3 +++
 4 files changed, 20 insertions(+)
 create mode 100644 toolkit/fonts/README.txt
 create mode 100644 toolkit/fonts/TwemojiMozilla.ttf
 create mode 100644 toolkit/fonts/moz.build

(limited to 'toolkit')

diff --git a/toolkit/fonts/README.txt b/toolkit/fonts/README.txt
new file mode 100644
index 000000000..bf5cb7e6e
--- /dev/null
+++ b/toolkit/fonts/README.txt
@@ -0,0 +1,9 @@
+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 omits the version, so there is no need to update it here.
diff --git a/toolkit/fonts/TwemojiMozilla.ttf b/toolkit/fonts/TwemojiMozilla.ttf
new file mode 100644
index 000000000..d79250cb0
Binary files /dev/null and b/toolkit/fonts/TwemojiMozilla.ttf differ
diff --git a/toolkit/fonts/moz.build b/toolkit/fonts/moz.build
new file mode 100644
index 000000000..fb6a9b24c
--- /dev/null
+++ b/toolkit/fonts/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; 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'):
+    FINAL_TARGET_FILES.fonts += ['TwemojiMozilla.ttf']
diff --git a/toolkit/moz.build b/toolkit/moz.build
index 397444828..b02d122cd 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -19,6 +19,9 @@ DIRS += [
     'themes',
 ]
 
+if CONFIG['MOZ_BUNDLED_FONTS']:
+    DIRS += ['fonts']
+
 if CONFIG['MOZ_JETPACK']:
     DIRS += ['jetpack']
 
-- 
cgit v1.2.3