From a5ec8fdfaa915447f535bc55bb69128626443018 Mon Sep 17 00:00:00 2001
From: roytam1 <roytam@gmail.com>
Date: Thu, 18 Nov 2021 09:04:07 +0800
Subject: [PATCH] [Basilisk] always bundle emoji font

---
 basilisk/confvars.sh                   | 6 +-----
 basilisk/installer/package-manifest.in | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh
index 96369ad14..a23527824 100644
--- a/basilisk/confvars.sh
+++ b/basilisk/confvars.sh
@@ -9,11 +9,7 @@ MOZ_PHOENIX=1
 MOZ_AUSTRALIS=1
 MC_BASILISK=1
 MOZ_UPDATER=
-
-if test "$OS_ARCH" = "WINNT" -o \
-        "$OS_ARCH" = "Linux"; then
-  MOZ_BUNDLED_FONTS=1
-fi
+MOZ_BUNDLED_FONTS=1
 
 # For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release
 # builds so add-on developers have something to target while maintaining
diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in
index d8c5a35ad..1fb928bb6 100644
--- a/basilisk/installer/package-manifest.in
+++ b/basilisk/installer/package-manifest.in
@@ -50,9 +50,7 @@
 @RESPATH@/chrome/@AB_CD@@JAREXT@
 @RESPATH@/chrome/@AB_CD@.manifest
 @RESPATH@/dictionaries/*
-#if defined(XP_WIN) || defined(XP_LINUX)
 @RESPATH@/fonts/*
-#endif
 @RESPATH@/hyphenation/*
 @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
 #ifdef HAVE_MAKENSISU