SOURCES: XFree86-Xwrapper.patch, XFree86-Xwrapper2.patch (REMOVED)...

[qboosh]

Author: qboosh                       Date: Wed Jul 19 19:39:54 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- just readd missing part instead of creating another patch

---- Files affected:
SOURCES:
   XFree86-Xwrapper.patch (1.8 -> 1.9) , XFree86-Xwrapper2.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/XFree86-Xwrapper.patch
diff -u SOURCES/XFree86-Xwrapper.patch:1.8 SOURCES/XFree86-Xwrapper.patch:1.9
--- SOURCES/XFree86-Xwrapper.patch:1.8	Sun Jun 11 19:28:21 2006
+++ SOURCES/XFree86-Xwrapper.patch	Wed Jul 19 21:39:49 2006
@@ -107,10 +107,17 @@
  	}
  
  	/*
-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
-@@ -166,6 +167,14 @@
+--- xc/programs/Xserver/os/Imakefile.orig	2006-02-19 16:51:31.000000000 +0100
++++ xc/programs/Xserver/os/Imakefile	2006-07-19 21:30:56.576028250 +0200
+@@ -193,6 +193,7 @@
+ 		  -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \
+ 		  -I$(SERVERSRC)/lbx -I$(SERVERSRC)/Xprint \
+ 		  -I$(TOP)/lib/Xau Krb5Includes
++  EXTRA_DEFINES = -DUSE_PAM
+  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) \
+ 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
+        LINTLIBS = ../dix/llib-ldix.ln
+@@ -239,6 +240,14 @@
  SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
  #endif
  
@@ -468,4 +475,3 @@
  #else
  	    (**argv != '/' && **argv != '\\' && **argv != '.' &&
  	     !(isalpha(**argv) && (*argv)[1]==':'))) {
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/XFree86-Xwrapper.patch?r1=1.8&r2=1.9&f=u