103 lines
4.4 KiB
Diff
103 lines
4.4 KiB
Diff
|
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/common/xf86Config.c ./hw/xfree86/common/xf86Config.c
|
||
|
|
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/common/xf86Config.c 2006-07-30 09:52:06.000000000 +0200
|
||
|
|
+++ ./hw/xfree86/common/xf86Config.c 2006-08-31 10:22:07.000000000 +0200
|
||
|
|
@@ -98,7 +98,6 @@ extern DeviceAssocRec mouse_assoc;
|
||
|
|
"/etc/X11/%R," "%P/etc/X11/%R," \
|
||
|
|
"%E," "%F," \
|
||
|
|
"/etc/X11/%F," "%P/etc/X11/%F," \
|
||
|
|
- "%D/%X," \
|
||
|
|
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
|
||
|
|
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
|
||
|
|
"%P/etc/X11/%X," \
|
||
|
|
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre ./hw/xfree86/doc/man/xorg.conf.man.pre
|
||
|
|
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-07-20 22:27:48.000000000 +0200
|
||
|
|
+++ ./hw/xfree86/doc/man/xorg.conf.man.pre 2006-08-31 10:35:00.000000000 +0200
|
||
|
|
@@ -65,7 +65,6 @@ search locations are as follows:
|
||
|
|
.B $XORGCONFIG
|
||
|
|
.IB /etc/X11/ $XORGCONFIG
|
||
|
|
.IB __projectroot__/etc/X11/ $XORGCONFIG
|
||
|
|
-.BI $HOME /__xconfigfile__
|
||
|
|
.I /etc/X11/__xconfigfile__-4
|
||
|
|
.I /etc/X11/__xconfigfile__
|
||
|
|
.I /etc/__xconfigfile__
|
||
|
|
@@ -85,10 +84,7 @@ is the path specified with the
|
||
|
|
command line option (which may be absolute or relative),
|
||
|
|
.B $XORGCONFIG
|
||
|
|
is the path specified by that
|
||
|
|
-environment variable (absolute or relative),
|
||
|
|
-.B $HOME
|
||
|
|
-is the path specified by that environment variable (usually the home
|
||
|
|
-directory), and
|
||
|
|
+environment variable (absolute or relative), and
|
||
|
|
.I <hostname>
|
||
|
|
is the machine's hostname as reported by gethostname(3).
|
||
|
|
.PP
|
||
|
|
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/cpconfig.c ./hw/xfree86/parser/cpconfig.c
|
||
|
|
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/cpconfig.c 2006-07-22 01:12:40.000000000 +0200
|
||
|
|
+++ ./hw/xfree86/parser/cpconfig.c 2006-08-31 10:24:48.000000000 +0200
|
||
|
|
@@ -62,7 +62,7 @@ xrealloc (void *p, int size)
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#define CONFPATH "%A,%R,/etc/X11/%R,%P/etc/X11/%R,%E,%F,/etc/X11/%F," \
|
||
|
|
- "%P/etc/X11/%F,%D/%X,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \
|
||
|
|
+ "%P/etc/X11/%F,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \
|
||
|
|
"%P/etc/X11/%X,%P/lib/X11/%X.%H,%P/lib/X11/%X"
|
||
|
|
|
||
|
|
int
|
||
|
|
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/scan.c ./hw/xfree86/parser/scan.c
|
||
|
|
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/scan.c 2006-07-22 01:12:40.000000000 +0200
|
||
|
|
+++ ./hw/xfree86/parser/scan.c 2006-08-31 10:24:19.000000000 +0200
|
||
|
|
@@ -448,7 +448,6 @@ xf86pathIsSafe(const char *path)
|
||
|
|
* %E config file environment ($XORGCONFIG) as an absolute path
|
||
|
|
* %F config file environment ($XORGCONFIG) as a relative path
|
||
|
|
* %G config file environment ($XORGCONFIG) as a safe path
|
||
|
|
- * %D $HOME
|
||
|
|
* %P projroot
|
||
|
|
* %M major version number
|
||
|
|
* %% %
|
||
|
|
@@ -597,14 +596,6 @@ DoSubstitution(const char *template, con
|
||
|
|
} else
|
||
|
|
BAIL_OUT;
|
||
|
|
break;
|
||
|
|
- case 'D':
|
||
|
|
- if (!home)
|
||
|
|
- home = getenv("HOME");
|
||
|
|
- if (home && xf86pathIsAbsolute(home))
|
||
|
|
- APPEND_STR(home);
|
||
|
|
- else
|
||
|
|
- BAIL_OUT;
|
||
|
|
- break;
|
||
|
|
case 'P':
|
||
|
|
if (projroot && xf86pathIsAbsolute(projroot))
|
||
|
|
APPEND_STR(projroot);
|
||
|
|
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/utils/xorgcfg/config.h ./hw/xfree86/utils/xorgcfg/config.h
|
||
|
|
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/utils/xorgcfg/config.h 2006-07-22 01:12:40.000000000 +0200
|
||
|
|
+++ ./hw/xfree86/utils/xorgcfg/config.h 2006-08-31 10:22:56.000000000 +0200
|
||
|
|
@@ -108,7 +108,6 @@ extern int config_mode;
|
||
|
|
"/etc/X11/%R," "%P/etc/X11/%R," \
|
||
|
|
"%E," "%F," \
|
||
|
|
"/etc/X11/%F," "%P/etc/X11/%F," \
|
||
|
|
- "%D/%X," \
|
||
|
|
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
|
||
|
|
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
|
||
|
|
"%P/etc/X11/%X," \
|
||
|
|
@@ -126,7 +125,6 @@ extern int config_mode;
|
||
|
|
"/etc/X11/%R," "%P/etc/X11/%R," \
|
||
|
|
"%E," "%F," \
|
||
|
|
"/etc/X11/%F," "%P/etc/X11/%F," \
|
||
|
|
- "%D/%X," \
|
||
|
|
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
|
||
|
|
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
|
||
|
|
"%P/etc/X11/%X," \
|
||
|
|
diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xwin/winconfig.c ./hw/xwin/winconfig.c
|
||
|
|
--- ../xorg-server-1.1.99.3.orig/hw/xwin/winconfig.c 2006-07-22 01:12:41.000000000 +0200
|
||
|
|
+++ ./hw/xwin/winconfig.c 2006-08-31 10:22:29.000000000 +0200
|
||
|
|
@@ -49,7 +49,6 @@
|
||
|
|
"/etc/X11/%R," "%P/etc/X11/%R," \
|
||
|
|
"%E," "%F," \
|
||
|
|
"/etc/X11/%F," "%P/etc/X11/%F," \
|
||
|
|
- "%D/%X," \
|
||
|
|
"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
|
||
|
|
"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
|
||
|
|
"%P/etc/X11/%X," \
|