[arch-commits] Commit in wine-staging/trunk (PKGBUILD gdi32-heap-corruption.patch)

[Felix Yan]

    Date: Monday, November 2, 2015 @ 05:11:47
  Author: fyan
Revision: 145532

upgpkg: wine-staging 1.7.54-1

Modified:
  wine-staging/trunk/PKGBUILD
Deleted:
  wine-staging/trunk/gdi32-heap-corruption.patch

-----------------------------+
 PKGBUILD                    |   16 ++++++----------
 gdi32-heap-corruption.patch |   28 ----------------------------
 2 files changed, 6 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-02 04:09:16 UTC (rev 145531)
+++ PKGBUILD	2015-11-02 04:11:47 UTC (rev 145532)
@@ -6,16 +6,15 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=wine-staging
-pkgver=1.7.53
-pkgrel=2
+pkgver=1.7.54
+pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=("https://github.com/wine-compholio/wine-patched/archive/staging-$pkgver.tar.gz"
-        30-win32-aliases.conf gdi32-heap-corruption.patch)
-sha1sums=('07889b58bda0755f53310a19bb6a8e62c704658f'
-          '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
-          'f02a126e46db4283440caf04d618af39747bd284')
+        30-win32-aliases.conf)
+sha1sums=('e59eb52e5fdbb7561b482880b0f75638f2516090'
+          '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
 
 pkgdesc="A compatibility layer for running Windows programs - Staging branch"
 url="http://www.wine-staging.com"
@@ -42,7 +41,7 @@
   desktop-file-utils
 )
 
-makedepends=(autoconf ncurses bison perl fontforge flex prelink
+makedepends=(autoconf ncurses bison perl fontforge flex
   'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
   giflib          lib32-giflib
   libpng          lib32-libpng
@@ -108,9 +107,6 @@
 prepare() {
   cd wine-patched-staging-$pkgver
 
-  # 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-11-02 04:09:16 UTC (rev 145531)
+++ gdi32-heap-corruption.patch	2015-11-02 04:11:47 UTC (rev 145532)
@@ -1,28 +0,0 @@
-From d774442e8d65dc8ef1ad3d9a677fd0da623ff174 Mon Sep 17 00:00:00 2001
-From: Dmitry Timoshkov <dmitry at baikal.ru>
-Date: Tue, 20 Oct 2015 12:25:54 +0800
-Subject: [PATCH] gdi32: Fix heap corruption.
-
-Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
-Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
-Signed-off-by: Alexandre Julliard <julliard at 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
-