Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0284d01bde392ae6fa93e214ba437deaa5ff6894
commit 0284d01bde392ae6fa93e214ba437deaa5ff6894 Author: DeX77 <[email protected]> Date: Wed Jan 25 14:41:41 2017 +0100 wine-2.0-1-x86_64 * version bump diff --git a/source/include/wine.sh b/source/include/wine.sh index 3709f63..a85c040 100644 --- a/source/include/wine.sh +++ b/source/include/wine.sh @@ -29,7 +29,7 @@ _F_cd_path="wine-$pkgver" options=('genscriptlet' 'nostrip') archs=('x86_64') _F_conf_configure="../configure" - +_F_archive_grepv="\-rc" F32confopts+=" --libdir=/usr/lib32" Finclude cross32 @@ -38,7 +38,7 @@ case "$pkgname" in wine) pkgdesc="An Open Source implementation of the Windows API on top of X and Unix. (Stable)" - up2date="Flasttar https://dl.winehq.org/wine/source/1.8/"; + up2date="Flasttar $url/news" conflicts=('wine-devel' 'lib32-wine-devel') provides=('lib32-wine') replaces=('lib32-wine') @@ -47,7 +47,7 @@ wine) wine-devel) pkgdesc="An Open Source implementation of the Windows API on top of X and Unix. (Development)" _F_archive_name="wine" - up2date="Flasttar https://dl.winehq.org/wine/source/1.9/"; + up2date="Flasttar $url/news" conflicts=('wine' 'lib32-wine-devel') provides=('wine' 'lib32-wine-devel') replaces=('lib32-wine-devel') @@ -60,13 +60,16 @@ default) esac -source=(https://dl.winehq.org/wine/source/${pkgver%.*}/wine-$pkgver.tar.bz2) -signatures=("${source[@]}.sign") +#source=(https://dl.winehq.org/wine/source/${pkgver%.*}/wine-$pkgver.tar.bz2) +source=(https://dl.winehq.org/wine/source/${pkgver}/wine-$pkgver.tar.bz2 \ + 0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch ) +signatures=("${source[0]}.sign" '') build() { Fcd + Fpatchall Fsed 'lib64' 'lib' configure.ac Fautoreconf Fexec mkdir 64Bit_build || Fdie diff --git a/source/xapps-extra/wine/0001-programs-winhlp32-Use-noyywrap-for-macro.lex.l-and-p.patch b/source/xapps-extra/wine/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/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/FrugalBuild b/source/xapps-extra/wine/FrugalBuild index 53b068b..23783a3 100644 --- a/source/xapps-extra/wine/FrugalBuild +++ b/source/xapps-extra/wine/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=wine -pkgver=1.8.6 +pkgver=2.0 pkgrel=1 Finclude wine _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
