[arch-commits] Commit in wine/trunk (2 files)

[Felix Yan]

    Date: Monday, January 16, 2017 @ 09:25:12
  Author: felixonmars
Revision: 207589

upgpkg: wine 2.0rc5-1

Added:
  wine/trunk/0001-winhlp32-Workaround-a-bug-in-Flex.patch
Modified:
  wine/trunk/PKGBUILD

----------------------------------------------+
 0001-winhlp32-Workaround-a-bug-in-Flex.patch |   33 +++++++++++++++++++++++++
 PKGBUILD                                     |   13 ++++++---
 2 files changed, 42 insertions(+), 4 deletions(-)

Added: 0001-winhlp32-Workaround-a-bug-in-Flex.patch
===================================================================
--- 0001-winhlp32-Workaround-a-bug-in-Flex.patch	                        (rev 0)
+++ 0001-winhlp32-Workaround-a-bug-in-Flex.patch	2017-01-16 09:25:12 UTC (rev 207589)
@@ -0,0 +1,33 @@
+From cf6bdd7b7dc1dc1ba31bd48171c218ba3503eb76 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian at fds-team.de>
+Date: Sat, 14 Jan 2017 05:48:28 +0100
+Subject: winhlp32: Workaround a bug in Flex.
+
+---
+ programs/winhlp32/macro.lex.l | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
+index 8f6945ca988..da2dd22e447 100644
+--- a/programs/winhlp32/macro.lex.l
++++ b/programs/winhlp32/macro.lex.l
+@@ -20,7 +20,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ %}
+-%option noinput nounput never-interactive 8bit
++%option noinput nounput never-interactive 8bit noyywrap
+ %x quote
+ %{
+ #include "config.h"
+@@ -367,7 +367,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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-16 09:18:41 UTC (rev 207588)
+++ PKGBUILD	2017-01-16 09:25:12 UTC (rev 207589)
@@ -5,16 +5,18 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=wine
-pkgver=2.0rc4
+pkgver=2.0rc5
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(https://dl.winehq.org/wine/source/2.0/$pkgname-$_pkgbasever.tar.bz2{,.sign}
-        30-win32-aliases.conf)
-sha1sums=('8950490863853fe988e7338b24842f9fb35ef249'
+        30-win32-aliases.conf
+        0001-winhlp32-Workaround-a-bug-in-Flex.patch)
+sha1sums=('6574e347da690a91bc4da67619a960cde6a1d2b3'
           'SKIP'
-          '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
+          '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
+          '6ab256347d41e63694528db9e093c0abe8ca4bc1')
 validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
               DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
 
@@ -105,6 +107,9 @@
   # Allow ccache to work
   mv $pkgname-$_pkgbasever $pkgname
 
+  # https://bugs.winehq.org/show_bug.cgi?id=42132
+  (cd $pkgname; patch -p1 -i ../0001-winhlp32-Workaround-a-bug-in-Flex.patch)
+
   sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
 
   # Get rid of old build dirs