From 73c851144720e28b21a491b6250385170db9d752 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 24 Apr 2003 19:00:12 +0000 Subject: perl_checker adaptations + fixes --- perl-install/Xconfig/card.pm | 4 ++-- perl-install/Xconfig/monitor.pm | 6 +++--- perl-install/Xconfig/various.pm | 2 +- perl-install/Xconfig/xfree3.pm | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) (limited to 'perl-install/Xconfig') diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 5c38e7332..6a07e1cd6 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -416,8 +416,8 @@ sub multi_head_choices { } #- XFree version available, it would be better to parse available package and get version from it. -sub xfree4_version { '4.3' } -sub xfree3_version { '3.3.6' } +sub xfree4_version() { '4.3' } +sub xfree3_version() { '3.3.6' } sub xfree_and_glx_choices { my ($card) = @_; diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm index 1df15ecd5..27475c0d1 100644 --- a/perl-install/Xconfig/monitor.pm +++ b/perl-install/Xconfig/monitor.pm @@ -9,7 +9,7 @@ use any; use log; -sub good_default_monitor { +sub good_default_monitor() { arch() =~ /ppc/ ? (detect_devices::get_mac_model() =~ /^iBook/ ? 'Apple|iBook 800x600' : 'Apple|iMac/PowerBook 1024x768') : (detect_devices::isLaptop() ? 'Generic|Flat Panel 1024x768' : 'Generic|1024x768 @ 70 Hz'); @@ -156,7 +156,7 @@ sub configure_automatic { return $monitor->{HorizSync} && $monitor->{VertRefresh}; } -sub getinfoFromDDC { +sub getinfoFromDDC() { my ($VideoRam, @l) = any::ddcxinfos() or return; my @Modes; @@ -180,7 +180,7 @@ sub getinfoFromDDC { }; } -sub monitors { +sub monitors() { readMonitorsDB("$ENV{SHARE_PATH}/ldetect-lst/MonitorsDB"); } sub readMonitorsDB { diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm index d277937c5..5849a1c17 100644 --- a/perl-install/Xconfig/various.pm +++ b/perl-install/Xconfig/various.pm @@ -142,7 +142,7 @@ sub configure_FB_TVOUT { } } -sub check_XF86Config_symlink { +sub check_XF86Config_symlink() { my $f = "$::prefix/etc/X11/XF86Config-4"; if (!-l $f && -e "$f.tvout") { rename $f, "$f.standard"; diff --git a/perl-install/Xconfig/xfree3.pm b/perl-install/Xconfig/xfree3.pm index 450ce3461..8f61fe55a 100644 --- a/perl-install/Xconfig/xfree3.pm +++ b/perl-install/Xconfig/xfree3.pm @@ -109,7 +109,9 @@ sub is_fbdev { val($Screen->{Server}) eq 'FBDev'; } -sub set_Option {} +sub set_Option { + my ($_raw_X, $_category, $_node, @_names) = @_; +} sub val { -- cgit v1.2.1