commit 2132f25ab2781ba729b72981820ef3d20d2f8860 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Jan 7 19:18:02 2017 +1100 wine: fix compile for flex-2.6.3 diff --git a/wine/.md5sum b/wine/.md5sum index 931730a..237ea3a 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -2,3 +2,4 @@ b0760cf51527b70435c3e4d0361a129a wine-mono-4.6.4.msi 5ebc4ec71c92b3db3d84b334a1db385d wine_gecko-2.47-x86.msi d93ac0d2e6aceafe9113a9918916df45 wine_gecko-2.47-x86_64.msi +c14769c348a31678f30965f38e5e5a95 winhlp32-macro-flex-2.6.3-flex.patch diff --git a/wine/Pkgfile b/wine/Pkgfile index 604a7ae..0aea236 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -6,17 +6,22 @@ name=wine version=2.0-rc3 -release=1 +release=2 source=(http://dl.winehq.org/wine/source/2.0/$name-$version.tar.bz2 http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi - http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi) + http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi + winhlp32-macro-flex-2.6.3-flex.patch) build() { install -d wine32 wine64 export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + # undefined reference yywrap in winhlp32/macro.lex.yy.c + # when building with flex-2.6.3 + patch -d $name-$version -p1 -i $SRC/winhlp32-macro-flex-2.6.3-flex.patch + cd wine64 ../$name-$version/configure \ diff --git a/wine/winhlp32-macro-flex-2.6.3-flex.patch b/wine/winhlp32-macro-flex-2.6.3-flex.patch new file mode 100644 index 0000000..4d41ed2 --- /dev/null +++ b/wine/winhlp32-macro-flex-2.6.3-flex.patch @@ -0,0 +1,25 @@ +https://bugs.winehq.org/show_bug.cgi?id=42132 +Bug 42132 - undefined reference yywrap in winhlp32/macro.lex.yy.c when building with flex-2.6.3 + +$ git diff +diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l +index 8f6945ca98..ff8a4832d3 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 noyywrap never-interactive 8bit + %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