Todays CVS compile broken?

[Marcus Meissner]

On Wed, Oct 15, 2003 at 07:01:17PM +0200, Gerhard W. Gruber wrote:
> I downloaded a fresh CVS version from WineHQ and when I tried to compile it I
> got the following errors:
> 
> freetype.c: In function `WineEngCreateFontInstance':
> freetype.c:1254: `FT_ENCODING_MS_SYMBOL' undeclared (first use in this
> function)
> freetype.c:1254: (Each undeclared identifier is reported only once
> freetype.c:1254: for each function it appears in.)
> freetype.c:1257: `FT_ENCODING_UNICODE' undeclared (first use in this function)
> freetype.c:1261: `FT_ENCODING_APPLE_ROMAN' undeclared (first use in this
> function)
> make[2]: *** [freetype.o] Error 1
> make[2]: Leaving directory `/home/user/src/wine.2003-10-15/dlls/gdi'
> make[1]: *** [gdi] Error 2
> make[1]: Leaving directory `/home/user/src/wine.2003-10-15/dlls'
> make: *** [dlls] Error 2

I experience the same, this is due to a too old freetype2 library.

I would suggest following patch:

Changelog:
	Specify fourcc codes for encodings directly, instead of 
	using changing enum names.

Index: dlls/gdi/freetype.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/freetype.c,v
retrieving revision 1.39
diff -u -r1.39 freetype.c
--- dlls/gdi/freetype.c	15 Oct 2003 02:33:55 -0000	1.39
+++ dlls/gdi/freetype.c	15 Oct 2003 17:12:13 -0000
@@ -1251,14 +1251,14 @@
     }
 	
     if (ret->charset == SYMBOL_CHARSET && 
-        !pFT_Select_Charmap(ret->ft_face, FT_ENCODING_MS_SYMBOL)) {
+        !pFT_Select_Charmap(ret->ft_face, MS_MAKE_TAG('s','y','m','b'))) {
         /* No ops */
     }
-    else if (!pFT_Select_Charmap(ret->ft_face, FT_ENCODING_UNICODE)) {
+    else if (!pFT_Select_Charmap(ret->ft_face, MS_MAKE_TAG('u','n','i','c'))) {
         /* No ops */
     }
     else {
-        pFT_Select_Charmap(ret->ft_face, FT_ENCODING_APPLE_ROMAN);
+        pFT_Select_Charmap(ret->ft_face, MS_MAKE_TAG('a','r','m','n'));
     }
 
     ret->orientation = lf.lfOrientation;

Ciao, Marcus