Attachment 1450 Details for Bug 2002 – Patch for 2004-12-02-trunk

[patch] Patch for 2004-12-02-trunk

patch.gudiff (text/plain), 5.93 KB, created by Roland Mainz on 2004-12-02 19:21:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-12-02 19:21:50 UTC

Size: 5.93 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.561
>diff -u -2 -0 -r1.561 ChangeLog
>--- xc/ChangeLog	2 Dec 2004 23:47:38 -0000	1.561
>+++ xc/ChangeLog	3 Dec 2004 03:16:35 -0000
>@@ -1,25 +1,25 @@
> 2004-12-02 Roland Mainz <roland.mainz@nrubsig.org>
>         * xc/programs/Xserver/miext/damage/damagestr.h
>-        Bugzilla #1998 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1998):
>-        Fix Xserver standalone build when RENDER extension includes
>-        are not availabe.
>+        Bugzilla #2002 (https://freedesktop.org/bugzilla/show_bug.cgi?id=2002):
>+        Make location of the encodings/ files configurable in the build
>+        system.
> 
> 2004-12-02  Kristian Høgsberg  <krh@redhat.com>
> 
> 	* programs/Xserver/hw/xfree86/common/xf86.h:
> 	* programs/Xserver/include/os.h:
> 	Use __printf__ in gcc function attributes to avoid clash with libc
> 	wrapper define, and remove the last bits of the old workaround.
> 	
> 2004-12-02  Alexander Gottwald  <ago at freedesktop dot org>
> 
> 	* programs/Xserver/os/WaitFor.c:
> 	Remove some of the ifdef WIN32 checks from WaitForSomething
> 
> 2004-12-02  Alexander Gottwald  <ago at freedesktop dot org>
> 
> 	* config/cf/mingw.cf:
> 	Set HasFfs to NO
> 
> 	* programs/Xserver/Imakefile:
> 	Fix link order problems with mingw. Add libdix.a after libmi.a.
>Index: xc/config/cf/X11.tmpl
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v
>retrieving revision 1.37
>diff -u -2 -0 -r1.37 X11.tmpl
>--- xc/config/cf/X11.tmpl	30 Oct 2004 01:41:46 -0000	1.37
>+++ xc/config/cf/X11.tmpl	3 Dec 2004 03:16:37 -0000
>@@ -1496,40 +1496,43 @@
> #endif
> #endif
> #ifndef ConfigDir
> #define ConfigDir $(LIBDIR)/config
> #endif
> #ifndef DocDir
> #define DocDir $(LIBDIR)/doc
> #endif
> #ifndef DocHtmlDir
> #define DocHtmlDir $(DOCDIR)/html
> #endif
> #ifndef DocPsDir
> #define DocPsDir $(DOCDIR)/PostScript
> #endif
> #ifndef DocPdfDir
> #define DocPdfDir $(DOCDIR)/PDF
> #endif
> #ifndef FontDir
> #define FontDir $(LIBDIR)/fonts
> #endif
>+#ifndef FontEncDir
>+#define FontEncDir $(LIBDIR)/fonts/encodings
>+#endif
> #ifndef AdmDir
> #define AdmDir /usr/adm
> #endif
> #ifndef XinitDir
> #define XinitDir $(LIBDIR)/xinit
> #endif
> #ifndef XdmDir
> #define XdmDir $(LIBDIR)/xdm
> #endif
> #ifndef XdmVarDir
> #define XdmVarDir $(VARLIBDIR)/xdm
> #endif
> #ifndef XdmAuthDir
> #define XdmAuthDir $(LIBDIR)/xdm
> #endif
> #ifndef XdmConfigurationSubdirectory		/* under xdm sources */
> #define XdmConfigurationSubdirectory config
> #endif
> #ifndef TwmDir
> #define TwmDir $(LIBDIR)/twm
>@@ -1663,41 +1666,41 @@
>        LIBEXECDIR = LibexecDir
>         MODULEDIR = ModuleDir
>    TOP_X_INCLUDES = TopXInclude
>           XBINDIR = XBinDir		/* BINDIR for X11ProjectRoot */
> 
>        INSTSRCDIR = InstSrcDir		/* Installed source (kernel modules). */
> 
> #ifdef EtcX11Directory
>         ETCX11DIR = EtcX11Directory
> #endif
> #if UseEtcX11
>           CONFDIR = $(ETCX11DIR)
> #elif HasVarDirectory
>           CONFDIR = $(VARDIR)
> #endif
>            DOCDIR = DocDir
>        DOCHTMLDIR = DocHtmlDir
>          DOCPSDIR = DocPsDir
>         DOCPDFDIR = DocPdfDir
>           FONTDIR = FontDir		/* font directories */
>-     ENCODINGSDIR = $(FONTDIR)/encodings /* font encodings directory */
>+     ENCODINGSDIR = FontEncDir          /* font encodings directory */
>          XINITDIR = XinitDir		/* xinit config files */
>            XDMDIR = XdmDir		/* xdm config files */
>         XDMVARDIR = XdmVarDir		/* xdm config files */
>            TWMDIR = TwmDir		/* twm config files */
>            XSMDIR = XsmDir		/* xsm config files */
>            NLSDIR = NlsDir		/* nls files */
>        XLOCALEDIR = XLocaleDir		/* locale files */
>       LBXPROXYDIR = LbxproxyDir		/* lbxproxy files */
>   PROXYMANAGERDIR = ProxyManagerDir	/* proxy manager config files */
>         XPRINTDIR = XPrintDir		/* print config file root */
>       XAPPLOADDIR = XAppLoadDir		/* application default resource dir */
>        FONTCFLAGS = FontCompilerFlags
> 
>      INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
> 
> #if UseInstalledX11
>               RGB = $(XBINDIR)/rgb
>             FONTC = $(XBINDIR)/bdftopcf
>       MKFONTSCALE = $(XBINDIR)/mkfontscale
>         MKFONTDIR = $(XBINDIR)/mkfontdir
>Index: xc/lib/font/fontfile/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/font/fontfile/Imakefile,v
>retrieving revision 1.3
>diff -u -2 -0 -r1.3 Imakefile
>--- xc/lib/font/fontfile/Imakefile	4 May 2004 22:59:15 -0000	1.3
>+++ xc/lib/font/fontfile/Imakefile	3 Dec 2004 03:16:51 -0000
>@@ -28,41 +28,41 @@
> #endif
> #if BuildCID
> CID_DEFINES = -DBUILD_CID
> #endif
> #if BuildFreeType
> FREETYPE_DEFINES = -DBUILD_FREETYPE
> #endif
> 
> #if FontencCompatibility
>  COMPAT_SRC = fontencc.c
>  COMPAT_OBJ = fontencc.o
> #endif
> 
> #if GzipFontCompression
>  GUNZIP_SRC = gunzip.c
>  GUNZIP_OBJ = gunzip.o
>   GZIP_DEFS = -DX_GZIP_FONT_COMPRESSION
> #endif
> 
>  ATTRIBDEFS = -DFONTDIRATTRIB
>-FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\"
>+FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(ENCODINGSDIR)/encodings.dir\"
> 
>     DEFINES = StrcasecmpDefines $(ATTRIBDEFS) \
> 	      $(SPEEDO_DEFINES) $(TYPE1_DEFINES) $(CID_DEFINES) \
> 	      $(FREETYPE_DEFINES) $(FONTENCDEFS) \
>               $(GZIP_DEFS)
> 
>        SRCS = dirfile.c fontdir.c fontfile.c fileio.c fontscale.c \
>               defaults.c bitsource.c register.c renderers.c bufio.c \
>               decompress.c filewr.c printerfont.c ffcheck.c \
> 	      fontenc.c encparse.c $(COMPAT_SRC) $(GUNZIP_SRC)
>        OBJS = dirfile.o fontdir.o fontfile.o fileio.o fontscale.o \
>               defaults.o bitsource.o register.o renderers.o bufio.o \
>               decompress.o filewr.o printerfont.o ffcheck.o \
>               fontenc.o encparse.o $(COMPAT_OBJ) $(GUNZIP_OBJ)
> 
> #define DoNormalLib NormalLibFont
> #define DoSharedLib SharedLibFont
> #define DoDebugLib DebugLibFont
> #define DoProfileLib ProfileLibFont
> #include <Library.tmpl>

Actions: View | Splinter Review

Attachments on bug 2002: 1450 | 1451 | 1452

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.