[pkg-wine-party] [wine] 02/03: Refresh patches.

[Jens Reyer]

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

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

commit a901ba9eea17d46539ff59743fc21ef338f911b6
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sat Oct 8 03:24:44 2016 +0200

    Refresh patches.
---
 debian/patches/font-divbyzero.patch |  2 +-
 debian/patches/fontdir.patch        | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/font-divbyzero.patch b/debian/patches/font-divbyzero.patch
index cad3ebf..4ef03d2 100644
--- a/debian/patches/font-divbyzero.patch
+++ b/debian/patches/font-divbyzero.patch
@@ -2,7 +2,7 @@ description: avoid divide-by-zero condition for certain font files and warn abou
 
 --- a/dlls/gdi32/freetype.c
 +++ b/dlls/gdi32/freetype.c
-@@ -5668,6 +5668,13 @@ found_face:
+@@ -5704,6 +5704,13 @@ found_face:
          if (scale > 2 && scaled_height - height > face->size.height / 4) scale--;
          /* The jump between unscaled and doubled is delayed by 1 */
          else if (scale == 2 && scaled_height - height > (face->size.height / 4 - 1)) scale--;
diff --git a/debian/patches/fontdir.patch b/debian/patches/fontdir.patch
index ecc802b..413e1a7 100644
--- a/debian/patches/fontdir.patch
+++ b/debian/patches/fontdir.patch
@@ -14,9 +14,9 @@ Applied-Upstream: 1.9.6
 +freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`$(MAKEDEP) -R ${datadir}/wine ${fontdir}`\"
 --- a/dlls/gdi32/freetype.c
 +++ b/dlls/gdi32/freetype.c
-@@ -213,6 +213,10 @@ MAKE_FUNCPTR(FcPatternGetString);
- #define GET_BE_WORD(x) RtlUshortByteSwap(x)
- #endif
+@@ -231,6 +231,10 @@ MAKE_FUNCPTR(FcPatternGetString);
+ #define GASP_GRIDFIT 0x01
+ #define GASP_DOGRAY  0x02
  
 +#ifndef WINE_FONT_DIR
 +#define WINE_FONT_DIR "fonts"
@@ -25,7 +25,7 @@ Applied-Upstream: 1.9.6
  /* This is basically a copy of FT_Bitmap_Size with an extra element added */
  typedef struct {
      FT_Short height;
-@@ -2960,22 +2964,44 @@ static void load_mac_fonts(void)
+@@ -2978,22 +2982,44 @@ static void load_mac_fonts(void)
  
  #endif
  
@@ -77,7 +77,7 @@ Applied-Upstream: 1.9.6
      }
      return unix_name;
  }
-@@ -4121,7 +4147,6 @@ static void init_font_list(void)
+@@ -4140,7 +4166,6 @@ static void init_font_list(void)
      DWORD valuelen, datalen, i = 0, type, dlen, vlen;
      WCHAR windowsdir[MAX_PATH];
      char *unixname;
@@ -85,7 +85,7 @@ Applied-Upstream: 1.9.6
  
      delete_external_font_keys();
  
-@@ -4137,13 +4162,9 @@ static void init_font_list(void)
+@@ -4156,13 +4181,9 @@ static void init_font_list(void)
          HeapFree(GetProcessHeap(), 0, unixname);
      }
  

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