Rebase against 0a3700e051f3e9473c5daa40a5cdd951b1310b8c.

[gdi32-PtInRegion]
Removed patch to add back the extents test (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-07-10 22:18:46 +02:00
parent 372c0be9d9
commit bd3563bdf1
3 changed files with 3 additions and 48 deletions

View File

@@ -51,13 +51,13 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "abb221fa81b60f53c14f6864bbfb9453455aeeeb"
echo "0a3700e051f3e9473c5daa40a5cdd951b1310b8c"
}
# Show version information
version()
{
echo "Wine Staging 1.9.14"
echo "Wine Staging 1.9.15 (unreleased)"
echo "Copyright (C) 2014-2016 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
@@ -148,7 +148,6 @@ patch_enable_all ()
enable_gdi32_Lazy_Font_Initialization="$1"
enable_gdi32_MultiMonitor="$1"
enable_gdi32_Path_Metafile="$1"
enable_gdi32_PtInRegion="$1"
enable_gdi32_Symbol_Truetype_Font="$1"
enable_gdiplus_GdipCreateMetafileFromStream="$1"
enable_gdiplus_Grayscale_PNG="$1"
@@ -622,9 +621,6 @@ patch_enable ()
gdi32-Path_Metafile)
enable_gdi32_Path_Metafile="$2"
;;
gdi32-PtInRegion)
enable_gdi32_PtInRegion="$2"
;;
gdi32-Symbol_Truetype_Font)
enable_gdi32_Symbol_Truetype_Font="$2"
;;
@@ -3678,18 +3674,6 @@ if test "$enable_gdi32_Path_Metafile" -eq 1; then
) >> "$patchlist"
fi
# Patchset gdi32-PtInRegion
# |
# | Modified files:
# | * dlls/gdi32/region.c
# |
if test "$enable_gdi32_PtInRegion" -eq 1; then
patch_apply gdi32-PtInRegion/0001-gdi32-Add-back-the-extents-test.patch
(
echo '+ { "Huw Davies", "gdi32: Add back the extents test.", 1 },';
) >> "$patchlist"
fi
# Patchset gdi32-Symbol_Truetype_Font
# |
# | This patchset fixes the following Wine bugs: