From 297bd5c0cfa27cb2ebef08633029bf0970eba00c Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sat, 4 Jun 2022 14:17:43 -0500 Subject: Revert "No Issue - Always build with bundled fonts" This reverts commit 37651df28da69a3a0481b1984dc41d1238f795c3. --- basilisk/confvars.sh | 5 +++++ basilisk/installer/package-manifest.in | 2 ++ 2 files changed, 7 insertions(+) diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh index 11ca15a..64eb57e 100644 --- a/basilisk/confvars.sh +++ b/basilisk/confvars.sh @@ -10,6 +10,11 @@ MOZ_AUSTRALIS=1 MC_BASILISK=1 MOZ_UPDATER= +if test "$OS_ARCH" = "WINNT" -o \ + "$OS_ARCH" = "Linux"; then + MOZ_BUNDLED_FONTS=1 +fi + # 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 # Firefox compatiblity. diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in index 106f061..1a4f03f 100644 --- a/basilisk/installer/package-manifest.in +++ b/basilisk/installer/package-manifest.in @@ -50,7 +50,9 @@ @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 -- cgit v1.2.3