Hello community, here is the log from the commit of package xorg-x11 checked in at Sun Oct 26 01:35:02 CEST 2008. -------- --- xorg-x11/xorg-x11.changes 2008-10-22 18:18:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2008-10-25 11:58:46.051085386 +0200 @@ -1,0 +2,7 @@ +Sat Oct 25 11:55:57 CEST 2008 - sndirsch@suse.de + +- xfs-no_config_file.diff + * don't use -config option for cloning if no config_file has + been specified during start of xfs (bnc #419576) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xfs-no_config_file.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.z20260/_old 2008-10-26 01:34:08.000000000 +0200 +++ /var/tmp/diff_new_pack.z20260/_new 2008-10-26 01:34:08.000000000 +0200 @@ -26,7 +26,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 7 +Release: 8 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -159,6 +159,7 @@ Patch21: xvidtune.diff Patch24: xauth-1.0.2.diff Patch46: xfd.diff +Patch47: xfs-no_config_file.diff %description This package contains the X.Org core and sample applications. @@ -277,6 +278,7 @@ popd patch -d scripts-* -p0 -s < %PATCH19 patch -d xvidtune-* -p0 -s < %PATCH21 +patch -d xfs-* -p0 -s < %PATCH47 %build @@ -519,6 +521,10 @@ %{_mandir}/man1/xauth.1* %changelog +* Sat Oct 25 2008 sndirsch@suse.de +- xfs-no_config_file.diff + * don't use -config option for cloning if no config_file has + been specified during start of xfs (bnc #419576) * Wed Oct 22 2008 sndirsch@suse.de - /etc/X11/xdm/{Xsetup,Xstartup} * start xvkbd also if autologin has been configured (bnc #408736) ++++++ xfs-no_config_file.diff ++++++ diff -u -p -r ../xfs-1.0.8.orig//os/osglue.c ./os/osglue.c --- ../xfs-1.0.8.orig//os/osglue.c 2008-10-25 11:34:19.082055835 +0200 +++ ./os/osglue.c 2008-10-25 11:50:19.296627251 +0200 @@ -367,12 +367,20 @@ CloneMyself(void) } sprintf (portnum, "%d", ListenPort); - if (*old_listen_arg != '\0') - execlp(progname, progname, - "-ls", old_listen_arg, - "-cf", configfilename, - "-port", portnum, - (void *)NULL); + if (*old_listen_arg != '\0') { + if (configfilename != NULL) { + execlp(progname, progname, + "-ls", old_listen_arg, + "-cf", configfilename, + "-port", portnum, + (void *)NULL); + } else { + execlp(progname, progname, + "-ls", old_listen_arg, + "-port", portnum, + (void *)NULL); + } + } InitErrors(); /* reopen errors, since we don't want to lose * this */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org