Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (205c50380316d5847b095ae4b0811cfd62500664)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (205c50380316d5847b095ae4b0811cfd62500664)
  • Date: Mon, 26 Jan 2009 16:12:57 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11-libs/wine/HISTORY | 6 +++
x11-libs/wine/PRE_BUILD | 6 +++
x11-libs/wine/freetype2-2.3.8-winebug-17024.patch | 42
++++++++++++++++++++++
3 files changed, 54 insertions(+)

New commits:
commit 205c50380316d5847b095ae4b0811cfd62500664
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Fixes WINE Bug #17024, WINE 1.0.1 cannot build against freetype
2.3.8.
They will not release a new stable just for this bug

diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 254b587..8bee76e 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,9 @@
+2009-01-26 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply freetype2-2.3.8-winebug-17024.patch
+ * freetype2-2.3.8-winebug-17024.patch: Fixes WINE Bug #17024, WINE
1.0.1
+ cannot build against freetype 2.3.8.
+ They will not release a new stable just for this bug
+
2009-01-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.13

diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
new file mode 100755
index 0000000..8a6b87b
--- /dev/null
+++ b/x11-libs/wine/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+if [[ "$WINE_DEVEL" == "n" ]]; then
+ patch $SOURCE_DIRECTORY/dlls/gdi32/freetype.c \
+ $SCRIPT_DIRECTORY/freetype2-2.3.8-winebug-17024.patch
+fi
diff --git a/x11-libs/wine/freetype2-2.3.8-winebug-17024.patch
b/x11-libs/wine/freetype2-2.3.8-winebug-17024.patch
new file mode 100644
index 0000000..ae4bb30
--- /dev/null
+++ b/x11-libs/wine/freetype2-2.3.8-winebug-17024.patch
@@ -0,0 +1,42 @@
+This is the fix for http://bugs.winehq.org/show_bug.cgi?id=17024
+
+From 3a07a8ae6b3798ebd58b3c762dad49059d4576e3 Mon Sep 17 00:00:00 2001
+From: Shunichi Fuji <palglowr@...>
+Date: Wed, 3 Sep 2008 19:51:37 +0900
+Subject: [PATCH] Adjust FT_MulFix function to Freetype cvs head.
+
+see http://lists.nongnu.org/archive/html/freetype-cvs/2008-09/msg00003.html
+
+Signed-off-by: Shunichi Fuji <palglowr@...>
+---
+ dlls/gdi32/freetype.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
+index cb351db..74e70ea 100644
+--- a/dlls/gdi32/freetype.c
++++ b/dlls/gdi32/freetype.c
+@@ -163,7 +163,11 @@ MAKE_FUNCPTR(FT_Get_Sfnt_Table);
+ 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);
+@@ -2434,7 +2438,9 @@ static BOOL init_freetype(void)
+ 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.6.0.1



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (205c50380316d5847b095ae4b0811cfd62500664), Eric Sandall, 01/26/2009

Archive powered by MHonArc 2.6.24.

Top of Page