Attachment 233 Details for Bug 548 – Prototype patch for 2004-04-22-XORG-CURRENT

[patch] Prototype patch for 2004-04-22-XORG-CURRENT

patch.gudiff (text/plain), 4.13 KB, created by Roland Mainz on 2004-04-25 04:53:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-04-25 04:53:09 UTC

Size: 4.13 KB

patch

obsolete

>Index: xc/config/cf/X11.tmpl
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
>retrieving revision 1.1.4.14
>diff -u -r1.1.4.14 X11.tmpl
>--- xc/config/cf/X11.tmpl	21 Apr 2004 12:46:15 -0000	1.1.4.14
>+++ xc/config/cf/X11.tmpl	24 Apr 2004 18:48:53 -0000
>@@ -140,7 +140,7 @@
> #define XserverStaticFontLib	YES
> #endif
> #ifndef BuildSpeedo
>-#define BuildSpeedo		YES
>+#define BuildSpeedo		NO
> #endif
> #ifndef BuildType1
> #define BuildType1		YES
>@@ -170,7 +170,7 @@
> #define Build100DpiFonts	YES
> #endif
> #ifndef BuildSpeedoFonts
>-#define BuildSpeedoFonts	YES
>+#define BuildSpeedoFonts	NO
> #endif
> #ifndef BuildType1Fonts
> #define BuildType1Fonts		YES
>@@ -753,16 +753,16 @@
> #endif
> #ifndef DefaultFontPath
> 	/*
>-	 * Turn off building Speedo, Type1 and CID fonts if you are building
>+	 * Turn off building Type1 and CID fonts if you are building
> 	 * for low memory footprint
> 	 */
> #if BuildLowMem
> #define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
> #else
> #if PrimaryScreenResolution < 88		/* (75 + 100) / 2 */
>-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
>+#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
> #else
>-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
>+#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
> #endif
> #endif
> #endif
>@@ -773,9 +773,9 @@
>          */
> #if BuildLowMem
> #if PrimaryScreenResolution < 88                /* (75 + 100) / 2 */
>-#define DefaultFSFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
>+#define DefaultFSFontPath $(FONTDIR)/misc/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
> #else
>-#define DefaultFSFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
>+#define DefaultFSFontPath $(FONTDIR)/misc/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
> #endif
> #else
> #define DefaultFSFontPath DefaultFontPath
>Index: xc/config/cf/site.def
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/site.def,v
>retrieving revision 1.1.4.3
>diff -u -r1.1.4.3 site.def
>--- xc/config/cf/site.def	15 Apr 2004 10:13:10 -0000	1.1.4.3
>+++ xc/config/cf/site.def	24 Apr 2004 18:48:53 -0000
>@@ -41,6 +41,8 @@
> #define SiteIConfigFiles $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def
> #endif
> 
>+#define HasFreetype2                   NO
>+
> #include <host.def>
> 
> #include <xorgsite.def>
>Index: xc/config/cf/xfree86.cf
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/xfree86.cf,v
>retrieving revision 1.1.4.5
>diff -u -r1.1.4.5 xfree86.cf
>--- xc/config/cf/xfree86.cf	5 Mar 2004 13:38:12 -0000	1.1.4.5
>+++ xc/config/cf/xfree86.cf	24 Apr 2004 18:48:54 -0000
>@@ -1580,7 +1580,7 @@
>  * Include fonts support
>  */
> #ifndef BuildSpeedo
>-# define BuildSpeedo		YES
>+# define BuildSpeedo		NO
> #endif
> 
> #ifndef BuildType1
>@@ -1609,7 +1609,7 @@
> # define Build100DpiFonts	YES
> #endif
> #ifndef BuildSpeedoFonts
>-# define BuildSpeedoFonts	YES
>+# define BuildSpeedoFonts	NO
> #endif
> #ifndef BuildType1Fonts
> # define BuildType1Fonts	YES
>Index: xc/config/cf/xorg.cf
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/xorg.cf,v
>retrieving revision 1.1.10.1
>diff -u -r1.1.10.1 xorg.cf
>--- xc/config/cf/xorg.cf	15 Apr 2004 10:13:10 -0000	1.1.10.1
>+++ xc/config/cf/xorg.cf	24 Apr 2004 18:48:55 -0000
>@@ -1591,7 +1591,7 @@
>  * Include fonts support
>  */
> #ifndef BuildSpeedo
>-# define BuildSpeedo		YES
>+# define BuildSpeedo		NO
> #endif
> 
> #ifndef BuildType1
>@@ -1620,7 +1620,7 @@
> # define Build100DpiFonts	YES
> #endif
> #ifndef BuildSpeedoFonts
>-# define BuildSpeedoFonts	YES
>+# define BuildSpeedoFonts	NO
> #endif
> #ifndef BuildType1Fonts
> # define BuildType1Fonts	YES

Actions: View | Splinter Review

Attachments on bug 548: 233 | 239

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.