From ac8b5ffef1ce93b13ac6fb2ba37c8ce7ec42afcb Mon Sep 17 00:00:00 2001 From: André Hentschel Date: Sun, 20 Dec 2015 03:24:12 +0100 Subject: wine: Bump to version 1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping to brand new stable version 1.8 Upstreamed patches are dropped, sane patch is rebased. Adding libpcap, pulseaudio and samba4 as soft dependencies. sfnt2fon moved to its own subfolder and needs to be built in host-wine. Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- ...revent-call-to-memset-with-a-null-pointer.patch | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 package/wine/0001-Prevent-call-to-memset-with-a-null-pointer.patch (limited to 'package/wine/0001-Prevent-call-to-memset-with-a-null-pointer.patch') diff --git a/package/wine/0001-Prevent-call-to-memset-with-a-null-pointer.patch b/package/wine/0001-Prevent-call-to-memset-with-a-null-pointer.patch deleted file mode 100644 index f6d5a9d3c2..0000000000 --- a/package/wine/0001-Prevent-call-to-memset-with-a-null-pointer.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit deb274226783ab886bdb44876944e156757efe2b -Author: Daniel Beitler -Date: Sun May 18 13:27:42 2014 -0400 - - msi: Prevent call to memset with a null pointer - in get_tablecolumns function. - -Fix miscompilation with gcc >= 4.9 -See https://bugs.winehq.org/show_bug.cgi?id=36139 for the upstream -bug report. There won't be a Wine 1.6.3 so we need to address this -anyway. - -Backported from: deb274226783ab886bdb44876944e156757efe2b -Signed-off-by: André Hentschel ---- - dlls/msi/table.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dlls/msi/table.c b/dlls/msi/table.c -index 8012369..9ed9421 100644 ---- a/dlls/msi/table.c -+++ b/dlls/msi/table.c -@@ -671,7 +671,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF - /* Note: _Columns table doesn't have non-persistent data */ - - /* if maxcount is non-zero, assume it's exactly right for this table */ -- memset( colinfo, 0, maxcount * sizeof(*colinfo) ); -+ if (colinfo) memset( colinfo, 0, maxcount * sizeof(*colinfo) ); - count = table->row_count; - for (i = 0; i < count; i++) - { -@@ -684,7 +684,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF - /* check the column number is in range */ - if (col < 1 || col > maxcount) - { -- ERR("column %d out of range\n", col); -+ ERR("column %d out of range (maxcount: %d)\n", col, maxcount); - continue; - } - /* check if this column was already set */ -- cgit v1.2.3