Attachment 441 Details for Bug 826 – xorgconfig-fontdir-fixes.patch

[patch] xorgconfig-fontdir-fixes.patch

xorgconfig-fontdir-fixes.patch (text/plain), 2.31 KB, created by Donnie Berkholz on 2004-07-06 02:39:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Donnie Berkholz

Created: 2004-07-06 02:39:52 UTC

Size: 2.31 KB

patch

obsolete

>--- xc/programs/Xserver/hw/xfree86/xf86config/Imakefile.orig	2004-07-04 03:34:58.000000000 -0400
>+++ xc/programs/Xserver/hw/xfree86/xf86config/Imakefile	2004-07-04 03:41:06.000000000 -0400
>@@ -34,7 +34,8 @@
> 		   $(XKBDEFRULESDEFS) -DPROJECTROOT='"$(PROJECTROOT)"' \
> 		   -DXDOCDIR=\"$(DOCDIR)\" $(SITE_FONT_PATH) \
> 		   -DFILEMANSUFFIX=\"$(FILEMANSUFFIX)\" \
>-		   -DXVERSIONSTRING=\"$(XVERSIONSTRING)\"
>+		   -DXVERSIONSTRING=\"$(XVERSIONSTRING)\" \
>+		   -DXFONTDIR=\"$(FONTDIR)\"
> 
> 
> AllTarget(ProgramTargetName(xorgconfig))
>--- xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig	2004-07-04 18:42:08.000000000 -0400
>+++ xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c	2004-07-04 18:43:32.000000000 -0400
>@@ -90,7 +90,7 @@
>  *  - Load "speedo" module.
>  *  - Ready to DRI.
>  *  - Load xtt module instead of freetype module.
>- *  - Add font path "/fonts/TrueType/" and "/fonts/freefont/".
>+ *  - Add font path "/TrueType/" and "/freefont/".
>  *  Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp)
>  */
> /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */
>@@ -175,6 +175,11 @@
> #else
> # define TREEROOTDOC		TREEROOTLX "/doc"
> #endif
>+#ifdef XFONTDIR
>+# define TREEROOTFONT		XFONTDIR
>+#else
>+# define TREEROOTFONT		TREEROOTLX "/fonts"
>+#endif
> #define MODULEPATH		TREEROOT "/lib/modules"
> 
> #ifndef XCONFIGFILE
>@@ -1948,17 +1953,17 @@
> 
> static char *XF86Config_fontpaths[] = 
> {
>-/*	"    FontPath	\"" TREEROOTLX "/fonts/75dpi/\"\n"*/
>-    "/fonts/local/",
>-	"/fonts/misc/",
>-	"/fonts/75dpi/:unscaled",
>-	"/fonts/100dpi/:unscaled",
>-	"/fonts/Speedo/",
>-	"/fonts/Type1/",
>-	"/fonts/TrueType/",
>-	"/fonts/freefont/",
>-	"/fonts/75dpi/",
>-	"/fonts/100dpi/",
>+/*	"    FontPath	\"" TREEROOTFONT "/75dpi/\"\n"*/
>+    "/local/",
>+	"/misc/",
>+	"/75dpi/:unscaled",
>+	"/100dpi/:unscaled",
>+	"/Speedo/",
>+	"/Type1/",
>+	"/TrueType/",
>+	"/freefont/",
>+	"/75dpi/",
>+	"/100dpi/",
> 	0 /* end of fontpaths */
> };
> 
>@@ -2483,7 +2488,7 @@
> #endif
> 
> 	for (i=0; XF86Config_fontpaths[i]; i++) {
>-		strcpy(cur,TREEROOTLX);
>+		strcpy(cur,TREEROOTFONT);
> 		strcat(cur,XF86Config_fontpaths[i]);
> 		/* remove a ':' */
> 		colon = strchr(cur+2,':'); /* OS/2: C:/...:scaled */
>@@ -2496,7 +2501,7 @@
> 		hash = exists_dir(cur) ? "" : "#";
> 		fprintf(f,"%s    FontPath   \"%s%s\"\n",
> 			hash,
>-			TREEROOTLX,
>+			TREEROOTFONT,
> 			XF86Config_fontpaths[i]);
> 	}
> }

Actions: View | Splinter Review

Attachments on bug 826: 441

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.