- updated

Changed files:
    X11-agpgart-load.patch -> 1.2
    X11-xdm-fixes.patch -> 1.2

diff --git a/X11-agpgart-load.patch b/X11-agpgart-load.patch
index 203caf80c0c65bbde6caf099053dfbf86e622efe..5604ea980f7757bdabb2dc30a2fb4c2a356b5cf6 100644 (file)
--- a/X11-agpgart-load.patch
+++ b/X11-agpgart-load.patch
@@ -1,5 +1,5 @@
---- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c 2004-08-08 14:22:46.000000000 +0200
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c      2004-08-08 15:14:36.693965624 +0200
+--- xc.org/extras/drm/libdrm/xf86drm.c 2004-08-08 14:22:46.000000000 +0200
++++ xc/extras/drm/libdrm/xf86drm.c     2004-08-08 15:14:36.693965624 +0200
 @@ -466,6 +466,9 @@
  #if !defined(XFree86Server)
        return -1;

diff --git a/X11-xdm-fixes.patch b/X11-xdm-fixes.patch
index e64d868656800386b8781f608788147662a03d4c..f3cf9738ef762274bbdf3bc0e798196e365d1712 100644 (file)
--- a/X11-xdm-fixes.patch
+++ b/X11-xdm-fixes.patch
@@ -15,19 +15,18 @@
  
  #ifndef XdmPixmap
  # define XdmPixmap XVendorStdFilePrefix.xpm
-@@ -42,7 +36,11 @@
+@@ -42,7 +42,11 @@
  #endif
  
- CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
--CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
+ CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter)
 +#ifdef LinuxArchitecture
 +CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
 +#else
-+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
-+#endif /* LinuxArchitecture */
+ CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH) $(XPM_DEFINES),NullParameter)
++#endif
  CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
+ CppFileTarget(Xsession,Xsession.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter)
  
- LinkFile(Xservers,Xservers.$(SERVERSTYPE))
 --- xc.orig/programs/xdm/config/Xres.cpp       2004-08-08 14:31:29.000000000 +0200
 +++ xc/programs/xdm/config/Xres.cpp    2004-08-08 15:03:33.539780384 +0200
 @@ -41,9 +41,7 @@