From 42c8c7ff15e10f93c2bfb286f6216d15319070c2 Mon Sep 17 00:00:00 2001
From: Basilisk-Dev <basiliskdev@protonmail.com>
Date: Tue, 20 Dec 2022 21:09:57 -0500
Subject: [PATCH] [Basilisk] Bundle fonts on GTK platforms, not just Linux

This is a port of MoonchildProductions/Pale-Moon commit 4f7ad641ab
---
 application/basilisk/confvars.sh                   | 5 +++--
 application/basilisk/installer/package-manifest.in | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/basilisk/confvars.sh b/application/basilisk/confvars.sh
index 6f980c3674..7175957f73 100644
--- a/application/basilisk/confvars.sh
+++ b/application/basilisk/confvars.sh
@@ -10,8 +10,9 @@ MOZ_AUSTRALIS=1
 MC_BASILISK=1
 MOZ_UPDATER=
 
-if test "$OS_ARCH" = "WINNT" -o \
-        "$OS_ARCH" = "Linux"; then
+if test "$MOZ_WIDGET_TOOLKIT" = "windows" -o \
+        "$MOZ_WIDGET_TOOLKIT" = "gtk2" -o \
+        "$MOZ_WIDGET_TOOLKIT" = "gtk3"; then
   MOZ_BUNDLED_FONTS=1
 fi
 
diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index 44b23f962e..c650e16954 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -50,7 +50,7 @@
 @RESPATH@/chrome/@AB_CD@@JAREXT@
 @RESPATH@/chrome/@AB_CD@.manifest
 @RESPATH@/dictionaries/*
-#if defined(XP_WIN) || defined(XP_LINUX)
+#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
 @RESPATH@/fonts/*
 #endif
 @RESPATH@/hyphenation/*