wine add patch

2017-01-30 12:14:48 +01:00
parent 1990ec3647
commit efcaef6773
2 changed files with 42 additions and 0 deletions
@@ -0,0 +1,41 @@
+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
+
@@ -67,6 +67,7 @@
            <!--  patches -->
            <Patch level="1">wine-1.9.3-gcc-5_3_0-disable-force-alignment.patch</Patch>
            <Patch level="1">gcc_erorr.patch</Patch>
+            <Patch level="1">0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch</Patch>
            <!-- Use XDG_DOCUMENTS_DIR for "My Documents" -->
        </Patches>