- added Requires(post,postun) to -libs

[packages/XFree86.git] / XFree86-Xwrapper.patch

diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch
index b4bafa4a70333a9c606011c8e81ccb7e99c550d4..cff478f8e129baa1d49045dcbd43db55bce54cc6 100644 (file)
--- a/XFree86-Xwrapper.patch
+++ b/XFree86-Xwrapper.patch
@@ -111,13 +111,13 @@ diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/os/Imakefile XFree86-4.1.0/xc/p
 --- XFree86-4.1.0.orig/xc/programs/Xserver/os/Imakefile        Mon Apr 23 18:17:12 2001
 +++ XFree86-4.1.0/xc/programs/Xserver/os/Imakefile     Sun Jun 17 20:18:35 2001
 @@ -116,6 +116,7 @@
- #endif
-         DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) $(KRB5_DEFINES) $(RGB_DEFINES)
-        INCLUDES = -I.  -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(TOP)/lib/Xau -I../lbx Krb5Includes
+        INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
+                 -I$(SERVERSRC)/Xext -I$(FONTINCSRC) \
+                 -I$(TOP)/lib/Xau -I../lbx Krb5Includes
 +  EXTRA_DEFINES = -DUSE_PAM
-  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
+  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
+                 $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
         LINTLIBS = ../dix/llib-ldix.ln
- 
 @@ -159,6 +160,14 @@
        cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
  #else
@@ -464,3 +464,14 @@ diff -urN XFree86-4.1.0.orig/xc/programs/xinit/xinit.c XFree86-4.1.0/xc/programs
  #else
            (**argv != '/' && **argv != '\\' && **argv != '.' &&
             !(isalpha(**argv) && (*argv)[1]==':'))) {
+--- XFree86-4.2.0/xc/programs/xinit/startx.cpp.orig    Fri Nov 30 21:57:48 2001
++++ XFree86-4.2.0/xc/programs/xinit/startx.cpp Sun Mar  3 12:52:13 2002
+@@ -53,7 +53,7 @@
+ sysclientrc=XINITDIR/xinitrc
+ sysserverrc=XINITDIR/xserverrc
+ defaultclient=BINDIR/xterm
+-defaultserver=BINDIR/X
++defaultserver=BINDIR/Xwrapper
+ defaultclientargs=""
+ defaultserverargs=""
+ clientargs=""