From 78fbeb20c2d0016c5f880ee39b95ae076f654f5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 22 Dec 2005 08:33:18 +0000 Subject: [PATCH] - updated Changed files: X11-agpgart-load.patch -> 1.2 X11-xdm-fixes.patch -> 1.2 --- X11-agpgart-load.patch | 4 ++-- X11-xdm-fixes.patch | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/X11-agpgart-load.patch b/X11-agpgart-load.patch index 203caf8..5604ea9 100644 --- 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 e64d868..f3cf973 100644 --- 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 @@ -- 2.44.0