Hello community, here is the log from the commit of package xorg-x11-server checked in at Fri Sep 1 01:43:46 CEST 2006. -------- --- xorg-x11-server/xorg-x11-server.changes 2006-08-29 17:52:34.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2006-08-31 10:30:01.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 31 10:29:10 CEST 2006 - sndirsch@suse.de + +- disable-root-xorg_conf.diff: + * no longer consider to read /root/xorg.conf + +------------------------------------------------------------------- New: ---- disable-root-xorg_conf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.AtpUUe/_old 2006-09-01 01:43:36.000000000 +0200 +++ /var/tmp/diff_new_pack.AtpUUe/_new 2006-09-01 01:43:36.000000000 +0200 @@ -17,7 +17,7 @@ URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.1 -Release: 27 +Release: 28 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -54,6 +54,7 @@ Patch19: disable-aiglx.diff Patch20: xinerama-sig11.diff Patch21: ignore-abi.diff +Patch22: disable-root-xorg_conf.diff Patch334: p_pci-domain.diff Patch350: p_pci-ia64.diff Patch357: p_pci-ce-x.diff @@ -107,6 +108,7 @@ %patch19 %patch20 -p1 %patch21 -p1 +%patch22 ### Bug 197572: X.Org PCI/IA64 patches %patch334 -p0 -b .p_pci-domain.diff pushd hw/xfree86/os-support/bus @@ -406,6 +408,9 @@ %endif %changelog -n xorg-x11-server +* Thu Aug 31 2006 - sndirsch@suse.de +- disable-root-xorg_conf.diff: + * no longer consider to read /root/xorg.conf * Tue Aug 29 2006 - sndirsch@suse.de - only require xorg-x11-fonts-core ('fixed' + 'cursor' fonts) * Mon Aug 28 2006 - sndirsch@suse.de ++++++ disable-root-xorg_conf.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," \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de