- just readd missing part instead of creating another patch

Changed files:
    XFree86-Xwrapper.patch -> 1.9
    XFree86-Xwrapper2.patch -> 1.2

diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch
index f12ce2b703b8b831503730a73e0449f029c41d36..4313c78b0b54636587fe313fa378bf71cb1707a7 100644 (file)
--- a/XFree86-Xwrapper.patch
+++ b/XFree86-Xwrapper.patch
@@ -107,10 +107,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
-@@ -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 @@ diff -urN xc.orig/programs/xinit/xinit.c xc/programs/xinit/xinit.c
  #else
            (**argv != '/' && **argv != '\\' && **argv != '.' &&
             !(isalpha(**argv) && (*argv)[1]==':'))) {
-

diff --git a/XFree86-Xwrapper2.patch b/XFree86-Xwrapper2.patch
deleted file mode 100644 (file)
index f4ef277..0000000
--- a/XFree86-Xwrapper2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xc/programs/Xserver/os/Imakefile.orig      2006-06-11 17:00:33.615026696 +0200
-+++ xc/programs/Xserver/os/Imakefile   2006-06-11 17:02:12.674967296 +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