From 9f3d2b6601e3341c580a89f0dd832bb77a77f179 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 8 May 2018 14:13:37 +1000 Subject: [PATCH] Disabled dwrite-FontFallback patchset The tests pass without the implementaion. --- patches/dwrite-FontFallback/definition | 2 ++ patches/patchinstall.sh | 21 --------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/patches/dwrite-FontFallback/definition b/patches/dwrite-FontFallback/definition index 7d93ede0..239d0d42 100644 --- a/patches/dwrite-FontFallback/definition +++ b/patches/dwrite-FontFallback/definition @@ -1 +1,3 @@ Fixes: [44052] - Support for font fallback. +# The tests pass without the implementaion code. +Disabled: true diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 9cbdc3f9..e1548313 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -144,7 +144,6 @@ patch_enable_all () enable_dsound_EAX="$1" enable_dsound_Fast_Mixer="$1" enable_dsound_Revert_Cleanup="$1" - enable_dwrite_FontFallback="$1" enable_dxdiagn_Display_Information="$1" enable_dxdiagn_Enumerate_DirectSound="$1" enable_dxdiagn_GetChildContainer_Leaf_Nodes="$1" @@ -620,9 +619,6 @@ patch_enable () dsound-Revert_Cleanup) enable_dsound_Revert_Cleanup="$2" ;; - dwrite-FontFallback) - enable_dwrite_FontFallback="$2" - ;; dxdiagn-Display_Information) enable_dxdiagn_Display_Information="$2" ;; @@ -3785,23 +3781,6 @@ if test "$enable_dsound_EAX" -eq 1; then ) >> "$patchlist" fi -# Patchset dwrite-FontFallback -# | -# | This patchset fixes the following Wine bugs: -# | * [#44052] - Support for font fallback. -# | -# | Modified files: -# | * dlls/dwrite/analyzer.c, dlls/dwrite/layout.c, dlls/dwrite/tests/font.c -# | -if test "$enable_dwrite_FontFallback" -eq 1; then - patch_apply dwrite-FontFallback/0001-dwrite-test-font-collection-fallback-logic.patch - patch_apply dwrite-FontFallback/0002-dwrite-Fix-font-fallback.patch - ( - printf '%s\n' '+ { "Lucian Poston", "dwrite: Test font collection fallback logic.", 1 },'; - printf '%s\n' '+ { "Lucian Poston", "dwrite: Fix font fallback.", 1 },'; - ) >> "$patchlist" -fi - # Patchset dxdiagn-Display_Information # | # | This patchset fixes the following Wine bugs: