commit 91314f8a2a4ad033e3c2a659a1aabff771c5c042 Author: Danny Rawlins <monster.romster@gmail.com> Date: Wed Jan 25 12:27:39 2017 +1100 wine: 2.0-rc4 -> 2.0-rc6 diff --git a/wine/.md5sum b/wine/.md5sum index 281f113..299a925 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1,5 +1,4 @@ -e8569b4cf0fa21afb5304cff71296c0e wine-2.0-rc4.tar.bz2 +80dc66cb5769537e71aeb24310e14c36 wine-2.0-rc6.tar.bz2 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 d02e673..18b198e 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,23 +5,18 @@ # Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 xorg-libxxf86vm-32 name=wine -version=2.0-rc4 +version=2.0-rc6 release=1 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 - winhlp32-macro-flex-2.6.3-flex.patch) + http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi) 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 deleted file mode 100644 index 4d41ed2..0000000 --- a/wine/winhlp32-macro-flex-2.6.3-flex.patch +++ /dev/null @@ -1,25 +0,0 @@ -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