diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-01-04 11:52:24 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-01-04 11:52:24 +0000 |
| commit | 50c29c559bebd4e304ca4aad92c324a58853460e (patch) | |
| tree | a777ebf204600b1f4142f2ff9c96b6ebd022df6f /emulators | |
| parent | 57c7f8bebaa2807932738fb5ce527f9ffa1a7794 (diff) | |
| download | pkgsrc-50c29c559bebd4e304ca4aad92c324a58853460e.tar.gz | |
Ensure the local yywrap is used. Fixes build with newer flex.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine/distinfo | 4 | ||||
| -rw-r--r-- | emulators/wine/patches/patch-programs_winhlp32_macro.lex.l | 14 | ||||
| -rw-r--r-- | emulators/wine/patches/patch-tools_wrc_parser.l | 14 |
3 files changed, 31 insertions, 1 deletions
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index bf348c39a67..dcf813cfb47 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.91 2016/06/09 15:26:35 fhajny Exp $ +$NetBSD: distinfo,v 1.92 2017/01/04 11:52:24 jperkin Exp $ SHA1 (wine-1.6.2.tar.bz2) = 574b9ccedbf213622b7ee55f715764673fc27692 RMD160 (wine-1.6.2.tar.bz2) = 7252851af5e9f748750685900c918e4fcb31c1f6 @@ -8,3 +8,5 @@ SHA1 (patch-configure) = dae045a6c4d3e8a8424567ea058e48e6fa08ed26 SHA1 (patch-dlls_ntdll_signal__i386.c) = 23028c77cda2611e5fe9c3f78dde55259d0bd6d6 SHA1 (patch-dlls_wbemprox_builtin.c) = a120531c3ac1e5eddc3c82424d96c0afae69cc7a SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 9ea9ad05a32b3f684f22986b227534d87c7dafe7 +SHA1 (patch-programs_winhlp32_macro.lex.l) = 6d37626d44a38559d268b568583f314d2bd31203 +SHA1 (patch-tools_wrc_parser.l) = 6a061055b9f3b2c892f614154c8c15053ac7d9e6 diff --git a/emulators/wine/patches/patch-programs_winhlp32_macro.lex.l b/emulators/wine/patches/patch-programs_winhlp32_macro.lex.l new file mode 100644 index 00000000000..3861d581009 --- /dev/null +++ b/emulators/wine/patches/patch-programs_winhlp32_macro.lex.l @@ -0,0 +1,14 @@ +$NetBSD: patch-programs_winhlp32_macro.lex.l,v 1.1 2017/01/04 11:52:24 jperkin Exp $ + +Ensure the local yywrap is used. + +--- programs/winhlp32/macro.lex.l.orig 2014-01-10 20:37:29.000000000 +0000 ++++ programs/winhlp32/macro.lex.l +@@ -35,6 +35,7 @@ + #include "winhelp.h" + + #include "wine/debug.h" ++#undef yywrap + + WINE_DEFAULT_DEBUG_CHANNEL(winhelp); + diff --git a/emulators/wine/patches/patch-tools_wrc_parser.l b/emulators/wine/patches/patch-tools_wrc_parser.l new file mode 100644 index 00000000000..07a55befafe --- /dev/null +++ b/emulators/wine/patches/patch-tools_wrc_parser.l @@ -0,0 +1,14 @@ +$NetBSD: patch-tools_wrc_parser.l,v 1.1 2017/01/04 11:52:24 jperkin Exp $ + +Ensure the local yywrap is used. + +--- tools/wrc/parser.l.orig 2014-01-10 20:37:29.000000000 +0000 ++++ tools/wrc/parser.l +@@ -119,6 +119,7 @@ cident [a-zA-Z_][0-9a-zA-Z_]* + #include "newstruc.h" + + #include "parser.tab.h" ++#undef yywrap + + /* Always update the current character position within a line */ + #define YY_USER_ACTION char_number+=yyleng; wanted_id = want_id; want_id = 0; |