Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

system/wine-staging: Updated for version 10.0.rc3. #9182

Closed
wants to merge 1 commit into from
Closed

system/wine-staging: Updated for version 10.0.rc3. #9182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion system/wine-staging/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ NOTES
64bit systems now default to the new WOW64 mode which builds both 64bit
and 32bit PE dlls. This has removed the multilib dependency that was
pereviously required and will allow execution of both 64bit and 32bit
binaries. No multilib required.
binaries. No multilib required. Please see README.MULTILIB if you would
like to build a multilib wine using the legacy method.
52 changes: 27 additions & 25 deletions system/wine-staging/wine-staging.SlackBuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@
cd $(dirname $0) ; CWD=$(pwd)

PRGNAM=wine-staging
VERSION=${VERSION:-9.17}
WINEVERSION=$VERSION
STAGINGVERSION=$VERSION
VERSION=${VERSION:-10.0.rc3}
WINEVERSION=10.0-rc3
STAGINGVERSION=$WINEVERSION
ARCHS="i386,x86_64"
MULTI=""
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
Expand All @@ -53,8 +54,29 @@ if [ -z "$ARCH" ]; then
esac
fi

MULTILIB=${MULTILIB@L}
if [[ "$ARCH" != "x86_64" && "$MULTILIB" = "yes" ]]; then
echo "Cannot build for multilib on non-64bit systems."
exit 1
elif [[ "$ARCH" = "x86_64" && "$MULTILIB" = "yes" ]]; then
WINETMP="$( mktemp -d $TMP/wine-test-XXXXXX )"
echo "int main(void) {; return(0); }" > "$WINETMP/test.c"
gcc -m32 "$WINETMP/test.c" -o /dev/null >/dev/null 2>&1 && WINE32TEST=${WINE32TEST:-yes}
rm -rf "$WINETMP"
if [[ $WINE32TEST = "yes" ]]; then
ARCHS="x86_64"
WINE32="yes"
MULTI="_multilib"
else
echo "MULTILIB was requested, however the multilib test has failed."
echo "Have the compat32 libraries been installed?"
echo "Please see README.MULTILIB"
exit 1
fi
fi

if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
echo "$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
fi

Expand Down Expand Up @@ -88,26 +110,6 @@ case "$ARCH" in
;;
esac

MULTILIB=${MULTILIB@L}
if [[ "$ARCH" != "x86_64" && "$MULTILIB" = "yes" ]]; then
echo "Cannot build for multilib on non-64bit systems."
exit 1
elif [[ "$ARCH" = "x86_64" && "$MULTILIB" = "yes" ]]; then
WINETMP="$( mktemp -d $TMP/wine-test-XXXXXX )"
echo "int main(void) {; return(0); }" > "$WINETMP/test.c"
gcc -m32 "$WINETMP/test.c" -o /dev/null >/dev/null 2>&1 && WINE32TEST=${WINE32TEST:-yes}
rm -rf "$WINETMP"
if [[ $WINE32TEST = "yes" ]]; then
ARCHS="x86_64"
WINE32="yes"
else
echo "MULTILIB was requested, however the multilib test has failed."
echo "Have the compat32 libraries been installed?"
echo "Please see README.MULTILIB"
exit 1
fi
fi

set -e

rm -rf $PKG
Expand Down Expand Up @@ -235,4 +237,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh

cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$ARCH-$BUILD$TAG.$PKGTYPE
10 changes: 5 additions & 5 deletions system/wine-staging/wine-staging.info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PRGNAM="wine-staging"
VERSION="9.17"
VERSION="10.0.rc3"
HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
DOWNLOAD="https://dl.winehq.org/wine/source/9.x/wine-9.17.tar.xz \
https://github.com/wine-staging/wine-staging/archive/v9.17/wine-staging-9.17.tar.gz"
MD5SUM="1e60759082833b0a09c65d21d86bef09 \
e5f8d54c04a45ccbae7e8f3845ae2bd2"
DOWNLOAD="https://dl.winehq.org/wine/source/10.0/wine-10.0-rc3.tar.xz \
https://github.com/wine-staging/wine-staging/archive/v10.0-rc3/wine-staging-10.0-rc3.tar.gz"
MD5SUM="15f6d3c1501ca3b71f99e4322553d689 \
ede10458bd0f633b64e9c1206ea9dbd0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
Expand Down