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

Jens Reyer jreyer-guest at moszumanska.debian.org
Fri Mar 18 17:15:50 UTC 2016


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

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

commit 67dedbb3a32d5e2bc8790a3bdb7dcd3a47718fe1
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Fri Mar 18 18:10:11 2016 +0100

    Revert "Add freetype.patch to fix font search path."
    
    Fixed upstream in 1.9.6.
---
 debian/changelog              |  1 -
 debian/patches/freetype.patch | 19 -------------------
 debian/patches/series         |  1 -
 3 files changed, 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2341afa..e9a7a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ wine-development (1.9.5-4) UNRELEASED; urgency=medium
   * Add winepath symlink and manpage in wine.
   * Break older wine32|64 which don't have a reverse version requirement.
   * Fix wmc and wrc symlinks.
-  * Add freetype.patch to fix font search path.
 
  -- Jens Reyer <jre.winesim at gmail.com>  Tue, 15 Mar 2016 16:51:04 +0100
 
diff --git a/debian/patches/freetype.patch b/debian/patches/freetype.patch
deleted file mode 100644
index c4a0070..0000000
--- a/debian/patches/freetype.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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 8ff934f..723ca85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,4 +20,3 @@ 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



More information about the pkg-wine-party mailing list