From 5db21f9995a92d07d4a779f525d9f48e193d6c75 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin.whitaker.me.uk>
Date: Wed, 5 Oct 2022 20:41:54 +0100
Subject: Reduce the number of alternative fonts included on the ISO.

Aim to include:
  - all fonts suggested by rpmsrate
  - all X11 fonts
  - all google-noto-sans fonts except
    - the monospaced fonts (take up too much space)
    - the CJK fonts (these are rebadged versions of the fonts contained
      in fonts-otf-source-han, which is suggested by rpmsrate)
  - all fonts specifically required by another package on the ISO
---
 config/build.cfg             |  1 +
 config/pkg-exclude-fonts.lst | 68 ++++++++++++++++++++++++++++++++++++++++++++
 config/pkg-exclude.lst       | 23 ---------------
 3 files changed, 69 insertions(+), 23 deletions(-)
 create mode 100644 config/pkg-exclude-fonts.lst

diff --git a/config/build.cfg b/config/build.cfg
index 1d98299..6bc7f5d 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -34,6 +34,7 @@ my $config = {
     package_exclude_lists => [
         'config/pkg-exclude.lst',
         'config/pkg-exclude-perl.lst',
+        'config/pkg-exclude-fonts.lst',
         'config/pkg-exclude-to-review.lst',
     ],
     biarch_packages => [
diff --git a/config/pkg-exclude-fonts.lst b/config/pkg-exclude-fonts.lst
new file mode 100644
index 0000000..fffecd4
--- /dev/null
+++ b/config/pkg-exclude-fonts.lst
@@ -0,0 +1,68 @@
+# Reduce the number of alternative fonts. Aim to include:
+#  - all fonts suggested by rpmsrate
+#  - all X11 fonts
+#  - all google-noto-sans fonts except
+#    - the monospaced fonts (take up too much space)
+#    - the CJK fonts (these are rebadged versions of the fonts contained
+#      in fonts-otf-source-han, which is suggested by rpmsrate)
+#  - all fonts specifically required by another package on the ISO
+
+aajohan-comfortaa-fonts
+adf-*-fonts
+bitmap-console-fonts
+bitmap-fangsongti-fonts
+bitmap-fixed-fonts
+bitmap-lucida-typewriter-fonts
+fira-code-fonts
+fonts-ttf-Inconsolata
+fonts-ttf-al-anvar-*
+fonts-ttf-chinese-opendesktop
+fonts-ttf-dejavu-lgc
+fonts-ttf-japanese
+fonts-ttf-japanese-extra
+fonts-ttf-kanjistrokeorders
+fonts-ttf-libertine
+fonts-ttf-old-standard
+fonts-ttf-paratype-astra
+fonts-ttf-urw
+fonts-ttf-wqy-microhei
+gdouros-symbola-fonts
+google-croscore*-fonts
+google-droid-sans-fonts
+google-droid-sans-mono-fonts
+google-droid-serif-fonts
+google-go-fonts
+google-go-mono-fonts
+google-go-smallcaps-fonts
+google-noto-sans-cjk-*-fonts
+google-noto-sans-hk-fonts
+google-noto-sans-jp-fonts
+google-noto-sans-kr-fonts
+google-noto-sans-sc-fonts
+google-noto-sans-tc-fonts
+google-noto-sans-mono*-fonts
+google-noto-serif*-fonts
+google-roboto*-fonts
+jomolhari-fonts
+lato-fonts
+lklug-fonts
+lohit-kannada-fonts
+mathjax-*-fonts
+mscore-fonts
+nethack-bitmap-fonts
+python3-matplotlib-data-fonts
+samyak-devanagari-fonts
+samyak-fonts-common
+samyak-gujarati-fonts
+samyak-malayalam-fonts
+samyak-oriya-fonts
+samyak-tamil-fonts
+sazanami-fonts-common
+sazanami-gothic-fonts
+sazanami-mincho-fonts
+sj-*-fonts*
+stix-fonts
+stix-math-fonts
+terminus-font
+ucs-miscfixed-fonts
+vemana2000-fonts
diff --git a/config/pkg-exclude.lst b/config/pkg-exclude.lst
index 9446f23..76b1988 100644
--- a/config/pkg-exclude.lst
+++ b/config/pkg-exclude.lst
@@ -29,29 +29,6 @@ xfig
 # The texlive package really needs splitting up.
 pitivi
 
-# Exclude some fonts to reduce the ISO size.
-adf-*-fonts
-fonts-ttf-al-anvar-*
-google-croscore*-fonts
-google-noto-kufi-arabic*-fonts
-google-noto-naskh-arabic*-fonts
-google-noto-sans-hebrew*-fonts
-google-noto-sans-mono*-fonts
-google-noto-sans-myanmar*-fonts
-google-noto-serif*-fonts
-google-roboto*-fonts
-mathjax-*-fonts
-sj-*-fonts*
-x11-font-bh-type1
-
-# These fonts are identical to the ones in fonts-otf-source-han.
-google-noto-sans-cjk-*-fonts
-google-noto-sans-hk-fonts
-google-noto-sans-jp-fonts
-google-noto-sans-kr-fonts
-google-noto-sans-sc-fonts
-google-noto-sans-tc-fonts
-
 # Exclude some unnecessary alternatives.
 java-17-openjdk-headless-slowdebug
 lxqt-*
-- 
cgit v1.2.1