diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-winhlp32-Workaround-a-bug-in-Flex.patch | 32 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
3 files changed, 48 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = wine-git pkgdesc = A compatibility layer for running Windows programs. GIT version. - pkgver = 1.9.24.r105.g1d3b944 - pkgrel = 4 + pkgver = 2.1.r285.gd00f7315e0 + pkgrel = 1 url = http://www.winehq.com arch = i686 arch = x86_64 @@ -119,9 +119,9 @@ pkgbase = wine-git optdepends = cups optdepends = samba optdepends = dosbox - provides = bin32-wine=1.9.24.r105.g1d3b944 - provides = wine=1.9.24.r105.g1d3b944 - provides = wine-wow64=1.9.24.r105.g1d3b944 + provides = bin32-wine=2.1.r285.gd00f7315e0 + provides = wine=2.1.r285.gd00f7315e0 + provides = wine-wow64=2.1.r285.gd00f7315e0 conflicts = bin32-wine conflicts = wine conflicts = wine-wow64 @@ -129,8 +129,10 @@ pkgbase = wine-git options = staticlibs source = wine-git::git://source.winehq.org/git/wine.git source = 30-win32-aliases.conf + source = 0001-winhlp32-Workaround-a-bug-in-Flex.patch md5sums = SKIP md5sums = 1ff4e467f59409272088d92173a0f801 + md5sums = 224fde0d5ed5160548db1d70bf9abb20 pkgname = wine-git depends = fontconfig diff --git a/0001-winhlp32-Workaround-a-bug-in-Flex.patch b/0001-winhlp32-Workaround-a-bug-in-Flex.patch new file mode 100644 index 000000000000..89119a7b26ff --- /dev/null +++ b/0001-winhlp32-Workaround-a-bug-in-Flex.patch @@ -0,0 +1,32 @@ +From cf6bdd7b7dc1dc1ba31bd48171c218ba3503eb76 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner <sebastian@fds-team.de> +Date: Sat, 14 Jan 2017 05:48:28 +0100 +Subject: winhlp32: Workaround a bug in Flex. + +--- + programs/winhlp32/macro.lex.l | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l +index 8f6945ca988..da2dd22e447 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 never-interactive 8bit noyywrap + %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 +-- +2.11.0 @@ -4,17 +4,19 @@ pkgname=wine-git _gitname="wine" -pkgver=1.9.24.r105.g1d3b944 -pkgrel=4 +pkgver=2.1.r285.gd00f7315e0 +pkgrel=1 pkgdesc="A compatibility layer for running Windows programs. GIT version." url="http://www.winehq.com" arch=('i686' 'x86_64') options=(staticlibs) license=(LGPL) source=('wine-git::git://source.winehq.org/git/wine.git' - '30-win32-aliases.conf') + '30-win32-aliases.conf' + '0001-winhlp32-Workaround-a-bug-in-Flex.patch') md5sums=('SKIP' - '1ff4e467f59409272088d92173a0f801') + '1ff4e467f59409272088d92173a0f801' + '224fde0d5ed5160548db1d70bf9abb20') _depends=( fontconfig lib32-fontconfig @@ -105,6 +107,9 @@ pkgver() { prepare() { # Allow ccache to work cd "$srcdir" + + # https://bugs.winehq.org/show_bug.cgi?id=42132 + (cd $pkgname; patch -p1 -i ../0001-winhlp32-Workaround-a-bug-in-Flex.patch) sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure* |