SOURCES: xorg-app-xinit-xwrapper.patch - updated for 1.0.8

[qboosh]

Author: qboosh                       Date: Sat Mar  8 01:32:33 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.0.8

---- Files affected:
SOURCES:
   xorg-app-xinit-xwrapper.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/xorg-app-xinit-xwrapper.patch
diff -u SOURCES/xorg-app-xinit-xwrapper.patch:1.3 SOURCES/xorg-app-xinit-xwrapper.patch:1.4
--- SOURCES/xorg-app-xinit-xwrapper.patch:1.3	Sun Oct 15 12:49:55 2006
+++ SOURCES/xorg-app-xinit-xwrapper.patch	Sat Mar  8 02:32:27 2008
@@ -1,16 +1,16 @@
---- Makefile.am	2005-12-06 23:48:22.000000000 +0100
-+++ Makefile.am	2006-02-13 18:56:33.734777250 +0100
-@@ -84,7 +84,7 @@
+--- xinit-1.0.8/Makefile.am.orig	2008-03-06 23:08:48.000000000 +0100
++++ xinit-1.0.8/Makefile.am	2008-03-08 02:11:36.208958943 +0100
+@@ -57,7 +57,7 @@
  	-DXINIT=@XINIT@
  
- SCRIPTDEFS = \
+ CPP_FILES_FLAGS = \
 -	-DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DLIBDIR=$(libdir) \
 +	-DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DBINDIR=$(bindir) -DLIBDIR=$(libdir) \
- 	-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS)
- 
- xinitrc: xinitrc.cpp
---- startx.cpp	2005-11-15 05:03:10.000000000 +0100
-+++ startx.cpp	2005-12-22 10:53:22.620963000 +0100
+ 	-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
+ 	-D__libexecdir__="$(libexecdir)" \
+ 	-D__bindir__="$(bindir)"
+--- xinit-1.0.8/startx.cpp	2005-11-15 05:03:10.000000000 +0100
++++ xinit-1.0.8/startx.cpp	2005-12-22 10:53:22.620963000 +0100
 @@ -65,7 +65,7 @@
  userserverrc=$HOME/.xserverrc
  sysserverrc=XINITDIR/xserverrc
@@ -20,17 +20,17 @@
  defaultclientargs=""
  defaultserverargs=""
  clientargs=""
---- xinit.c	2005-10-04 03:27:34.000000000 +0200
-+++ xinit.c	2005-12-22 10:50:53.630963000 +0100
-@@ -156,6 +156,7 @@
+--- xinit-1.0.8/xinit.c.orig	2008-03-06 23:08:48.000000000 +0100
++++ xinit-1.0.8/xinit.c	2008-03-08 02:12:06.010657245 +0100
+@@ -166,6 +166,7 @@
  #define	OK_EXIT		0
  #define	ERR_EXIT	1
  
-+char *default_wrapper = BINDIR "/Xwrapper";
- char *default_server = "X";
- char *default_display = ":0";		/* choose most efficient */
- char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
-@@ -346,7 +347,10 @@
++static char *default_wrapper = BINDIR "/Xwrapper";
+ static char *default_server = "X";
+ static char *default_display = ":0";		/* choose most efficient */
+ static char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
+@@ -374,7 +375,10 @@
  	if (argc == 0 ||
  #ifndef __UNIXOS2__
  	    (**argv != '/' && **argv != '.')) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xorg-app-xinit-xwrapper.patch?r1=1.3&r2=1.4&f=u