diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 0001-winhlp32-Workaround-a-bug-in-Flex.patch | 32 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 6 insertions, 44 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Oct 10 18:32:25 UTC 2017 +# Tue Oct 10 18:59:52 UTC 2017 pkgbase = wine-git pkgdesc = A compatibility layer for running Windows programs (git version) pkgver = 2.1.r285.gd00f7315e0 - pkgrel = 2 + pkgrel = 3 url = https://www.winehq.org arch = i686 arch = x86_64 @@ -131,10 +131,8 @@ 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 sha256sums = SKIP sha256sums = 9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7 - sha256sums = 140f489aeea9ff9bd605eb5b6f763fabeea51897ffa1138a6e5b01c4784b646c 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 deleted file mode 100644 index 89119a7b26ff..000000000000 --- a/0001-winhlp32-Workaround-a-bug-in-Flex.patch +++ /dev/null @@ -1,32 +0,0 @@ -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,7 +4,7 @@ pkgname=wine-git pkgver=2.1.r285.gd00f7315e0 -pkgrel=2 +pkgrel=3 pkgdesc='A compatibility layer for running Windows programs (git version)' arch=('i686' 'x86_64') url='https://www.winehq.org' @@ -73,11 +73,9 @@ optdepends=( ) options=('staticlibs') source=("$pkgname"::'git://source.winehq.org/git/wine.git' - '30-win32-aliases.conf' - '0001-winhlp32-Workaround-a-bug-in-Flex.patch') + '30-win32-aliases.conf') sha256sums=('SKIP' - '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7' - '140f489aeea9ff9bd605eb5b6f763fabeea51897ffa1138a6e5b01c4784b646c') + '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7') if [ "$CARCH" = 'i686' ] then @@ -94,12 +92,10 @@ else fi prepare() { - # https://bugs.winehq.org/show_bug.cgi?id=42132 cd "$pkgname" - patch -p1 -i "${srcdir}/0001-winhlp32-Workaround-a-bug-in-Flex.patch" # fix path of opencl headers - sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i "$pkgname"/configure* + sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* } pkgver() { |