Contents of /trunk/xorg-old/patches-6.8.2-r10/9355_all_6.7.99.2-xorgconfig-fontdir-fixes-v2.patch
Parent Directory | Revision Log
Revision 167 -
(show annotations)
(download)
Tue May 8 20:58:51 2007 UTC (17 years, 4 months ago) by niro
File size: 2523 byte(s)
Tue May 8 20:58:51 2007 UTC (17 years, 4 months ago) by niro
File size: 2523 byte(s)
-import
1 | diff -urN xc.old/programs/Xserver/hw/xfree86/xf86config/Imakefile xc/programs/Xserver/hw/xfree86/xf86config/Imakefile |
2 | --- xc.old/programs/Xserver/hw/xfree86/xf86config/Imakefile 2004-08-13 16:57:38.000000000 -0700 |
3 | +++ xc/programs/Xserver/hw/xfree86/xf86config/Imakefile 2004-08-21 02:29:25.000000000 -0700 |
4 | @@ -49,6 +49,7 @@ |
5 | -DXDOCDIR=\"$(DOCDIR)\" $(SITE_FONT_PATH) \ |
6 | -DFILEMANSUFFIX=\"$(FILEMANSUFFIX)\" \ |
7 | -DXVERSIONSTRING=\"$(XVERSIONSTRING)\" \ |
8 | + -DXFONTDIR=\"$(FONTDIR)\" \ |
9 | $(VENDOR_DEFINES) $(KEYBOARD_DEFS) $(FONT_MODULE_DEFS) |
10 | |
11 | |
12 | diff -urN xc.old/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c |
13 | --- xc.old/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c 2004-08-13 16:57:38.000000000 -0700 |
14 | +++ xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c 2004-08-21 01:08:43.000000000 -0700 |
15 | @@ -90,7 +90,7 @@ |
16 | * - Load "speedo" module. |
17 | * - Ready to DRI. |
18 | * - Load xtt module instead of freetype module. |
19 | - * - Add font path "/fonts/TrueType/" and "/fonts/freefont/". |
20 | + * - Add font path "/TrueType/" and "/freefont/". |
21 | * Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp) |
22 | */ |
23 | /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */ |
24 | @@ -175,6 +175,11 @@ |
25 | #else |
26 | # define TREEROOTDOC TREEROOTLX "/doc" |
27 | #endif |
28 | +#ifdef XFONTDIR |
29 | +# define TREEROOTFONT XFONTDIR |
30 | +#else |
31 | +# define TREEROOTFONT TREEROOTLX "/fonts" |
32 | +#endif |
33 | #define MODULEPATH TREEROOT "/lib/modules" |
34 | |
35 | #ifndef XCONFIGFILE |
36 | @@ -1966,17 +1971,17 @@ |
37 | |
38 | static char *XF86Config_fontpaths[] = |
39 | { |
40 | -/* " FontPath \"" TREEROOTLX "/fonts/75dpi/\"\n"*/ |
41 | - "/fonts/local/", |
42 | - "/fonts/misc/", |
43 | - "/fonts/75dpi/:unscaled", |
44 | - "/fonts/100dpi/:unscaled", |
45 | - "/fonts/Speedo/", |
46 | - "/fonts/Type1/", |
47 | - "/fonts/TrueType/", |
48 | - "/fonts/freefont/", |
49 | - "/fonts/75dpi/", |
50 | - "/fonts/100dpi/", |
51 | +/* " FontPath \"" TREEROOTFONT "/75dpi/\"\n"*/ |
52 | + "/local/", |
53 | + "/misc/", |
54 | + "/75dpi/:unscaled", |
55 | + "/100dpi/:unscaled", |
56 | + "/Speedo/", |
57 | + "/Type1/", |
58 | + "/TrueType/", |
59 | + "/freefont/", |
60 | + "/75dpi/", |
61 | + "/100dpi/", |
62 | 0 /* end of fontpaths */ |
63 | }; |
64 | |
65 | @@ -2505,7 +2510,7 @@ |
66 | #endif |
67 | |
68 | for (i=0; XF86Config_fontpaths[i]; i++) { |
69 | - strcpy(cur,TREEROOTLX); |
70 | + strcpy(cur,TREEROOTFONT); |
71 | strcat(cur,XF86Config_fontpaths[i]); |
72 | /* remove a ':' */ |
73 | colon = strchr(cur+2,':'); /* OS/2: C:/...:scaled */ |
74 | @@ -2518,7 +2523,7 @@ |
75 | hash = exists_dir(cur) ? "" : "#"; |
76 | fprintf(f,"%s FontPath \"%s%s\"\n", |
77 | hash, |
78 | - TREEROOTLX, |
79 | + TREEROOTFONT, |
80 | XF86Config_fontpaths[i]); |
81 | } |
82 | } |