| 1 |
commit: cc9f166fe9cd2176ad5bbd41300390e5d8f8a575 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 2 11:36:22 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 2 11:36:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc9f166f |
| 7 |
|
| 8 |
app-emulation/wine: Fixed compilation with =sys-devel/flex-2.6.3 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../wine/files/wine-2.0_rc3-flex263.patch | 43 ++++++++++++++++++++++ |
| 13 |
app-emulation/wine/wine-1.9.23.ebuild | 5 ++- |
| 14 |
app-emulation/wine/wine-9999.ebuild | 5 ++- |
| 15 |
3 files changed, 51 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/wine/files/wine-2.0_rc3-flex263.patch b/app-emulation/wine/files/wine-2.0_rc3-flex263.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..6218bc4 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-emulation/wine/files/wine-2.0_rc3-flex263.patch |
| 22 |
@@ -0,0 +1,43 @@ |
| 23 |
+From 7573939745b6cf62caa04cbcfcfa6982ba036542 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: nvinson234 <nvinson234@×××××.com> |
| 25 |
+Date: Sun, 1 Jan 2017 20:24:49 +0100 |
| 26 |
+Subject: [PATCH] undefined reference yywrap in winhlp32/macro.lex.yy.c |
| 27 |
+ (flex-2.6.3) |
| 28 |
+ |
| 29 |
+flex-2.6.3 uses C preprocessor macros to change the prefix of its functions |
| 30 |
+from the standard yy to a user-defined one. This is a change in Flex behavior |
| 31 |
+and causes wine to fail with any version of Flex newer than 2.6.1. |
| 32 |
+ |
| 33 |
+The failure is caused because programs/winhlp32/macros.lex.l only defines the |
| 34 |
+yywrap macro if it is not already defined. The end result is C code that is |
| 35 |
+looking for an undefined yywrap() function. |
| 36 |
+ |
| 37 |
+I have attached a patch that fixes this issue by removing the yywrap macro check and definition from macros.lex.l and adding the noyywrap flex option. |
| 38 |
+--- |
| 39 |
+ programs/winhlp32/macro.lex.l | 6 +----- |
| 40 |
+ 1 file changed, 1 insertion(+), 5 deletions(-) |
| 41 |
+ |
| 42 |
+diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l |
| 43 |
+index 8f6945ca98..ff8a4832d3 100644 |
| 44 |
+--- a/programs/winhlp32/macro.lex.l |
| 45 |
++++ b/programs/winhlp32/macro.lex.l |
| 46 |
+@@ -20,7 +20,7 @@ |
| 47 |
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA |
| 48 |
+ */ |
| 49 |
+ %} |
| 50 |
+-%option noinput nounput never-interactive 8bit |
| 51 |
++%option noinput nounput noyywrap never-interactive 8bit |
| 52 |
+ %x quote |
| 53 |
+ %{ |
| 54 |
+ #include "config.h" |
| 55 |
+@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void) |
| 56 |
+ { |
| 57 |
+ return lex_data ? lex_data->window : Globals.active_win; |
| 58 |
+ } |
| 59 |
+- |
| 60 |
+-#ifndef yywrap |
| 61 |
+-int yywrap(void) { return 1; } |
| 62 |
+-#endif |
| 63 |
+-- |
| 64 |
+2.11.0 |
| 65 |
+ |
| 66 |
|
| 67 |
diff --git a/app-emulation/wine/wine-1.9.23.ebuild b/app-emulation/wine/wine-1.9.23.ebuild |
| 68 |
index 5eba6e1..b6f6e76 100644 |
| 69 |
--- a/app-emulation/wine/wine-1.9.23.ebuild |
| 70 |
+++ b/app-emulation/wine/wine-1.9.23.ebuild |
| 71 |
@@ -1,4 +1,4 @@ |
| 72 |
-# Copyright 1999-2016 Gentoo Foundation |
| 73 |
+# Copyright 1999-2017 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
# $Id$ |
| 76 |
|
| 77 |
@@ -338,6 +338,9 @@ src_prepare() { |
| 78 |
"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615 |
| 79 |
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386 |
| 80 |
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 |
| 81 |
+ |
| 82 |
+ # https://bugs.winehq.org/show_bug.cgi?id=42132 |
| 83 |
+ "${FILESDIR}"/${PN}-2.0_rc3-flex263.patch |
| 84 |
) |
| 85 |
if use staging; then |
| 86 |
ewarn "Applying the Wine-Staging patchset. Any bug reports to the" |
| 87 |
|
| 88 |
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild |
| 89 |
index 5eba6e1..b6f6e76 100644 |
| 90 |
--- a/app-emulation/wine/wine-9999.ebuild |
| 91 |
+++ b/app-emulation/wine/wine-9999.ebuild |
| 92 |
@@ -1,4 +1,4 @@ |
| 93 |
-# Copyright 1999-2016 Gentoo Foundation |
| 94 |
+# Copyright 1999-2017 Gentoo Foundation |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
# $Id$ |
| 97 |
|
| 98 |
@@ -338,6 +338,9 @@ src_prepare() { |
| 99 |
"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615 |
| 100 |
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386 |
| 101 |
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 |
| 102 |
+ |
| 103 |
+ # https://bugs.winehq.org/show_bug.cgi?id=42132 |
| 104 |
+ "${FILESDIR}"/${PN}-2.0_rc3-flex263.patch |
| 105 |
) |
| 106 |
if use staging; then |
| 107 |
ewarn "Applying the Wine-Staging patchset. Any bug reports to the" |
Archives