Update to 2.0.2

3 files changed, 12 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a6040e8866b..353a387c3596 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Apr 21 17:42:55 UTC 2017
+# Thu Jul 20 23:49:27 UTC 2017
 pkgbase = wine-stable
 	pkgdesc = A compatibility layer for running Windows programs
-	pkgver = 2.0.1
+	pkgver = 2.0.2
 	pkgrel = 1
 	url = http://www.winehq.com
 	arch = i686
@@ -61,17 +61,15 @@ pkgbase = wine-stable
 	optdepends = openal
 	optdepends = samba
 	optdepends = v4l-utils
-	provides = wine=2.0.1
+	provides = wine=2.0.2
 	conflicts = wine
 	options = staticlibs
-	source = https://dl.winehq.org/wine/source/2.0/wine-2.0.1.tar.xz
-	source = https://dl.winehq.org/wine/source/2.0/wine-2.0.1.tar.xz.sign
+	source = https://dl.winehq.org/wine/source/2.0/wine-2.0.2.tar.xz
+	source = https://dl.winehq.org/wine/source/2.0/wine-2.0.2.tar.xz.sign
 	source = 30-win32-aliases.conf
-	source = 0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch
-	sha512sums = b32d07443655898768383b7409c21093b60c028fef166a596dad5dfab5a329b9fce4552e612c6d182e4f67eb1f28ed497fe2ed6af55d0000d3e96a124547722d
+	sha512sums = 3f37080a951819304cd3475f6012f1d6b5a94879b137cdf816cac4c8fde68ddc777905e92277ec5dce96437d8c32c43d55d3750b582781a9f9774b118f1a5b90
 	sha512sums = SKIP
 	sha512sums = 6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb
-	sha512sums = 21b964e4ee7d99b8773d27238691759456fe82f49a98095d3307e66674df94da271e055d184a50040e72ceffdee6f8f5461d74f203c831fffa604c2d0c15bcfc
 	depends_x86_64 = lib32-fontconfig
 	depends_x86_64 = lib32-freetype2
 	depends_x86_64 = lib32-gcc-libs
diff --git a/0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch b/0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch
deleted file mode 100644
index 1287db950eb2..000000000000
--- a/0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2472b819eabc76376d5552bd72b4f1f3cfa589da Mon Sep 17 00:00:00 2001
-From: Mike Swanson <mikeonthecomputer@gmail.com>
-Date: Sun, 22 Jan 2017 10:49:44 -0800
-Subject: [PATCH] programs/winhlp32: Use noyywrap for macro.lex.l and prefix
-
-flex 2.6.3 broke the previous version, but this is a well-supported
-way of achieving the same goal, used elsewhere in the Wine source too.
-
-To avoid warnings in compilation, also set prefix="winhlp32_" --
-this is consistent with how other lex files work too.
-
-Signed-off-by: Mike Swanson <mikeonthecomputer@gmail.com>
----
- programs/winhlp32/macro.lex.l | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
-index 8f6945ca98..2e03660278 100644
---- a/programs/winhlp32/macro.lex.l
-+++ b/programs/winhlp32/macro.lex.l
-@@ -20,7 +20,8 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- %}
--%option noinput nounput never-interactive 8bit
-+%option noinput nounput noyywrap never-interactive 8bit
-+%option prefix="winhlp32_"
- %x quote
- %{
- #include "config.h"
-@@ -367,7 +368,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void)
- {
-     return lex_data ? lex_data->window : Globals.active_win;
- }
--
--#ifndef yywrap
--int yywrap(void) { return 1; }
--#endif
--- 
-2.11.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 77217d76acef..fe43e6745549 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,18 @@
 # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
 
-# Warning: If you are downgrading from the development branch (Wine 2.1.x,
+# Warning: If you are downgrading from the development branch (Wine >= 2.1,
 # for example), your WINEPREFIX may break and experience unusual bugs.
 # Try to make a clean WINEPREFIX, such as by doing “rm -rf ~/.wine”
 
 pkgname=wine-stable
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 
 source=(https://dl.winehq.org/wine/source/2.0/wine-$pkgver.tar.xz{,.sign}
-        30-win32-aliases.conf
-        0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch)
-sha512sums=('b32d07443655898768383b7409c21093b60c028fef166a596dad5dfab5a329b9fce4552e612c6d182e4f67eb1f28ed497fe2ed6af55d0000d3e96a124547722d'
+        30-win32-aliases.conf)
+sha512sums=('3f37080a951819304cd3475f6012f1d6b5a94879b137cdf816cac4c8fde68ddc777905e92277ec5dce96437d8c32c43d55d3750b582781a9f9774b118f1a5b90'
             'SKIP'
-            '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
-            '21b964e4ee7d99b8773d27238691759456fe82f49a98095d3307e66674df94da271e055d184a50040e72ceffdee6f8f5461d74f203c831fffa604c2d0c15bcfc')
+            '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb')
 validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
               DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
 
@@ -25,7 +23,7 @@ options=(staticlibs)
 license=(LGPL)
 
 depends=(desktop-file-utils fontconfig freetype2 gettext glu lcms2
-    libpcap libsm libxcursor libxdamage libxi libxml2 libxrandr)
+  libpcap libsm libxcursor libxdamage libxi libxml2 libxrandr)
 
 depends_x86_64=(lib32-fontconfig lib32-freetype2 lib32-gcc-libs
   lib32-gettext lib32-glu lib32-lcms2 lib32-libpcap lib32-libsm