Hello community, here is the log from the commit of package xorg-x11 checked in at Sat May 31 12:30:27 CEST 2008. -------- --- xorg-x11/xorg-x11.changes 2008-05-26 12:58:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2008-05-29 18:39:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 29 18:39:07 CEST 2008 - schwab@suse.de + +- Fix crash in xfd when a font spec cannot be parsed. + +------------------------------------------------------------------- New: ---- xfd.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.Nr9460/_old 2008-05-31 12:29:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Nr9460/_new 2008-05-31 12:29:52.000000000 +0200 @@ -19,7 +19,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 92 +Release: 94 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -151,6 +151,7 @@ Patch20: xdm.diff Patch21: xvidtune.diff Patch24: xauth-1.0.2.diff +Patch46: xfd.diff %description This package contains the X.Org core and sample applications. @@ -227,6 +228,9 @@ pushd xauth-* %patch24 popd +pushd xfd-* +%patch46 +popd patch -d scripts-* -p0 -s < %PATCH19 patch -d xvidtune-* -p0 -s < %PATCH21 @@ -456,6 +460,8 @@ /var/lib/xdm/authdir/ %changelog +* Thu May 29 2008 schwab@suse.de +- Fix crash in xfd when a font spec cannot be parsed. * Mon May 26 2008 sndirsch@suse.de - xdm init script * bail out verbosely if /etc/X11/xorg.conf.install does not exist ++++++ xfd.diff ++++++ --- grid.c.~1~ 2008-05-28 13:09:53.000000000 +0200 +++ grid.c 2008-05-28 13:09:56.000000000 +0200 @@ -544,7 +544,6 @@ XmuCvtStringToXftFont(Display *dpy, if (!font) { XtDisplayStringConversionWarning(dpy, (char *) fromVal->addr, XtRXftFont); - return False; } } donestr (XftFont *, font, XtRXftFont); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org