Date: Monday, June 12, 2017 @ 04:51:43 Author: felixonmars Revision: 236252
remove flex workaround (FS#54301) Modified: wine/trunk/PKGBUILD Deleted: wine/trunk/0001-winhlp32-Workaround-a-bug-in-Flex.patch ----------------------------------------------+ 0001-winhlp32-Workaround-a-bug-in-Flex.patch | 33 ------------------------- PKGBUILD | 9 +----- 2 files changed, 2 insertions(+), 40 deletions(-) Deleted: 0001-winhlp32-Workaround-a-bug-in-Flex.patch =================================================================== --- 0001-winhlp32-Workaround-a-bug-in-Flex.patch 2017-06-12 04:50:59 UTC (rev 236251) +++ 0001-winhlp32-Workaround-a-bug-in-Flex.patch 2017-06-12 04:51:43 UTC (rev 236252) @@ -1,33 +0,0 @@ -From cf6bdd7b7dc1dc1ba31bd48171c218ba3503eb76 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner <[email protected]> -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-06-12 04:50:59 UTC (rev 236251) +++ PKGBUILD 2017-06-12 04:51:43 UTC (rev 236252) @@ -11,12 +11,10 @@ _pkgbasever=${pkgver/rc/-rc} source=(https://dl.winehq.org/wine/source/2.x/$pkgname-$_pkgbasever.tar.xz{,.sign} - 30-win32-aliases.conf - 0001-winhlp32-Workaround-a-bug-in-Flex.patch) + 30-win32-aliases.conf) sha512sums=('8807e16a571bf45d99097ad5fdfb9fe755f6dbe84010a330fed82f1d48c76b7f19589bfc0e5dde0b9e49a608fd0501db3f7e3e129e4d9d34bcae03bc51a73139' 'SKIP' - '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb' - 'a6c099fced12271f6ba14f3f93b322f50bc2ecf5cb0b8b7ed0cc1884269569fdd084fe8531dff8db71484f80e62cbd5b69a1a2d04100e9d7485de5b53b9a4bb5') + '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb') validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7 DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D) @@ -107,9 +105,6 @@ # 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
