Attachment 205 Details for Bug 487 – Patch for 2004-04-17-trunk

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

patch.gudiff (text/plain), 3.52 KB, created by Roland Mainz on 2004-04-17 08:12:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-04-17 08:12:18 UTC

Size: 3.52 KB

patch

obsolete

>Index: xc/xf86Date.h
>===================================================================
>RCS file: xc/xf86Date.h
>diff -N xc/xf86Date.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ b/xc/xf86Date.h	16 Apr 2004 21:20:50 -0000
>@@ -0,0 +1 @@
>+XCOMM empty file
>Index: xc/config/cf/site.def
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/site.def,v
>retrieving revision 1.1.4.1.6.1.6.2
>diff -u -r1.1.4.1.6.1.6.2 site.def
>--- a/xc/config/cf/site.def	13 Apr 2004 03:16:30 -0000	1.1.4.1.6.1.6.2
>+++ b/xc/config/cf/site.def	16 Apr 2004 21:20:50 -0000
>@@ -33,6 +33,7 @@
> 
> 
> #ifdef BeforeVendorCF
>+XCOMM site.def/beforevendorcf start
> 
> /*
>  * Include this for easy XFree86 customisations
>@@ -43,8 +44,6 @@
> 
> #include <host.def>
> 
>-#include <xprint_site.def>
>-
> /* On systems where cpp doesn't correctly expand macros in include directives
>  * the two following macros need to be defined directly (where "X11" is
>  * really whatever the TopLevelProject macro is defined to be).
>@@ -67,9 +66,13 @@
> #endif
> */
> 
>+XCOMM site.def/beforevendorcf end
> #endif /* BeforeVendorCF */
> 
>+#include <xprint_site.def>
>+
> #ifdef AfterVendorCF
>+XCOMM site.def/aftervendorcf start
> 
> #ifndef ProjectRoot
> #define ProjectRoot /usr/X11R6
>@@ -145,4 +148,5 @@
> 
> #include <host.def>
> 
>+XCOMM site.def/aftervendorcf end
> #endif /* AfterVendorCF */
>Index: xc/config/cf/xprint_site.def
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/Attic/xprint_site.def,v
>retrieving revision 1.1.2.5
>diff -u -r1.1.2.5 xprint_site.def
>--- a/xc/config/cf/xprint_site.def	15 Apr 2004 00:11:03 -0000	1.1.2.5
>+++ b/xc/config/cf/xprint_site.def	16 Apr 2004 21:20:50 -0000
>@@ -81,7 +81,16 @@
> #define XpPostScriptDDX	               YES
> #define XpPdfDDX	               NO
> #define XpSvgDDX	               NO
>-#define BuildFonts	               NO
>+
>+/* Needed to build encoding files */
>+#define BuildFonts	               YES
>+#define BuildSpeedoFonts               NO
>+#define BuildType1Fonts                NO
>+#define BuildCIDFonts                  NO
>+#define BuildTrueTypeFonts             NO
>+#define BuildEthiopicFonts             NO
>+#define BuildBethMarduthoFonts         NO
>+
> #define GzipFontCompression            YES
> #define BuildFreeType	               YES
> /* Xprt does not have special support for GLX and XIE (yet) */
>@@ -151,6 +160,10 @@
> #undef XsunServer
> #define XsunServer    NO
> 
>+XCOMM X11R6.7's sun.cf does not set ProjectRoot to /usr/openwin anymore - why ?
>+#define ProjectRoot      /usr/openwin
>+#define ServerConfigDir  /usr/openwin/server/etc
>+
> XCOMM Some build hacks for the GISWxprintglue package
> #if BuildGISWxprintglue
> #  define ProjectRoot      /usr/openwin
>Index: xc/packager/tarball/make_xprint_binary_tarball.sh
>===================================================================
>RCS file: /cvs/xorg/xc/packager/tarball/Attic/make_xprint_binary_tarball.sh,v
>retrieving revision 1.1.2.2
>diff -u -r1.1.2.2 make_xprint_binary_tarball.sh
>--- a/xc/packager/tarball/make_xprint_binary_tarball.sh	15 Apr 2004 00:11:03 -0000	1.1.2.2
>+++ b/xc/packager/tarball/make_xprint_binary_tarball.sh	16 Apr 2004 21:21:39 -0000
>@@ -40,6 +40,9 @@
> [ "${XFONTENCPATH}"               = "" ] && fatal_error "XFONTENCPATH env var not set."
> [ "${XINSTALLXF86ENCODINGFILES}"  = "" ] && fatal_error "XINSTALLXF86ENCODINGFILES env var not set."
> 
>+# Set LD_LIBRARY_PATH to pick-up the shared libs in $(TOP)/exports/lib
>+LD_LIBRARY_PATH="`pwd`/${XTOP}/exports/lib"
>+export LD_LIBRARY_PATH
> 
> # Do not edit
> # REL_* vars are paths relative to '/'

Actions: View | Splinter Review

Attachments on bug 487: 205

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.