diff options
| author | David Woodfall <dave@dawoodfall.net> | 2017-01-29 18:10:23 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-02-03 04:33:07 +0700 |
| commit | e0a96d4f47fae7dc5dfe3391639eba73028d5888 (patch) | |
| tree | 01e440e23eed584d9bb1447b530fff7ff0f656e1 | |
| parent | 4e0faecb13eb5e0dfb3a71dd5bf61d7ca1fa0ba1 (diff) | |
| download | slackbuilds-e0a96d4f47fae7dc5dfe3391639eba73028d5888.tar.gz | |
system/wine: Updated for version 2.0.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/wine/0001-winhlp32-Workaround-a-bug-in-Flex.patch | 33 | ||||
| -rw-r--r-- | system/wine/wine.SlackBuild | 15 | ||||
| -rw-r--r-- | system/wine/wine.info | 6 |
3 files changed, 43 insertions, 11 deletions
diff --git a/system/wine/0001-winhlp32-Workaround-a-bug-in-Flex.patch b/system/wine/0001-winhlp32-Workaround-a-bug-in-Flex.patch new file mode 100644 index 0000000000..d674ead817 --- /dev/null +++ b/system/wine/0001-winhlp32-Workaround-a-bug-in-Flex.patch @@ -0,0 +1,33 @@ +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 + diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild index a15b8b7947..b95d09d669 100644 --- a/system/wine/wine.SlackBuild +++ b/system/wine/wine.SlackBuild @@ -24,12 +24,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wine -VERSION=${VERSION:-1.8.3} +VERSION=${VERSION:-2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -49,8 +49,8 @@ IEFIX=${IEFIX:-NO} # the run the script like: OPENGL=NO ./wine.SlackBuild OPENGL=${OPENGL:-YES} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -90,9 +90,9 @@ if [ "$OPENGL" = "YES" ]; then do_opengl="without" fi -# All of the libraries produced are 32bit libs anyway -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +# Fix for flex +patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch + ./configure \ --prefix=/usr \ --mandir=/usr/man \ @@ -101,7 +101,6 @@ CXXFLAGS="$SLKCFLAGS" \ --${do_opengl}-opengl \ --build=$ARCH-slackware-linux -make depend make make install DESTDIR=$PKG diff --git a/system/wine/wine.info b/system/wine/wine.info index b7885a72c9..9b45d324fa 100644 --- a/system/wine/wine.info +++ b/system/wine/wine.info @@ -1,8 +1,8 @@ PRGNAM="wine" -VERSION="1.8.3" +VERSION="2.0" HOMEPAGE="http://www.winehq.com/" -DOWNLOAD="http://prdownloads.sourceforge.net/wine/wine-1.8.3.tar.bz2" -MD5SUM="0d9725fa55494e1623c7559af388a048" +DOWNLOAD="http://prdownloads.sourceforge.net/wine/wine-2.0.tar.bz2" +MD5SUM="fde8a855080279f74fb2e9ccec926db7" DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" REQUIRES="" |