Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=633489f1a5e4691952adc66e694c45c3ac1c59b6
commit 633489f1a5e4691952adc66e694c45c3ac1c59b6 Author: DeX77 <[email protected]> Date: Wed Jan 25 15:36:44 2017 +0100 wine-devel-2.0-1-x86_64 * version bump diff --git a/source/xapps-extra/wine-devel/0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch b/source/xapps-extra/wine-devel/0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch new file mode 100644 index 0000000..1287db9 --- /dev/null +++ b/source/xapps-extra/wine-devel/0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch @@ -0,0 +1,41 @@ +From 2472b819eabc76376d5552bd72b4f1f3cfa589da Mon Sep 17 00:00:00 2001 +From: Mike Swanson <[email protected]> +Date: Sun, 22 Jan 2017 10:49:44 -0800 +Subject: [PATCH] programs/winhlp32: Use noyywrap for macro.lex.l and prefix + +flex 2.6.3 broke the previous version, but this is a well-supported +way of achieving the same goal, used elsewhere in the Wine source too. + +To avoid warnings in compilation, also set prefix="winhlp32_" -- +this is consistent with how other lex files work too. + +Signed-off-by: Mike Swanson <[email protected]> +--- + programs/winhlp32/macro.lex.l | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l +index 8f6945ca98..2e03660278 100644 +--- a/programs/winhlp32/macro.lex.l ++++ b/programs/winhlp32/macro.lex.l +@@ -20,7 +20,8 @@ + * 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 ++%option prefix="winhlp32_" + %x quote + %{ + #include "config.h" +@@ -367,7 +368,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 + diff --git a/source/xapps-extra/wine-devel/FrugalBuild b/source/xapps-extra/wine-devel/FrugalBuild index 0091f66..9b0938d 100644 --- a/source/xapps-extra/wine-devel/FrugalBuild +++ b/source/xapps-extra/wine-devel/FrugalBuild @@ -2,11 +2,12 @@ # Maintainer: DeX77 <[email protected]> pkgname=wine-devel -pkgver=1.9.23 +pkgver=2.0 +_d3d9ver=2.0-rc5 pkgrel=1 Finclude wine ## don't include cross32 is included from wine.sh source=("${source[@]}" \ - "https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-${pkgver}.tar.gz"; ) + "https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-${_d3d9ver}.tar.gz"; ) signatures=("${signatures[@]}" '' ) depends+=('mesa-nine' 'libegl') @@ -20,8 +21,9 @@ build() # Disable optimizations to workaround GCC issues CFLAGS="${CFLAGS//-O2/-O0}" - Fexec patch -p1 < ../wine-d3d9-patches-wine-d3d9-$pkgver/d3d9-helper.patch || Fdie - Fexec patch -p1 < ../wine-d3d9-patches-wine-d3d9-$pkgver/wine-d3d9.patch || Fdie + Fexec patch -p1 < ../0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch || Fdie + Fexec patch -p1 < ../wine-d3d9-patches-wine-d3d9-${_d3d9ver}/d3d9-helper.patch || Fdie + Fexec patch -p1 < ../wine-d3d9-patches-wine-d3d9-${_d3d9ver}/wine-d3d9.patch || Fdie Fsed 'lib64' 'lib' configure.ac Fautoreconf _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
