X-Git-Url: http://git.pld-linux.org/?p=packages%2FX11.git;a=blobdiff_plain;f=XFree86-xdm-fixes.patch;h=4a9fbea4eeeb623f015c6ea7f9bf456239efef25;hp=aafc7968a2504541119151dabeff19b580639b3a;hb=HEAD;hpb=60ed9d3a7d4f14c5c37e7bf000d6d9a8aa8b8b60 diff --git a/XFree86-xdm-fixes.patch b/XFree86-xdm-fixes.patch index aafc796..4a9fbea 100644 --- a/XFree86-xdm-fixes.patch +++ b/XFree86-xdm-fixes.patch @@ -1,20 +1,20 @@ -diff -Nur XFree86-4.0.2.org/xc/programs/xdm/Imakefile XFree86-4.0.2/xc/programs/xdm/Imakefile ---- XFree86-4.0.2.org/xc/programs/xdm/Imakefile Wed Nov 29 17:46:07 2000 -+++ XFree86-4.0.2/xc/programs/xdm/Imakefile Thu Dec 21 13:10:37 2000 -@@ -225,9 +225,9 @@ +diff -urN xc.orig/programs/xdm/Imakefile xc/programs/xdm/Imakefile +--- xc.orig/programs/xdm/Imakefile Mon Dec 30 15:54:06 2002 ++++ xc/programs/xdm/Imakefile Mon Dec 30 18:33:35 2002 +@@ -256,9 +256,9 @@ '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \ '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \ '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \ -- '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \ +- '-DDEF_CHOOSER="$(CHOOSERPATH)"' \ - '-DDEF_AUTH_DIR="$(XDMDIR)"' \ - '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"' + '-DDEF_CHOOSER="$(BINDIR)/chooser"' \ + '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \ + '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"' - #endif ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter) -@@ -247,7 +247,7 @@ + LinkConfDirectory(xdm,.,xdm,.) +@@ -277,7 +277,7 @@ #if BuildChooser SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES)) NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter) @@ -23,40 +23,13 @@ diff -Nur XFree86-4.0.2.org/xc/programs/xdm/Imakefile XFree86-4.0.2/xc/programs/ InstallAppDefaults(Chooser) #endif #if BuildBoth -diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Imakefile XFree86-4.0.2/xc/programs/xdm/config/Imakefile ---- XFree86-4.0.2.org/xc/programs/xdm/config/Imakefile Mon Jan 31 20:33:43 2000 -+++ XFree86-4.0.2/xc/programs/xdm/config/Imakefile Thu Dec 21 13:20:54 2000 -@@ -5,9 +5,7 @@ - - all:: Xservers.ws xdm-config Xservers Xresources - --#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)) --DEFAULTVT=vt05 --#endif -+DEFAULTVT=vt9 - - #ifndef XdmPixmap - # define XdmPixmap XFree86.xpm -@@ -25,7 +23,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),NullParameter) -+#ifdef LinuxArchitecture -+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR),NullParameter) -+#else -+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter) -+#endif /* LinuxArchitecture */ - CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) - - LinkFile(Xservers,Xservers.$(SERVERSTYPE)) -diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp ---- XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp Thu Dec 21 13:06:17 2000 -+++ XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp Thu Dec 21 13:19:25 2000 -@@ -36,9 +36,7 @@ - /**/#endif +diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp +--- xc.org/programs/xdm/config/Xres.cpp 2003-11-23 23:32:35.000000000 +0100 ++++ xc/programs/xdm/config/Xres.cpp 2003-11-23 23:33:41.000000000 +0100 +@@ -41,9 +41,7 @@ + XHASHendif #endif /* XPM */ - /**/#ifdef COLOR + XHASHifdef COLOR -#ifndef XPM -xlogin*greetColor: CadetBlue -#else @@ -64,7 +37,7 @@ diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/pro xlogin*borderWidth: 1 xlogin*frameWidth: 5 xlogin*innerFramesWidth: 2 -@@ -47,6 +45,8 @@ +@@ -52,6 +50,8 @@ xlogin*background: grey !xlogin*foreground: darkgreen xlogin*greetColor: Blue3 @@ -73,15 +46,33 @@ diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/pro #endif /* XPM */ xlogin*failColor: red *Foreground: black -diff -Nur XFree86-4.0.2.org/xc/programs/xdm/greeter/Imakefile XFree86-4.0.2/xc/programs/xdm/greeter/Imakefile ---- XFree86-4.0.2.org/xc/programs/xdm/greeter/Imakefile Wed Jun 14 21:43:32 2000 -+++ XFree86-4.0.2/xc/programs/xdm/greeter/Imakefile Thu Dec 21 13:20:13 2000 -@@ -77,8 +77,6 @@ - DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) \ - $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES) +--- xc/programs/xdm/config/Imakefile.orig 2006-01-09 16:01:05.000000000 +0100 ++++ xc/programs/xdm/config/Imakefile 2006-06-11 02:49:16.806881792 +0200 +@@ -4,13 +4,7 @@ + + all:: Xservers.ws xdm-config Xservers Xresources --SHLIBDIR = $(XDMDIR) +-#if (defined(i386Architecture) || defined(AMD64Architecture)) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture)) +-DEFAULTVT=vt05 +-#endif - - SRCS = greet.c verify.c Login.c - OBJS = greet.o verify.o Login.o +-#if defined(LinuxDistribution) && (LinuxDistribution == LinuxDebian) +-DEFAULTVT=vt7 +-#endif ++DEFAULTVT=vt9 + + #ifndef XdmPixmap + # define XdmPixmap XFree86.xpm +@@ -36,7 +30,11 @@ + #endif + CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter) +-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter) ++#ifdef LinuxArchitecture ++CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMVARDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter) ++#else ++CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter) ++#endif /* LinuxArchitecture */ + CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) + + LinkFile(Xservers,Xservers.$(SERVERSTYPE))