rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

- Updated to 1.9.23 development snapshot

Browse Source 
- HID bus support for macOS.
  - Color font support in Direct2D.
  - More color formats in Direct3D.
  - Uninstallation fixes in MSI.
  - Various bug fixes.
- updated winetricks

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=379
This commit is contained in:
Marcus Meissner 2016-11-12 13:38:00 +00:00 committed by Git OBS Bridge
parent d01cae055e
commit 444b09c79d
8 changed files with 139 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wine-1.9.22.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a3bf8e1ac7c7a742601e4215687c8374dda4050ea64c0fc90fb196645a41ec41
size 23616095

16
wine-1.9.22.tar.bz2.sign
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJYE5wEAAoJEM76yOqvF1GdxboP/3lDlKNQdsoPP3k7x/SmZqm6
vUPhgPfSfXuZpcvmn10kdqbCpd+X2WrAWV9JNmhCro8JtPQtovFjPYRG7AsOKRtC
ATrxI+oJI59OwR+1dRmxB3giMZQhXucP+w7W++TGVNDXAdQXDBtGFmvj0ilGiPFp
8Mg+hRTG9MN2L9uSMY8SMJ8Lq+wotPpI5SOsnWKMnOcQTixzZqiIVAZOMeyHOgSY
Y8FqNFPkouSCdP2TnU1yEvfPYYfsaP8ZmNZyN0mDJrjUMjwOEqwXYKsm3jh68gVo
EYMnD7Bf1viKu/1pSt3waEzTi9wBeSQYzqEDIm4fgeRhU60olgheIp9NsXDCsiCy
FVwPsYZaOiIFz5Y8Gp7U2LxKVeLMozZjQzdtndYRwS43FViu37CjnDWItUBMvH3T
SbPsOQiZfch6j4BD+VkUzCB6ji9GHkgeWnZmi2pDW2zkSx+ONbBWKZgwYJ5fZCh4
+GTvKYkeArxwRC4sHxG6Ky1WkTSrMOCf9iUSJy4XZQfaGo662AFtZPyo8U5+sYtd
2qvY5BiL4IZCrRhaWk1MmJ2+e9Ypm2Sbq1gpwFJcgY5uJuwroWjcEchw5RwN527D
2LvS3R757FWcv4phkKef5uC6C3l+Dj0NHuG+cysTr6DeqKJNmz4SeOhE2DGlQVEF
vqHGsCfaz0Tpwg1dcT+G
=2aG1
-----END PGP SIGNATURE-----

3
wine-1.9.23.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3efa726f6b3df75cc1151341300c0dc9cd171d84313a428ca44684df9c4368c
size 23573977

16
wine-1.9.23.tar.bz2.sign Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJYJfl8AAoJEM76yOqvF1GdnUcP/jS5uRLAyjeXkvBFONdoeXrh
I6GlX8q19iGM0WCfxmvF2MTAYzpp07/ujDYMyj28qCGmUMZyPWow2o9NUa3/0bmv
IQAJRRIF1HfaPO/zirOgYCc/6pM6HtzJ2Pb/AG1shGfYIVDJ2TeGBdOxlfywu6Th
bNHnn3+I8kCL8OS2Mny1M/IUA/hqmswOKAibK+5o3amIVQOwtdgKVXF1d7ZrVQ9W
S+Hth6VSOZyvAcQukv25/TA9Ly7+p+NlMdJs3p403KiABbPbBB3EQwOBXIb7mFwY
yZH0/kXKEMhMmZD1+aNXPZ8z07xKq//SrRRGfnVgx0NNbqVAOSOPP1HCgygBa+LT
VEqNFIf0RPjBHmeq5lZdnrPNNxl04L91Gv7TJDxwnS/pYF1DKEW9kzn/xpkvjK3X
SQZDNM7xxyMa5znokonPWzUFqnNoWaxScBwMnX9pcptvawvjlTbliqmBi1TiFuHy
Awj6nr8lUb7Zwf9E2ywo53aVhgq88m6RcQvSGsr6jzxqxU+hywJFbyLtFbmJeQAU
RvU3IuZEPE/XYjmyruDorH+fwk2syViwa9T4kBk9G9nzwfx3wd43NC9IbrLbuLTy
//JTfMUMdEgnE8//lB/UDGKMPbccGxzJ6uOUq6eFi7PDw6pOOm0hbXVskSuuv3UO
p/6scrB6EBBVdQoQr3lR
=+IFE
-----END PGP SIGNATURE-----

11
wine.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Nov 12 13:36:14 UTC 2016 - meissner@suse.com
- Updated to 1.9.23 development snapshot
- HID bus support for macOS.
- Color font support in Direct2D.
- More color formats in Direct3D.
- Uninstallation fixes in MSI.
- Various bug fixes.
- updated winetricks
-------------------------------------------------------------------
Sun Oct 30 18:31:45 UTC 2016 - meissner@suse.com

4
wine.spec
View File

@ -53,8 +53,8 @@ BuildRequires: sane-backends-devel
BuildRequires: update-desktop-files
BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel
%define realver 1.9.22
Version: 1.9.22
%define realver 1.9.23
Version: 1.9.23
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+

141
winetricks
View File

@ -2,7 +2,7 @@
# Name of this version of winetricks (YYYYMMDD)
# (This doesn't change often, use the sha1sum of the file when reporting problems)
WINETRICKS_VERSION=20161012
WINETRICKS_VERSION=20161107
# This is a UTF-8 file
# You should see an o with two dots over it here [ö]
@ -137,6 +137,16 @@ WINETRICKS_VERSION=20161012
# *) echo "This is the English message" ;;
# esac
#
# Support:
# - Winetricks is maintained by Austin English <austinenglish!$gmail.com>.
# - If winetricks has helped you out, then please consider donating to the FSF/EFF as a thank you
# - If winetricks has helped you out, then please consider donating to the FSF/EFF as a thank you:
# * EFF - https://supporters.eff.org/donate/button
# * FSF - https://my.fsf.org/donate
# - Donations towards electricity bill and developer beer fund can be sent via Paypal to above address.
# - I try to actively respond to bugs and pull requests on GitHub:
# - Bugs: https://github.com/Winetricks/winetricks/issues/new
# - Pull Requests: https://github.com/Winetricks/winetricks/pulls
#--------------------------------------------------------------------
# FIXME: XDG_CACHE_HOME is defined twice, clean this up
@ -191,9 +201,12 @@ w_askpermission()
# Display info message. Time out quickly if user doesn't click.
w_info()
{
echo "------------------------------------------------------"
echo "$@"
echo "------------------------------------------------------"
# If $WINETRICKS_SUPER_QUIET is set, w_info is a no-op:
if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then
echo "------------------------------------------------------"
echo "$@"
echo "------------------------------------------------------"
fi
_W_timeout="--timeout 3"
@ -209,9 +222,12 @@ w_info()
# Display warning message to stderr (since it is called inside redirected code)
w_warn()
{
echo "------------------------------------------------------" >&2
echo "$@" >&2
echo "------------------------------------------------------" >&2
# If $WINETRICKS_SUPER_QUIET is set, w_info is a no-op:
if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then
echo "------------------------------------------------------"
echo "$@"
echo "------------------------------------------------------"
fi
if test "$W_OPT_UNATTENDED"
then
@ -776,6 +792,12 @@ w_download_to()
w_try mkdir -p "$_W_cache"
fi
# Common values for aria2c/curl/wget
# Connection timeout time (in seconds):
WINETRICKS_DOWNLOADER_TIMEOUT=${WINETRICKS_DOWNLOADER_TIMEOUT:-15}
# Number of retry attempts:
WINETRICKS_DOWNLOADER_RETRIES=${WINETRICKS_DOWNLOADER_RETRIES:-3}
# Try download twice
checksum_ok=""
tries=0
@ -824,10 +846,6 @@ w_download_to()
w_try_cd "$_W_cache"
# Mac folks tend to have curl rather than wget
# On Mac, 'which' doesn't return good exit status
# Need to jam in --header "Accept-Encoding: gzip,deflate" else
# redhat.com decompresses liberation-fonts.tar.gz!
# Note: this causes other sites to compress downloads, hence
# the kludge further down. See http://code.google.com/p/winezeug/issues/detail?id=77
echo "Downloading $_W_url to $_W_cache"
# For sites that prefer Mozilla in the user-agent header, set W_BROWSERAGENT=1
@ -858,10 +876,20 @@ w_download_to()
# attempt to download everything in that input file again.
# --save-session='' if the user has specified save-session in their config, their session will be
# ovewritten by the new aria2 process
# http-accept-gzip=true (still needed) ?
$torify aria2c $aria2c_torify_opts --continue --daemon=false --dir "$_W_cache" --enable-rpc=false --input-file='' \
--max-connection-per-server=5 --out "$_W_file" --save-session='' --stream-piece-selector=geom "$_W_url"
$torify aria2c \
$aria2c_torify_opts \
--connect-timeout "${WINETRICKS_DOWNLOADER_TIMEOUT}" \
--continue \
--daemon=false \
--dir "$_W_cache" \
--enable-rpc=false \
--input-file='' \
--max-connection-per-server=5 \
--max-tries="$WINETRICKS_DOWNLOADER_RETRIES" \
--out "$_W_file" \
--save-session='' \
--stream-piece-selector=geom \
"$_W_url"
elif [ -x "$(which wget 2>/dev/null)" ]
then
# Use -nd to insulate ourselves from people who set -x in WGETRC
@ -872,9 +900,13 @@ w_download_to()
# the socket)
# shellcheck disable=SC2086
winetricks_wget_progress \
-O "$_W_file" -nd \
-c --read-timeout=300 --retry-connrefused \
--header "Accept-Encoding: gzip,deflate" \
-O "$_W_file" \
-nd \
-c\
--read-timeout=300 \
--retry-connrefused \
--timeout "${WINETRICKS_DOWNLOADER_TIMEOUT}" \
--tries="$WINETRICKS_DOWNLOADER_RETRIES" \
${_W_cookiejar:+--load-cookies "$_W_cookiejar"} \
${_W_agent:+--user-agent="$_W_agent"} \
"$_W_url"
@ -883,8 +915,12 @@ w_download_to()
# curl doesn't get filename from the location given by the server!
# fortunately, we know it
# shellcheck disable=SC2086
$torify curl -L -o "$_W_file" -C - \
--header "Accept-Encoding: gzip,deflate" \
$torify curl \
--connect-timeout "${WINETRICKS_DOWNLOADER_TIMEOUT}" \
-L \
-o "$_W_file" \
-C - \
--retry="$WINETRICKS_DOWNLOADER_RETRIES" \
${_W_cookiejar:+--cookie "$_W_cookiejar"} \
${_W_agent:+--user-agent "$_W_agent"} \
"$_W_url"
@ -895,6 +931,7 @@ w_download_to()
then
# Need to decompress .exe's that are compressed, else Cygwin fails
# Also affects ttf files on github
# FIXME: gzip hack below may no longer be needed, but need to investigate before removing
_W_filetype=$(which file 2>/dev/null)
case $_W_filetype-$_W_file in
/*-*.exe|/*-*.ttf|/*-*.zip)
@ -2387,7 +2424,7 @@ w_do_call()
;;
*)
# shellcheck disable=SC2154
case "$category"-"$WINETRICKS_OPT_SHAREDPREFIX" in
case "${category}-${WINETRICKS_OPT_SHAREDPREFIX}" in
apps-0|benchmarks-0|games-0)
winetricks_set_wineprefix "$cmd"
# If it's a new wineprefix, give it metadata
@ -2490,6 +2527,7 @@ REGEDIT4
_EOF_
# too verbose
w_try_regedit "$W_TMP_WIN"\\_register-font.reg
# shellcheck disable=SC1037
cp "$W_TMP"/*.reg "$W_TMP_EARLY"/_reg$$.reg
# Wine also updates the win9x fonts key, so let's do that, too
@ -2500,6 +2538,7 @@ REGEDIT4
"$font"="$file"
_EOF_
w_try_regedit "$W_TMP_WIN"\\_register-font.reg
# shellcheck disable=SC1037
cp "$W_TMP"/*.reg "$W_TMP_EARLY"/_reg$$-2.reg
}
@ -3489,7 +3528,7 @@ winetricks_is_installed()
;;
*)
# Compute wineprefix for this app
case "$category"-"$WINETRICKS_OPT_SHAREDPREFIX" in
case "${category}-${WINETRICKS_OPT_SHAREDPREFIX}" in
apps-0|benchmarks-0|games-0)
_W_prefix="$W_PREFIXES_ROOT/$1"
;;
@ -3545,14 +3584,16 @@ winetricks_list_cached()
# List verbs which are automatically downloadable, regardless of whether they're cached yet
winetricks_list_download()
{
w_try_cd "$WINETRICKS_METADATA"
# Piping output of w_try_cd to /dev/null since winetricks-test parses it:
w_try_cd "$WINETRICKS_METADATA" >/dev/null
grep -l 'media=.download' ./*/*.vars | sed 's,.*/,,;s/\.vars//' | sort -u
}
# List verbs which are downloadable with user intervention, regardless of whether they're cached yet
winetricks_list_manual_download()
{
w_try_cd "$WINETRICKS_METADATA"
# Piping output of w_try_cd to /dev/null since winetricks-test parses it:
w_try_cd "$WINETRICKS_METADATA" >/dev/null
grep -l 'media=.manual_download' ./*/*.vars | sed 's,.*/,,;s/\.vars//' | sort -u
}
@ -3561,7 +3602,9 @@ winetricks_list_installed()
(
# Jump through a couple hoops to evaluate the verbs in alphabetical order
# Assume that no filename contains '|'
w_try_cd "$WINETRICKS_METADATA"
# Piping output of w_try_cd to /dev/null since winetricks-test parses it:
w_try_cd "$WINETRICKS_METADATA" >/dev/null
for _W_metadatafile in $(find . -iname \*.vars | sed 's,^\(.*\)/,\1|,' | sort -t\| -k 2 | tr '|' /)
do
# Use a subshell to avoid putting metadata in global space
@ -3873,20 +3916,20 @@ winetricks_cache_iso()
WINETRICKS_DD_PID=$!
;;
esac
echo $WINETRICKS_DD_PID > "$WINETRICKS_WORKDIR"/dd-pid
echo "$WINETRICKS_DD_PID" > "$WINETRICKS_WORKDIR"/dd-pid
# Note: if user presses ^C, winetricks_cleanup will call winetricks_iso_cleanup
# FIXME: add progress bar for kde, too
case $WINETRICKS_GUI in
none|kdialog)
while ps -p $WINETRICKS_DD_PID > /dev/null 2>&1
while ps -p "$WINETRICKS_DD_PID" > /dev/null 2>&1
do
sleep 5
ls -l "$W_CACHE"/temp.iso
done
;;
zenity)
while ps -p $WINETRICKS_DD_PID > /dev/null 2>&1
while ps -p "$WINETRICKS_DD_PID" > /dev/null 2>&1
do
echo 1
sleep 2
@ -4481,7 +4524,9 @@ winetricks_init()
WINETRICKS_WINE_MINOR=$(echo $WINETRICKS_WINE_VERSION | sed 's/wine-1\.\([0-9]*\)\..*/\1/')
WINETRICKS_WINE_MICRO=$(echo $WINETRICKS_WINE_VERSION | sed 's/wine-1.[0-9][0-9]*\.\([0-9]*\).*/\1/')
echo "Using winetricks $(winetricks_print_version) with $WINETRICKS_WINE_VERSION"
if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then
echo "Using winetricks $(winetricks_print_version) with $WINETRICKS_WINE_VERSION"
fi
winetricks_latest_version_check
}
@ -9634,8 +9679,9 @@ load_liberation()
w_download https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-1.04.tar.gz 097882c92e3260742a3dc3bf033792120d8635a3
w_try_cd "$W_TMP"
gunzip -dc "$W_CACHE"/liberation/liberation-fonts-1.04.tar.gz | tar -xf -
mv liberation-fonts-1.04/*.ttf "$W_FONTSDIR_UNIX"
# FIXME: w_try doesn't work here, presumably because of the pipe?
gunzip -dc "$W_CACHE/$W_PACKAGE/$file1" | tar -xf -
w_try mv liberation-fonts-1.04/*.ttf "$W_FONTSDIR_UNIX"
w_register_font LiberationMono-BoldItalic.ttf "LiberationMono-BoldItalic"
w_register_font LiberationMono-Bold.ttf "LiberationMono-Bold"
@ -11327,7 +11373,8 @@ load_steam()
# 6 Jan 2015 e04aefe8bc894f11f211edec8e8a008abe0147d2
# 21 Jun 2015 0e8046d40c38d817338135ec73a5b217cc340cf5
# 29 Dec 2015 728e3c82fd57c68cbbdb64965719081ffee6272c
w_download http://media.steampowered.com/client/installer/SteamSetup.exe 728e3c82fd57c68cbbdb64965719081ffee6272c
# 28 Oct 2016 e930dbdb3bc638f772a8fcd92dbcd0919c924318
w_download http://media.steampowered.com/client/installer/SteamSetup.exe e930dbdb3bc638f772a8fcd92dbcd0919c924318
w_try_cd "$W_CACHE/$W_PACKAGE"
# Should be fixed in newer steam versions, since 2012. Commenting out for a while before removing in case users need to revert locally
@ -17876,7 +17923,7 @@ load_civ5_demo_steam()
# finds the dialog it's looking for, clicks, and exits.
w_info "If you already own the full Civ 5 game on Steam, the installer won't even appear."
w_steam_install_game 65900 "Sid Meier's Civilization V - Demo"
kill -s HUP $_job # just in case
kill -s HUP "$_job" # just in case
}
#----------------------------------------------------------------
@ -18799,6 +18846,30 @@ load_winxp()
#----------------------------------------------------------------
# Not really a setting, just a fake verb, that shouldn't count as 'installed',
# that always works
w_metadata good settings \
title="Fake verb that always returns true"
load_good()
{
w_info "$W_PACKAGE succeeded!"
}
#----------------------------------------------------------------
# Not really a setting, just a fake verb, that shouldn't count as 'installed',
# that always fails
w_metadata bad settings \
title="Fake verb that always returns false"
load_bad()
{
w_die "$W_PACKAGE failed!"
}
#---- Derived Metadata ----
# Generated automatically by measuring time and space requirements of all verbs
# size_MB includes size of virgin wineprefix, but not the cached installer
@ -19319,7 +19390,7 @@ then
if test "$verbs" = ""
then
# "user didn't pick anything, back up a level in the menu"
case "$WINETRICKS_CURMENU"-"$WINETRICKS_OPT_SHAREDPREFIX" in
case "${WINETRICKS_CURMENU}-${WINETRICKS_OPT_SHAREDPREFIX}" in
apps-0|benchmarks-0|games-0|main-*) WINETRICKS_CURMENU=prefix ;;
prefix-*) break ;;
*) WINETRICKS_CURMENU=main ;;
@ -19342,7 +19413,7 @@ then
do
execute_command "$verb"
done
case "$WINETRICKS_CURMENU"-"$WINETRICKS_OPT_SHAREDPREFIX" in
case "${WINETRICKS_CURMENU}-${WINETRICKS_OPT_SHAREDPREFIX}" in
prefix-*|apps-0|benchmarks-0|games-0)
# After installing isolated app, return to prefix picker
WINETRICKS_CURMENU=prefix

2
winetricks.1
View File

@ -1,5 +1,5 @@
.\" -*- nroff -*-
.TH WINETRICKS 1 "October 2016" "Winetricks 20161012" "Wine Package Manager"
.TH WINETRICKS 1 "November 2016" "Winetricks 20161107" "Wine Package Manager"
.SH NAME
winetricks \- manage virtual Windows environments using Wine
.SH SYNOPSIS