Hello community, here is the log from the commit of package yast2-x11 checked in at Thu Mar 1 21:37:37 CET 2007. -------- --- yast2-x11/yast2-x11.changes 2007-02-26 11:28:35.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-x11/yast2-x11.changes 2007-02-28 10:46:55.281392000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 28 10:40:05 CET 2007 - ms@suse.de + +- 2.15.4 +- better fix for getColorDepth() problem (#247770,#243543) + +------------------------------------------------------------------- Old: ---- yast2-x11-2.15.3.tar.bz2 New: ---- yast2-x11-2.15.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-x11.spec ++++++ --- /var/tmp/diff_new_pack.i10783/_old 2007-03-01 21:37:16.000000000 +0100 +++ /var/tmp/diff_new_pack.i10783/_new 2007-03-01 21:37:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-x11 (Version 2.15.3) +# spec file for package yast2-x11 (Version 2.15.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-x11 -Version: 2.15.3 +Version: 2.15.4 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-x11-2.15.3.tar.bz2 +Source0: yast2-x11-2.15.4.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer qt3-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite %ifnarch s390 s390x @@ -44,7 +44,7 @@ Thomas Roelz %prep -%setup -n yast2-x11-2.15.3 +%setup -n yast2-x11-2.15.4 %build %{prefix}/bin/y2tool y2autoconf @@ -81,6 +81,9 @@ %doc %{prefix}/share/doc/packages/yast2-x11 %changelog +* Wed Feb 28 2007 - ms@suse.de +- 2.15.4 +- better fix for getColorDepth() problem (#247770,#243543) * Mon Feb 26 2007 - ms@suse.de - 2.15.3 - fixed getColorDepth() call in XLib.pm (#247770) ++++++ yast2-x11-2.15.3.tar.bz2 -> yast2-x11-2.15.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.15.3/src/XLib.pm new/yast2-x11-2.15.4/src/XLib.pm --- old/yast2-x11-2.15.3/src/XLib.pm 2007-02-26 11:21:46.000000000 +0100 +++ new/yast2-x11-2.15.4/src/XLib.pm 2007-02-28 10:43:33.000000000 +0100 @@ -16,6 +16,7 @@ use Data::Dumper; use Time::localtime; use SaX; +use FBSet; use Env; textdomain("x11"); @@ -36,6 +37,18 @@ my %cdb; #========================================== +# GetFbColor +#------------------------------------------ +sub GetFbColor { + my $data = FBSet::FbGetData(); + my $cols = $data->swig_depth_get(); + if ($cols < 16) { + return 16; + } + return $cols; +} + +#========================================== # isInitialized #------------------------------------------ BEGIN{ $TYPEINFO{isInitialized} = ["function","boolean"]; } @@ -488,7 +501,7 @@ $mDesktop->selectDesktop (0); my $color = $mDesktop->getColorDepth(); if (! $color) { - $color = 8; + $color = GetFbColor(); } my @list = @{$mDesktop->getResolutions($color)}; my $result = shift (@list); @@ -520,7 +533,7 @@ $mDesktop->selectDesktop (0); my $color = $mDesktop->getColorDepth(); if (! $color) { - $color = 8; + $color = GetFbColor(); } return $color; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.15.3/VERSION new/yast2-x11-2.15.4/VERSION --- old/yast2-x11-2.15.3/VERSION 2007-02-26 11:21:55.000000000 +0100 +++ new/yast2-x11-2.15.4/VERSION 2007-02-28 10:44:23.000000000 +0100 @@ -1 +1 @@ -2.15.3 +2.15.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org