Date: Saturday, October 31, 2015 @ 06:15:20 Author: fyan Revision: 145340
upgpkg: wine 1.7.54-1 Modified: wine/trunk/PKGBUILD Deleted: wine/trunk/gdi32-heap-corruption.patch -----------------------------+ PKGBUILD | 14 +++++--------- gdi32-heap-corruption.patch | 28 ---------------------------- 2 files changed, 5 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-30 23:49:41 UTC (rev 145339) +++ PKGBUILD 2015-10-31 05:15:20 UTC (rev 145340) @@ -5,17 +5,16 @@ # Contributor: Giovanni Scafora <giova...@archlinux.org> pkgname=wine -pkgver=1.7.53 -pkgrel=2 +pkgver=1.7.54 +pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://mirrors.ibiblio.org/wine/source/1.7/$pkgname-$_pkgbasever.tar.bz2{,.sign} - 30-win32-aliases.conf gdi32-heap-corruption.patch) -sha1sums=('d13fa9152e23f0ab2a31bef70c5d381e795013a2' + 30-win32-aliases.conf) +sha1sums=('22cff4bab88658f7d7157403f51d8820b378699e' 'SKIP' - '023a5c901c6a091c56e76b6a62d141d87cce9fdb' - 'f02a126e46db4283440caf04d618af39747bd284') + '023a5c901c6a091c56e76b6a62d141d87cce9fdb') validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7) pkgdesc="A compatibility layer for running Windows programs" @@ -102,9 +101,6 @@ prepare() { cd $pkgname-$_pkgbasever - # FS#46819 - patch -p1 -i ../gdi32-heap-corruption.patch - sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* } Deleted: gdi32-heap-corruption.patch =================================================================== --- gdi32-heap-corruption.patch 2015-10-30 23:49:41 UTC (rev 145339) +++ gdi32-heap-corruption.patch 2015-10-31 05:15:20 UTC (rev 145340) @@ -1,28 +0,0 @@ -From d774442e8d65dc8ef1ad3d9a677fd0da623ff174 Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov <dmi...@baikal.ru> -Date: Tue, 20 Oct 2015 12:25:54 +0800 -Subject: [PATCH] gdi32: Fix heap corruption. - -Signed-off-by: Dmitry Timoshkov <dmi...@baikal.ru> -Signed-off-by: Nikolay Sivov <nsi...@codeweavers.com> -Signed-off-by: Alexandre Julliard <julli...@winehq.org> ---- - dlls/gdi32/freetype.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c -index 95df22a..9f2a9fb 100644 ---- a/dlls/gdi32/freetype.c -+++ b/dlls/gdi32/freetype.c -@@ -5189,7 +5189,7 @@ static void fill_fileinfo_from_face( GdiFont *font, Face *face ) - strcpyW(font->fileinfo->path, face->file); - } - else -- memset(&font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); -+ memset(font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); - } - - /************************************************************* --- -1.9.1 -