X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=X11-Xwrapper.patch;fp=X11-Xwrapper.patch;h=40a5a296416db59b9e36bfce13d7b1dd0913997a;hb=2c67d474a35f16b4df46c9b05b0fc25b611639a5;hp=b3f685529f2e119a5d8e73f8c5e921c44a85a41c;hpb=5224d3b12a3438d7940562606c25d656aacbf801;p=packages%2FX11.git

diff --git a/X11-Xwrapper.patch b/X11-Xwrapper.patch
index b3f6855..40a5a29 100644
--- a/X11-Xwrapper.patch
+++ b/X11-Xwrapper.patch
@@ -1,6 +1,5 @@
-diff -urN xc.orig/config/cf/Server.tmpl xc/config/cf/Server.tmpl
---- xc.orig/config/cf/Server.tmpl	Mon Dec 30 15:52:30 2002
-+++ xc/config/cf/Server.tmpl	Mon Dec 30 17:31:51 2002
+--- xc.orig/config/cf/Server.tmpl	2004-08-08 14:23:13.000000000 +0200
++++ xc/config/cf/Server.tmpl	2004-08-08 14:39:45.673849000 +0200
 @@ -25,8 +25,14 @@
  #ifndef DoThreadedServer
  #define DoThreadedServer NO
@@ -17,10 +16,9 @@ diff -urN xc.orig/config/cf/Server.tmpl xc/config/cf/Server.tmpl
  #endif
  
  #ifdef CrossCompileDir
-diff -urN xc.orig/config/cf/xorgsite.def xc/config/cf/xorgsite.def
---- xc.orig/config/cf/xorgsite.def	Mon Dec 30 15:52:31 2002
-+++ xc/config/cf/xorgsite.def	Mon Dec 30 17:37:06 2002
-@@ -69,14 +69,15 @@
+--- xc.orig/config/cf/xorgsite.def	2004-08-08 14:31:29.000000000 +0200
++++ xc/config/cf/xorgsite.def	2004-08-08 14:39:45.727840792 +0200
+@@ -75,14 +75,15 @@
   */
  
  /*
@@ -42,10 +40,9 @@ diff -urN xc.orig/config/cf/xorgsite.def xc/config/cf/xorgsite.def
   */
  
  
-diff -urN xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
---- xc.orig/config/cf/xorg.cf	Mon Dec 30 15:52:31 2002
-+++ xc/config/cf/xorg.cf	Mon Dec 30 17:31:51 2002
-@@ -1104,12 +1104,15 @@
+--- xc.orig/config/cf/xorg.cf	2004-08-08 14:31:29.000000000 +0200
++++ xc/config/cf/xorg.cf	2004-08-08 14:39:45.744838208 +0200
+@@ -710,12 +710,15 @@
  #endif
  
  /*
@@ -65,12 +62,11 @@ diff -urN xc.orig/config/cf/xorg.cf xc/config/cf/xorg.cf
  # endif
  #endif
  
-diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
---- xc.orig/programs/Xserver/Imakefile	Mon Dec 30 15:53:22 2002
-+++ xc/programs/Xserver/Imakefile	Mon Dec 30 17:31:51 2002
-@@ -4,11 +4,6 @@
+--- xc.orig/programs/Xserver/Imakefile	2004-08-08 14:22:53.000000000 +0200
++++ xc/programs/Xserver/Imakefile	2004-08-08 14:39:45.765835016 +0200
+@@ -5,11 +5,6 @@
   */
- XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.275 2002/12/21 00:19:11 torrey Exp $
+ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey Exp $
  
 -#ifndef InstallXserverSetUID
 -#define InstallXserverSetUID NO
@@ -79,8 +75,8 @@ diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
 -
  #include <Server.tmpl>
  
- #ifdef XFree86Version
-@@ -1146,6 +1141,11 @@
+ #if (defined (XFree86Version) || defined(XorgVersion))
+@@ -877,6 +872,11 @@
  #endif /* XnestServer */
  
  
@@ -92,10 +88,9 @@ diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
  #if defined(XnonServer) && XnonServer
  XCOMM
  XCOMM non server, just compile sources for build test
-diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
---- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c	Mon Dec 30 15:53:52 2002
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c	Mon Dec 30 17:31:51 2002
-@@ -66,7 +66,10 @@
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c	2004-08-08 14:22:46.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c	2004-08-08 14:39:45.793830760 +0200
+@@ -100,7 +100,10 @@
  	/* check if we're run with euid==0 */
  	if (geteuid() != 0)
  	{
@@ -107,18 +102,17 @@ diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c xc/pro
  	}
  
  	/*
-diff -urN xc.orig/programs/Xserver/os/Imakefile xc/programs/Xserver/os/Imakefile
---- xc.orig/programs/Xserver/os/Imakefile	Mon Dec 30 15:53:58 2002
-+++ xc/programs/Xserver/os/Imakefile	Mon Dec 30 17:31:52 2002
-@@ -120,6 +120,7 @@
+--- xc.orig/programs/Xserver/os/Imakefile	2004-08-08 14:22:51.000000000 +0200
++++ xc/programs/Xserver/os/Imakefile	2004-08-08 14:39:45.844823008 +0200
+@@ -137,6 +137,7 @@
         INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
  		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
  		  -I$(TOP)/lib/Xau -I../lbx Krb5Includes
 +  EXTRA_DEFINES = -DUSE_PAM
   DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
- 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
-        LINTLIBS = ../dix/llib-ldix.ln
-@@ -166,6 +167,14 @@
+ 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
+ 		  DependDefines
+@@ -184,6 +185,14 @@
  SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
  #endif
  
@@ -133,9 +127,8 @@ diff -urN xc.orig/programs/Xserver/os/Imakefile xc/programs/Xserver/os/Imakefile
  #if HasKrb5
  LinkSourceFile(k5encode.c,$(XAUTHSRC))
  #endif
-diff -urN xc.orig/programs/Xserver/os/wrapper.c xc/programs/Xserver/os/wrapper.c
---- xc.orig/programs/Xserver/os/wrapper.c	Thu Jan  1 01:00:00 1970
-+++ xc/programs/Xserver/os/wrapper.c	Mon Dec 30 17:31:52 2002
+--- xc.orig/programs/Xserver/os/wrapper.c	1970-01-01 01:00:00.000000000 +0100
++++ xc/programs/Xserver/os/wrapper.c	2004-08-08 14:39:45.845822856 +0200
 @@ -0,0 +1,304 @@
 +/*
 + * X server wrapper.
@@ -441,9 +434,8 @@ diff -urN xc.orig/programs/Xserver/os/wrapper.c xc/programs/Xserver/os/wrapper.c
 +    exit(1);
 +}
 +
-diff -urN xc.orig/programs/xinit/startx.cpp xc/programs/xinit/startx.cpp
---- xc.orig/programs/xinit/startx.cpp	Mon Dec 30 15:54:10 2002
-+++ xc/programs/xinit/startx.cpp	Mon Dec 30 17:31:52 2002
+--- xc.orig/programs/xinit/startx.cpp	2004-08-08 14:22:55.000000000 +0200
++++ xc/programs/xinit/startx.cpp	2004-08-08 14:39:45.874818448 +0200
 @@ -53,7 +53,7 @@
  sysclientrc=XINITDIR/xinitrc
  sysserverrc=XINITDIR/xserverrc
@@ -453,10 +445,9 @@ diff -urN xc.orig/programs/xinit/startx.cpp xc/programs/xinit/startx.cpp
  defaultclientargs=""
  defaultserverargs=""
  clientargs=""
-diff -urN xc.orig/programs/xinit/xinit.c xc/programs/xinit/xinit.c
---- xc.orig/programs/xinit/xinit.c	Mon Dec 30 15:54:10 2002
-+++ xc/programs/xinit/xinit.c	Mon Dec 30 17:31:52 2002
-@@ -146,6 +146,7 @@
+--- xc.orig/programs/xinit/xinit.c	2004-08-08 14:22:55.000000000 +0200
++++ xc/programs/xinit/xinit.c	2004-08-08 14:39:45.900814496 +0200
+@@ -149,6 +149,7 @@
  #define	OK_EXIT		0
  #define	ERR_EXIT	1
  
@@ -464,7 +455,7 @@ diff -urN xc.orig/programs/xinit/xinit.c xc/programs/xinit/xinit.c
  char *default_server = "X";
  char *default_display = ":0";		/* choose most efficient */
  char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
-@@ -332,7 +333,10 @@
+@@ -335,7 +336,10 @@
  	if (argc == 0 ||
  #ifndef __UNIXOS2__
  	    (**argv != '/' && **argv != '.')) {