Attachment 239 Details for Bug 548 – Patch for 2004-04-25-trunk

[patch] Patch for 2004-04-25-trunk

patch.gudiff (text/plain), 4.70 KB, created by Roland Mainz on 2004-04-26 08:32:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-04-26 08:32:40 UTC

Size: 4.70 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.2
>diff -u -r1.2 ChangeLog
>--- a/xc/ChangeLog	23 Apr 2004 18:41:44 -0000	1.2
>+++ b/xc/ChangeLog	25 Apr 2004 22:29:57 -0000
>@@ -1,3 +1,11 @@
>+2004-04-21 Roland Mainz <roland.mainz@nrubsig.org>
>+	* xc/config/cf/X11.tmpl
>+	* xc/config/cf/site.def
>+	* xc/config/cf/xfree86.cf
>+	* xc/config/cf/xorg.cf
>+        Bugzilla #548: RFE: Remove Speedo font support from the Xorg
>+        default build
>+
> 2004-04-23 Egbert Eich <eich@freedesktop.org>
> 	Merging XORG-CURRENT into trunk
> 	
>Index: xc/config/cf/X11.tmpl
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
>retrieving revision 1.2
>diff -u -r1.2 X11.tmpl
>--- a/xc/config/cf/X11.tmpl	23 Apr 2004 18:41:58 -0000	1.2
>+++ b/xc/config/cf/X11.tmpl	25 Apr 2004 22:29:59 -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.2
>diff -u -r1.2 site.def
>--- a/xc/config/cf/site.def	23 Apr 2004 18:41:58 -0000	1.2
>+++ b/xc/config/cf/site.def	25 Apr 2004 22:29:59 -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.2
>diff -u -r1.2 xfree86.cf
>--- a/xc/config/cf/xfree86.cf	23 Apr 2004 18:41:59 -0000	1.2
>+++ b/xc/config/cf/xfree86.cf	25 Apr 2004 22:30:00 -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.2
>diff -u -r1.2 xorg.cf
>--- a/xc/config/cf/xorg.cf	23 Apr 2004 18:41:59 -0000	1.2
>+++ b/xc/config/cf/xorg.cf	25 Apr 2004 22:30:01 -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.