head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.8
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.6
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.4
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.2.0.10
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.8
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.6
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.4
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.2
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.1.0.4
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.2
	pkgsrc-2009Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2011.05.04.20.31.40;	author adam;	state dead;
branches;
next	1.2;

1.2
date	2010.02.20.08.35.58;	author schwarz;	state Exp;
branches;
next	1.1;

1.1
date	2009.09.07.14.25.08;	author reinoud;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Changes 1.2.3:
* Translation updates
* Various bug fixes
@
text
@$NetBSD: patch-cb,v 1.2 2010/02/20 08:35:58 schwarz Exp $

--- dlls/gdi32/freetype.c.orig	2008-10-17 17:45:25.000000000 +0200
+++ dlls/gdi32/freetype.c	2010-02-19 23:42:59.000000000 +0100
@@@@ -163,7 +163,11 @@@@
 MAKE_FUNCPTR(FT_Init_FreeType);
 MAKE_FUNCPTR(FT_Load_Glyph);
 MAKE_FUNCPTR(FT_Matrix_Multiply);
+#ifdef FT_MULFIX_INLINED
+#define pFT_MulFix FT_MULFIX_INLINED
+#else
 MAKE_FUNCPTR(FT_MulFix);
+#endif
 MAKE_FUNCPTR(FT_New_Face);
 MAKE_FUNCPTR(FT_New_Memory_Face);
 MAKE_FUNCPTR(FT_Outline_Get_Bitmap);
@@@@ -2438,7 +2442,9 @@@@
     LOAD_FUNCPTR(FT_Init_FreeType)
     LOAD_FUNCPTR(FT_Load_Glyph)
     LOAD_FUNCPTR(FT_Matrix_Multiply)
+#ifndef FT_MULFIX_INLINED
     LOAD_FUNCPTR(FT_MulFix)
+#endif
     LOAD_FUNCPTR(FT_New_Face)
     LOAD_FUNCPTR(FT_New_Memory_Face)
     LOAD_FUNCPTR(FT_Outline_Get_Bitmap)
@


1.2
log
@redid some patches since they had been off by a few lines
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Fix build to Wine a bit.

It would bomb out on:
freetype.c:166: error: 'FT_MulFix' undeclared here (not in a function)
freetype.c:166: warning: type defaults to 'int' in declaration of 'pFT_MulFix'

This is due to a newer version of freetype. Patch by Shunichi Fuji. Still
fails to compile on other errors, but one more down.
@
text
@d4 2
a5 3
+++ dlls/gdi32/freetype.c
@@@@ -162,8 +162,12 @@@@ MAKE_FUNCPTR(FT_Get_Sfnt_Name_Count);
 MAKE_FUNCPTR(FT_Get_Sfnt_Table);
d17 1
a17 1
@@@@ -2438,7 +2441,9 @@@@ static BOOL init_freetype(void)
@