xorg-server - remove font selection logic

3 files changed, 9 insertions, 169 deletions

diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE
index 2645ceb370..8f1ae3a7ff 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -180,68 +180,12 @@ message "You might want to make sure you got no old font installs left in"  &&
 message "/usr/lib/X11/fonts or instead have those paths set in xorg.conf ." &&
 message "$DEFAULT_COLOR"                                                    &&
 
-config_query_multi  XORG_SERVER_FONT_100DPI                                 \
-                    "Which 100dpi fonts do you want?"                       \
-                    all                                                     \
-                    none                                                    \
-                    font-bh-100dpi                                          \
-                    font-adobe-100dpi                                       \
-                    font-bitstream-100dpi                                   \
-                    font-adobe-utopia-100dpi                                \
-                    font-bh-lucidatypewriter-100dpi                         &&
-
-config_query_multi  XORG_SERVER_FONT_75DPI                                  \
-                    "Which 75dpi fonts do you want?"                        \
-                    all                                                     \
-                    none                                                    \
-                    font-bh-75dpi                                           \
-                    font-adobe-75dpi                                        \
-                    font-bitstream-75dpi                                    \
-                    font-adobe-utopia-75dpi                                 \
-                    font-bh-lucidatypewriter-75dpi                          &&
-
-config_query_multi  XORG_SERVER_FONT_SPEEDO                                 \
-                    "Which Speedo fonts do you want?"                       \
-                    all                                                     \
-                    none                                                    \
-                    font-bitstream-speedo                                   &&
-
-config_query_multi  XORG_SERVER_FONT_TYPE1                                  \
-                    "Which Type1 fonts do you want?"                        \
-                    all                                                     \
-                    none                                                    \
-                    font-bh-type1                                           \
-                    font-ibm-type1                                          \
-                    font-xfree86-type1                                      \
-                    font-bitstream-type1                                    \
-                    font-adobe-utopia-type1                                 &&
-
-config_query_multi  XORG_SERVER_FONT_TTFOTF                                 \
-                    "Which TTF/OTF fonts do you want?"                      \
-                    all                                                     \
-                    none                                                    \
-                    font-bh-ttf                                             \
-                    font-misc-meltho                                        \
-                    font-misc-ethiopic                                      &&
-
-config_query_multi  XORG_SERVER_FONT_MISC                                   \
-                    "Which misc fonts do you want?"                         \
-                    all                                                     \
-                    none                                                    \
-                    font-dec-misc                                           \
-                    font-sun-misc                                           \
-                    font-jis-misc                                           \
-                    font-mutt-misc                                          \
-                    font-sony-misc                                          \
-                    font-isas-misc                                          \
-                    font-micro-misc                                         \
-                    font-arabic-misc                                        \
-                    font-daewoo-misc                                        \
-                    font-misc-cyrillic                                      \
-                    font-cronyx-cyrillic                                    \
-                    font-schumacher-misc                                    \
-                    font-screen-cyrillic                                    \
-                    font-winitzki-cyrillic
+persistent_remove XORG_SERVER_FONT_100DPI
+persistent_remove XORG_SERVER_FONT_75DPI
+persistent_remove XORG_SERVER_FONT_SPEEDO
+persistent_remove XORG_SERVER_FONT_TYPE1
+persistent_remove XORG_SERVER_FONT_TTFOTF
+persistent_remove XORG_SERVER_FONT_MISC
 
 persistent_remove XORG_SERVER_INPUT_DRIVER
 persistent_remove XORG_SERVER_INPUT_OBSCURE 
diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS
index 43f0ca6caf..2adbd2cf84 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -158,116 +158,10 @@ depends  AWK                                       &&
 depends  mesalib                                   &&
 depends  smgl-gl_select                            &&
 depends  rgb                                       &&
-depends  font-cursor-misc                          &&
-depends  font-misc-misc                            &&
-depends  font-alias                                &&
 depends  libpciaccess                              &&
 depends  libxtst                                   &&
 
-if list_find "$XORG_SERVER_FONT_100DPI" "all"
-then
-depends font-bh-100dpi                             &&
-depends font-adobe-100dpi                          &&
-depends font-bitstream-100dpi                      &&
-depends font-adobe-utopia-100dpi                   &&
-depends font-bh-lucidatypewriter-100dpi
-elif list_find "$XORG_SERVER_FONT_100DPI" "none"
-then
-true
-else
-for font100dpi in $XORG_SERVER_FONT_100DPI
-do
-depends $font100dpi
-done
-fi                                                 &&
-
-if list_find "$XORG_SERVER_FONT_75DPI" "all"
-then
-depends font-bh-75dpi                              &&
-depends font-adobe-75dpi                           &&
-depends font-bitstream-75dpi                       &&
-depends font-adobe-utopia-75dpi                    &&
-depends font-bh-lucidatypewriter-75dpi
-elif list_find "$XORG_SERVER_FONT_75DPI" "none"
-then
-true
-else
-for font75dpi in $XORG_SERVER_FONT_75DPI
-do
-depends $font75dpi
-done
-fi                                                 &&
-
-if list_find "$XORG_SERVER_FONT_SPEEDO" "all"
-then
-depends font-bitstream-speedo
-elif list_find "$XORG_SERVER_FONT_SPEEDO" "none"
-then
-true
-else
-for speedo in $XORG_SERVER_FONT_SPEEDO
-do
-depends $speedo
-done
-fi                                                 &&
-
-if list_find "$XORG_SERVER_FONT_TYPE1" "all"
-then
-depends font-bh-type1                              &&
-depends font-ibm-type1                             &&
-depends font-xfree86-type1                         &&
-depends font-bitstream-type1                       &&
-depends font-adobe-utopia-type1
-elif list_find "$XORG_SERVER_FONT_TYPE1" "none"
-then
-true
-else
-for type1 in $XORG_SERVER_FONT_TYPE1
-do
-depends $type1
-done
-fi                                                 &&
-
-if list_find "$XORG_SERVER_FONT_TTFOTF" "all"
-then
-depends font-bh-ttf                                &&
-depends font-misc-meltho                           &&
-depends font-misc-ethiopic
-elif list_find "$XORG_SERVER_FONT_TTFOTF" "none"
-then
-true
-else
-for ttfotf in $XORG_SERVER_FONT_TTFOTF
-do
-depends $ttfotf
-done
-fi                                                 &&
-
-if list_find "$XORG_SERVER_FONT_MISC" "all"
-then
-depends font-dec-misc                              &&
-depends font-sun-misc                              &&
-depends font-jis-misc                              &&
-depends font-mutt-misc                             &&
-depends font-sony-misc                             &&
-depends font-isas-misc                             &&
-depends font-micro-misc                            &&
-depends font-arabic-misc                           &&
-depends font-daewoo-misc                           &&
-depends font-misc-cyrillic                         &&
-depends font-cronyx-cyrillic                       &&
-depends font-schumacher-misc                       &&
-depends font-screen-cyrillic                       &&
-depends font-winitzki-cyrillic
-elif list_find "$XORG_SERVER_FONT_MISC" "none"
-then
-true
-else
-for misc in $XORG_SERVER_FONT_MISC
-do
-depends $misc
-done
-fi
+message 'additional fonts are not needed, but can be installed indiviually' &&
 
 message 'choose an input driver' &&
 message 'if these drivers are not suitable, choose from the xorg-drivers section' &&
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 87e7599af9..272d2919f9 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -2,6 +2,8 @@
 	* DEPENDS, CONFIGURE: simplify driver selection
 	  instead of giving a vast list of optional drivers, suggest the most likely ones
 	  any others can be installed individually if needed
+	  likewise for fonts
+	* DEPENDS: remove font-cursor-misc. font-misc-misc, font-alias
 
 2015-05-05 Thomas Orgis <sobukus@sourcemage.org>
 	* DEPENDS: on smgl-gl_select