diff options
| author | Jakub Bogusz | 2007-12-03 18:21:11 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | a03fb5e40bee06c90880d5813475d19fd3bb4c34 (patch) | |
| tree | bec9c80d7b5b63881327aa413060d90303460605 /XFree86-Xwrapper.patch | |
| parent | 67ca54584f64a5d579065d42379e902e22a3ec05 (diff) | |
| download | X11-a03fb5e40bee06c90880d5813475d19fd3bb4c34.zip X11-a03fb5e40bee06c90880d5813475d19fd3bb4c34.tar.gz | |
- updated for 4.7.0
Changed files:
XFree86-Xwrapper.patch -> 1.12
Diffstat (limited to 'XFree86-Xwrapper.patch')
| -rw-r--r-- | XFree86-Xwrapper.patch | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/XFree86-Xwrapper.patch b/XFree86-Xwrapper.patch index 44e71c2..f67e6d4 100644 --- a/XFree86-Xwrapper.patch +++ b/XFree86-Xwrapper.patch @@ -86,7 +86,7 @@ diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile +#if UseXserverWrapper +all:: Xwrapper -+SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter) ++SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(SERVERPAMLIBRARIES),NullParameter) +InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS)) +#endif + @@ -110,22 +110,14 @@ diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c xc/pro /* --- 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 @@ +@@ -239,6 +241,14 @@ SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES)) #endif +#if UseXserverWrapper && XF86Server +AllTarget(wrapper.o) + -+ WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\" ++ WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\" $(PAMDEFINES) + +SpecialCObjectRule(wrapper,NullParameter,$(WRAPPER_DEFINES)) +#endif |