From f1c21b26d5e85490e3cbe55c84f21353e3e92994 Mon Sep 17 00:00:00 2001 From: orbea Date: Sat, 25 Jul 2020 07:55:39 -0700 Subject: graphics/wine-nine-standalone: Updated for version 0.6. It seems pkg-config is still not fixed for multilib... v1: Require pkgconf on multilib systems. v2: Updated for version 0.6. Signed-off-by: orbea Signed-off-by: Willy Sudiarto Raharjo --- graphics/wine-nine-standalone/README | 5 +++ .../wine-nine-standalone.SlackBuild | 39 +++++++++++++--------- .../wine-nine-standalone/wine-nine-standalone.info | 6 ++-- 3 files changed, 32 insertions(+), 18 deletions(-) (limited to 'graphics') diff --git a/graphics/wine-nine-standalone/README b/graphics/wine-nine-standalone/README index e4fc1e042c53..1af24f6d8158 100644 --- a/graphics/wine-nine-standalone/README +++ b/graphics/wine-nine-standalone/README @@ -18,3 +18,8 @@ To enable 64-bit support wine must be built with wine64. To build on a pure Slackware64 install 32-bit wine must be disabled. WIN32=no WIN64=yes ./wine.SlackBuild + +On multilib systems pkgconf is required. + +On Slackware 14.2 multilib systems compat32 packages of both kbproto and +xproto are also required. diff --git a/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild b/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild index fdd90c3d9bf5..7fe308d1fadc 100644 --- a/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild +++ b/graphics/wine-nine-standalone/wine-nine-standalone.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wine-nine-standalone -# Copyright 2019 Hunter Sezen California, USA +# Copyright 2019-2020 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wine-nine-standalone -VERSION=${VERSION:-0.5} +VERSION=${VERSION:-0.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,19 +60,28 @@ exists () { v=1 while [ $# -gt 0 ]; do arg="$1"; shift - case "$arg" in ''|*/) continue ;; esac - x="${arg##*/}" z="${arg%/*}" - [ ! -f "$z/$x" ] || [ ! -x "$z/$x" ] && [ "$z/$x" = "$arg" ] && continue - [ "$x" = "$z" ] && [ -x "$z/$x" ] && [ ! -f "$arg" ] && z= - p=":$z:$PATH" - while [ "$p" != "${p#*:}" ]; do - p="${p#*:}"; d="${p%%:*}" - if [ -f "$d/$x" ] && [ -x "$d/$x" ]; then - printf %s\\n "$d/$x" - v=0 - break - fi - done + case "$arg" in + ''|*/ ) + : + ;; + */* ) + if [ -f "$arg" ] && [ -x "$arg" ]; then + printf %s\\n "$arg" + v=0 + fi + ;; + * ) + p=":$PATH" + while [ "$p" != "${p#*:}" ]; do + p="${p#*:}"; d="${p%%:*}/$arg" + if [ -f "$d" ] && [ -x "$d" ]; then + printf %s\\n "$d" + v=0 + break + fi + done + ;; + esac done return $v } diff --git a/graphics/wine-nine-standalone/wine-nine-standalone.info b/graphics/wine-nine-standalone/wine-nine-standalone.info index 9f6c4be7f195..d9b0f34c1a48 100644 --- a/graphics/wine-nine-standalone/wine-nine-standalone.info +++ b/graphics/wine-nine-standalone/wine-nine-standalone.info @@ -1,8 +1,8 @@ PRGNAM="wine-nine-standalone" -VERSION="0.5" +VERSION="0.6" HOMEPAGE="https://github.com/iXit/wine-nine-standalone" -DOWNLOAD="https://github.com/iXit/wine-nine-standalone/archive/v0.5/wine-nine-standalone-0.5.tar.gz" -MD5SUM="7b5b4b5a7d5066b9f8d26d884bb0d39a" +DOWNLOAD="https://github.com/iXit/wine-nine-standalone/archive/v0.6/wine-nine-standalone-0.6.tar.gz" +MD5SUM="edd1753caa9d281c5dba2d56e8a115f0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="meson wine" -- cgit v1.2.3