From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Thu, 22 Dec 2005 16:59:06 +0000 (+0000)
Subject: - fix again
X-Git-Tag: auto/ac/X11-6_9_0-1~6
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=105ecf5b5b118061e514b7e745422db45332e656;p=packages%2FX11.git

- fix again

Changed files:
    X11-PLD.patch -> 1.16
---

diff --git a/X11-PLD.patch b/X11-PLD.patch
index c8aa0a6..4c60ed2 100644
--- 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