- added missing FontCache*(3) manuals

[packages/XFree86.git] / XFree86-XF86Config-path.patch

diff --git a/XFree86-XF86Config-path.patch b/XFree86-XF86Config-path.patch
index 9fb299deb5298cea3c42a0accc8de4d5b62313b8..f754d0aa90481047b8b5f1b897b87dfb12ef1630 100644 (file)
--- a/XFree86-XF86Config-path.patch
+++ b/XFree86-XF86Config-path.patch
@@ -1,6 +1,8 @@
---- XFree86-3.3.3.1/xc/programs/Xserver/hw/xfree86/common/xf86Config.c~        Sat Jun 19 05:07:26 1999
-+++ XFree86-3.3.3.1/xc/programs/Xserver/hw/xfree86/common/xf86Config.c Sat Jun 19 16:05:02 1999
-@@ -774,10 +774,10 @@
+Binary files XFree86-3.3.5.orig/xc/doc/specs/XIE/XIEProto/ch8_xie.doc and XFree86-3.3.5/xc/doc/specs/XIE/XIEProto/ch8_xie.doc differ
+diff -urN XFree86-3.3.5.orig/xc/programs/Xserver/hw/xfree86/common/xf86Config.c XFree86-3.3.5/xc/programs/Xserver/hw/xfree86/common/xf86Config.c
+--- XFree86-3.3.5.orig/xc/programs/Xserver/hw/xfree86/common/xf86Config.c      Thu Jul 29 11:22:44 1999
++++ XFree86-3.3.5/xc/programs/Xserver/hw/xfree86/common/xf86Config.c   Thu Sep  2 19:42:40 1999
+@@ -774,11 +774,11 @@
      }
      
      /*
@@ -8,8 +10,9 @@
 +     * /etc/X11/XF86Config
       */
      configPaths[++pcount] = (char *)xalloc(PATH_MAX);
+ #if !defined(__QNX__) || defined(__QNXNTO__)
 -    strcpy(configPaths[pcount], "/etc/XF86Config");
 +    strcpy(configPaths[pcount], "/etc/X11/XF86Config");
-     if (xconfig) strcat(configPaths[pcount],xconfig);
-     if ((configFile = fopen( configPaths[pcount], "r" )) != 0) break;
-     
+ #else
+     /* On QNX, we default to /etc/config/XF86Config.nid to 
+      * keep config files separate for network setups