diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-07 09:52:53 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-07 09:52:53 +0000 |
| commit | 0819a334d76a6401c847064c40d692a55cf4fe85 (patch) | |
| tree | 0ed04aebeca1ad6949d2a2e22a1638f752ea1b38 | |
| parent | f6811b4ae1d4159b3d53b185539ab7dffc9014f5 (diff) | |
| download | drakx-kbd-mouse-x11-0819a334d76a6401c847064c40d692a55cf4fe85.tar drakx-kbd-mouse-x11-0819a334d76a6401c847064c40d692a55cf4fe85.tar.gz drakx-kbd-mouse-x11-0819a334d76a6401c847064c40d692a55cf4fe85.tar.bz2 drakx-kbd-mouse-x11-0819a334d76a6401c847064c40d692a55cf4fe85.tar.xz drakx-kbd-mouse-x11-0819a334d76a6401c847064c40d692a55cf4fe85.zip | |
revert titi commit which added XFS configuration again.
AFAIK, there is no reason to need XFS.
as for http://archives.mandrivalinux.com/cooker/2007-07/msg04653.php, it's
simply the result of a badly configured X fontpath. We just have to ensure
upgrades go smoothly. (nb: XFdrake do not *remove* existing XFS configuration
from xorg.conf, it simply to not put one when starting from scratch)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | lib/Xconfig/xfree.pm | 12 |
2 files changed, 2 insertions, 13 deletions
@@ -1,4 +1,5 @@ -- fix default_headers when XFS is installed +- do not configure XFS, it's useless +- fix default_headers (ie allow XFdrake to create xorg.conf from scratch again) - keep the order from MonitorsDB file (allows "Flat Panel 800x600" to be before "Flat Panel 1024x768") (needs a nicely sorted MonitorsDB though) diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm index d9b96b1..5c3f5bc 100644 --- a/lib/Xconfig/xfree.pm +++ b/lib/Xconfig/xfree.pm @@ -825,18 +825,6 @@ $default_header .= <<'END'; EndSection END -if (-x '/usr/bin/xfs') { - log::l("configuring X font server (XFS)"); - $default_header .= <<'END'; -Section "Files" - # font server independent of the X server to render fonts. - FontPath "unix/:-1" - # minimal fonts to allow X to run without xfs - FontPath "/usr/share/fonts/misc:unscaled" -EndSection -END -} - our $default_ModeLine = arch() =~ /ppc/ ? <<'END_PPC' : <<'END'; # Apple iMac modes ModeLine "1024x768" 78.525 1024 1049 1145 1312 768 769 772 800 +hsync +vsync |