[pkg-wine-party] [wine] 01/02: Add freetype.patch to fix font search path.

[Jens Reyer]

This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch master
in repository wine.

commit b4e5b140010b0825a1b7f658e9bc2be56caba60a
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Tue Mar 15 19:58:49 2016 +0100

    Add freetype.patch to fix font search path.
    
    Closes in wine stable: #814844
    
    For fontdir=/usr/share/wine/fonts and
    datadir=/usr/share/wine-development.
    Upstream uses fontdir=${datadir}/wine/fonts.
---
 debian/patches/freetype.patch | 19 +++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/freetype.patch b/debian/patches/freetype.patch
new file mode 100644
index 0000000..c4a0070
--- /dev/null
+++ b/debian/patches/freetype.patch
@@ -0,0 +1,19 @@
+Description: Fix font search path for fontdir /usr/share/wine/fonts.
+Author: Jens Reyer <jre.winesim at gmail.com>
+Bug: https://bugs.winehq.org/show_bug.cgi?id=40312
+Bug-Debian: https://bugs.debian.org/814844
+
+--- a/dlls/gdi32/freetype.c
++++ b/dlls/gdi32/freetype.c
+@@ -2980,9 +2980,9 @@ static char *get_data_dir_path( LPCWSTR
+     {
+         INT len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL);
+ 
+-        unix_name = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + len + sizeof("/fonts/"));
++        unix_name = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + len + sizeof("/../../wine/fonts/"));
+         strcpy(unix_name, data_dir);
+-        strcat(unix_name, "/fonts/");
++        strcat(unix_name, "/../../wine/fonts/");
+ 
+         WideCharToMultiByte(CP_UNIXCP, 0, file, -1, unix_name + strlen(unix_name), len, NULL, NULL);
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 723ca85..8ff934f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ addons.patch
 
 font-divbyzero.patch
 printer-resolution.patch
+freetype.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git