summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-03 17:08:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-03 17:08:26 +0000
commit93affffe9250a2fd4311e04a53255537e62ca45c (patch)
tree6f69a9cf3057df22b6960631e5b90c3cb710f3a3
parent5cc8d4067b0cfd45fc6da099aef73efa2881c154 (diff)
downloaddrakx-kbd-mouse-x11-93affffe9250a2fd4311e04a53255537e62ca45c.tar
drakx-kbd-mouse-x11-93affffe9250a2fd4311e04a53255537e62ca45c.tar.gz
drakx-kbd-mouse-x11-93affffe9250a2fd4311e04a53255537e62ca45c.tar.bz2
drakx-kbd-mouse-x11-93affffe9250a2fd4311e04a53255537e62ca45c.tar.xz
drakx-kbd-mouse-x11-93affffe9250a2fd4311e04a53255537e62ca45c.zip
since we don't configure X to use xfs, we don't need to specify a safety
fontpath (was useful when xfs was failing)
-rw-r--r--lib/Xconfig/main.pm4
-rw-r--r--lib/Xconfig/xfree.pm5
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/Xconfig/main.pm b/lib/Xconfig/main.pm
index a33ad56..6b871ec 100644
--- a/lib/Xconfig/main.pm
+++ b/lib/Xconfig/main.pm
@@ -237,9 +237,7 @@ sub check_valid {
my %sections = map {
my @l = $raw_X->get_Sections($_) or return "missing section $_";
$_ => \@l;
- } qw(Files InputDevice Monitor Device Screen ServerLayout);
-
- $sections{Files}[0]{FontPath} or return "missing FontPath";
+ } qw(InputDevice Monitor Device Screen ServerLayout);
'';
}
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index 197c93a..0b84ba4 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -803,11 +803,6 @@ our $default_header = <<'END';
# this file.
# **********************************************************************
-Section "Files"
- # minimal fonts to allow X to run without xfs
- FontPath "/usr/share/fonts/misc:unscaled"
-EndSection
-
Section "ServerFlags"
#DontZap # disable <Ctrl><Alt><BS> (server abort)
#DontZoom # disable <Ctrl><Alt><KP_+>/<KP_-> (resolution switching)