- taken from libXvMCW-0.9.3 sources

[packages/X11.git] / X11-PLD.patch

diff --git a/X11-PLD.patch b/X11-PLD.patch
index c8aa0a62259017c014a47d81bbfd370802898f39..73598d15799fdba50ac68fb58e509ef56a2e4131 100644 (file)
--- a/X11-PLD.patch
+++ b/X11-PLD.patch
@@ -156,7 +156,8 @@ diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl
 +#define FontDir /usr/share/fonts
  #endif
  #ifndef FontEncDir
- #define FontEncDir $(LIBDIR)/fonts/encodings
+-#define FontEncDir $(LIBDIR)/fonts/encodings
++#define FontEncDir /usr/share/fonts/encodings
  #endif
  #ifndef AdmDir
 -#define AdmDir /usr/adm
@@ -190,15 +191,6 @@ diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl
  #endif
  #ifndef NlsDir
  #define NlsDir $(LIBDIR)/nls
-@@ -1502,7 +1502,7 @@
- #define FontDir /usr/share/fonts
- #endif
- #ifndef FontEncDir
--#define FontEncDir $(LIBDIR)/fonts/encodings
-+#define FontEncDir /usr/share/fonts/encodings
- #endif
- #ifndef AdmDir
- #define AdmDir /var/log
 @@ -1531,23 +1535,20 @@
  #define XLocaleDir $(LIBDIR)/locale
  #endif
@@ -427,6 +419,15 @@ diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/reso
 diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile
 --- X11-6.9.0.org/xc/programs/xinit/Imakefile  2005-11-15 05:03:10.000000000 +0100
 +++ X11-6.9.0/xc/programs/xinit/Imakefile      2005-12-22 10:37:39.740963000 +0100
+@@ -72,7 +72,7 @@
+ 
+ MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
+ 
+-MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
++MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DBINDIR=$(BINDIR) -DLIBDIR=$(LIBDIR))
+ 
+ #if defined(SCOArchitecture) || defined(USLArchitecture)
+ ARCHMANDEFS=-D__SCOMAN__
 @@ -88,11 +88,12 @@
  #endif
  InstallManPage(startx,$(MANDIR))