From 746f19f10b86a0f598cdf7b68e7d16ad1cc733bd Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Tue, 2 Sep 2003 21:39:50 +0000 Subject: [PATCH] hopefully fix for the extreme annoying XF86Config parsing problem which results in a non-startable X git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1298 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/xfree86/4.3.11-config.patch | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/x11/xfree86/4.3.11-config.patch diff --git a/package/x11/xfree86/4.3.11-config.patch b/package/x11/xfree86/4.3.11-config.patch new file mode 100644 index 000000000..7305395ed --- /dev/null +++ b/package/x11/xfree86/4.3.11-config.patch @@ -0,0 +1,33 @@ + +RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v +retrieving revision 3.272 +retrieving revision 3.273 +diff -u -r3.272 -r3.273 +--- xc/programs/Xserver/hw/xfree86/common/xf86Config.c 24 Aug 2003 20:52:30 -0000 3.272 ++++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c 27 Aug 2003 02:50:25 -0000 3.273 +@@ -1,4 +1,4 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.272 2003/08/24 20:52:30 dawes Exp $ */ ++/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.273 2003/08/27 02:50:25 dawes Exp $ */ + + + /* +@@ -1451,7 +1451,7 @@ + indp[count - 1].extraOptions = xf86addNewOption(NULL, "CorePointer", NULL); + indp[count].identifier = NULL; + servlayoutp->inputs = indp; +- } else { ++ } else if (!havePointer) { + /* This should never happen. */ + xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n"); + return FALSE; +@@ -1473,7 +1473,7 @@ + indp[count - 1].extraOptions = xf86addNewOption(NULL, "CoreKeyboard", NULL); + indp[count].identifier = NULL; + servlayoutp->inputs = indp; +- } else { ++ } else if (!haveKeyboard) { + /* This should never happen. */ + xf86Msg(X_ERROR, "Cannot locate a core keyboard device\n"); + return FALSE; + +