[45839] trunk/dports/x11/wine

[ryandesign at macports.org]

Revision: 45839
          http://trac.macports.org/changeset/45839
Author:   ryandesign at macports.org
Date:     2009-01-22 19:38:18 -0800 (Thu, 22 Jan 2009)
Log Message:
-----------
wine: fix build with freetype 2.3.8; fixes #18087

Modified Paths:
--------------
    trunk/dports/x11/wine/Portfile

Added Paths:
-----------
    trunk/dports/x11/wine/files/patch-freetype.c-pFT_MulFix.diff

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2009-01-23 02:52:39 UTC (rev 45838)
+++ trunk/dports/x11/wine/Portfile	2009-01-23 03:38:18 UTC (rev 45839)
@@ -52,6 +52,10 @@
     port:pkgconfig \
     port:autoconf
 
+# patch-freetype.c-pFT_MulFix.diff should no longer be needed with wine 1.2
+patchfiles \
+    patch-freetype.c-pFT_MulFix.diff
+
 use_autoreconf yes
 autoreconf.args -fvi
 

Added: trunk/dports/x11/wine/files/patch-freetype.c-pFT_MulFix.diff
===================================================================
--- trunk/dports/x11/wine/files/patch-freetype.c-pFT_MulFix.diff	                        (rev 0)
+++ trunk/dports/x11/wine/files/patch-freetype.c-pFT_MulFix.diff	2009-01-23 03:38:18 UTC (rev 45839)
@@ -0,0 +1,24 @@
+--- dlls/gdi32/freetype.c.orig	2008-10-17 10:45:25.000000000 -0500
++++ dlls/gdi32/freetype.c	2009-01-22 21:20:20.000000000 -0600
+@@ -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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090122/ed443855/attachment.html>