From c917a7ce8696b645017265d86065009b03dbf61c95626d1b389a2381d4f1ce73 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 17 Dec 2016 04:26:51 +0000 Subject: [PATCH] - Updated to 2.0-rc2 development snapshot - Bug fixes only, we are in code freeze. - updated winetricks OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=389 --- wine-2.0-rc1.tar.bz2 | 3 - wine-2.0-rc1.tar.bz2.sign | 16 ------ wine-2.0-rc2.tar.bz2 | 3 + wine-2.0-rc2.tar.bz2.sign | 16 ++++++ wine.changes | 7 +++ wine.spec | 4 +- winetricks | 117 ++++++++++++++++++++++++-------------- 7 files changed, 102 insertions(+), 64 deletions(-) delete mode 100644 wine-2.0-rc1.tar.bz2 delete mode 100644 wine-2.0-rc1.tar.bz2.sign create mode 100644 wine-2.0-rc2.tar.bz2 create mode 100644 wine-2.0-rc2.tar.bz2.sign diff --git a/wine-2.0-rc1.tar.bz2 b/wine-2.0-rc1.tar.bz2 deleted file mode 100644 index a469290..0000000 --- a/wine-2.0-rc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:063baa6a437989c07192ba10b02b6f2903250fbeaf8068056209d54fbcbf39fe -size 23594154 diff --git a/wine-2.0-rc1.tar.bz2.sign b/wine-2.0-rc1.tar.bz2.sign deleted file mode 100644 index 91aed8d..0000000 --- a/wine-2.0-rc1.tar.bz2.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlhLB5IACgkQzvrI6q8X -UZ35fQ/+M8bGhrJwq09ujnhkKLH9vU9YiVltKp3yJ9OL1upLwxjZaa+3wGfkLPUY -jKMNU9NBJa+4Of6Vtaotl50f4w5ZjhmTZ6/lvMnvbw4tTEAMs4/uIEDUNqQ/NvRd -pA8770yBgAspWNSq8WwBvqNNPrzGc5hjfh9T3fElGC250oH+41zC9OW2TxBthy+5 -G2L+SSb2TCvHPfcJEF+3d0O/zwQlXm6n8/pLdi0DCACrHqIUwziVgN33EG/tzPwT -xBMRD/gqZ8vwLH8/HnYlUuF4CnUYz/OJbvonKKEEaXm102coAgiP9s8Fl6qXTE7p -xmK1Y4eMyZc+/bwzEVBqN28HmQGPSWrf42hYDmjcvlcDma6q8PBQ+HLsWuYaBQeJ -gic5dSUyTqc/M2JNX1E2zmWwAv7EtLBkQxbrIKynw6vQs5RQn/FQmFjsjqUYG5B3 -luCJV5dLuFU4FtEavmhCdhOFmS8ucFPfhLJJtwLrDitUqrbwU+kAsAAfTYyN948v -zFb1msCd65DuhWOeP83MvOlNyF61DvxCnND0CaklUFuOW2myTal7T6Yj3StRF2JK -phVXTcPh/Lw69dy2A2c22T9jmbUf+6dl/LDR0NGS53yfBtqVUo26qQPwq/jE/zPd -47hK9VJSgbf6OEcYsggDggs7/N/uEvamDTVEihPdOHeuXH/I648= -=XOL2 ------END PGP SIGNATURE----- diff --git a/wine-2.0-rc2.tar.bz2 b/wine-2.0-rc2.tar.bz2 new file mode 100644 index 0000000..dc16036 --- /dev/null +++ b/wine-2.0-rc2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66f12b055549a3d24fc92d7d2610a002adeeda68f68ac2453d5d4f47f5ce535e +size 23590705 diff --git a/wine-2.0-rc2.tar.bz2.sign b/wine-2.0-rc2.tar.bz2.sign new file mode 100644 index 0000000..607c615 --- /dev/null +++ b/wine-2.0-rc2.tar.bz2.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlhUR84ACgkQzvrI6q8X +UZ2YUBAAnTrM/CR53/M7wxrZRSadIAmO4JLagacqHigg4L8FgnnrlsKYdLrR97DA +hsR8n3BEViPdrVQjEmzIE0knzMw1FukAfz8LWzPjYNkote9e169EKEW8trgkkSpM +SNSIBuepyiYs4ZyZGdcEZFiPktF5xxM+LyZXhMeZ4ZRK7WIGDOVYZSa41x2ZmP09 +LEbFbWY/H7oDuWTDGzwI0cBD+EvUOc8f0qLFXluvTlYcGhzx/SuONR/tqq46NQYJ +jmTc5oKvS22D6N/8BCas/18PJZ+4kz2gsLR+isqzE1XhE78P5sJE7b+bmjiTxcJD +I/+Q5YbQRocMa2yjxAwX78I9gcUNegIeqehlwulwe0ilxxjYk5PEkcRg/CfG5HFC +SHBLX+ckB0junx8V1vF4+/TYcpGGjW4lupGBxfSEnyKVrxwBUVXQxyZjlR5YcwGi +f/3HGJs32bgf8sSOxXhhhlzs6yyoYqMtmjMxXqlyo8RHCMidKsAEaCvPqYNls/CT ++NBBvJByX6lZGanGAVgjELzb3rKAKI1iYNQmaH3kkw92pzvWW/3HKHEl+FcfoW83 +yI3YhNi/z3fjdpOOb/eAkPccaucKDApOQoEVEVWmDxSaNzo5ATK5uHI8DfAdRfwJ +SiRP5pE+h671jHIsn7nHd1AHDZ/GoERBv5phSi87oDWclONe2VI= +=KBUx +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 055f627..ff4f020 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 17 04:26:14 UTC 2016 - meissner@suse.com + +- Updated to 2.0-rc2 development snapshot + - Bug fixes only, we are in code freeze. +- updated winetricks + ------------------------------------------------------------------- Fri Dec 9 21:21:02 UTC 2016 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 60c3bf8..552a95e 100644 --- a/wine.spec +++ b/wine.spec @@ -54,8 +54,8 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(libudev) -%define realver 2.0-rc1 -Version: 2.0~rc1 +%define realver 2.0-rc2 +Version: 2.0~rc2 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ diff --git a/winetricks b/winetricks index 14a1947..4e9c94b 100644 --- a/winetricks +++ b/winetricks @@ -157,6 +157,7 @@ WINETRICKS_VERSION=20161107 XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" +W_COUNTRY="" W_PREFIXES_ROOT="${WINE_PREFIXES:-$XDG_DATA_HOME/wineprefixes}" # For temp files before $WINEPREFIX is available: @@ -820,6 +821,8 @@ w_download_to() esac + # FIXME: move these variables and common download options to a global place that can be shared as + # downloaders may be used outside of w_download_to() (e.g., winetricks_stats_report() and winetricks_dl_url_to_stdout()) # Common values for aria2c/curl/wget # Connection timeout time (in seconds): WINETRICKS_DOWNLOADER_TIMEOUT=${WINETRICKS_DOWNLOADER_TIMEOUT:-15} @@ -831,6 +834,8 @@ w_download_to() tries=0 while test $tries -lt 2 do + # Warn on a second try + test "$tries" -eq 1 && winetricks_dl_warning tries=$((tries + 1)) if test -s "$_W_cache/$_W_file" @@ -2598,6 +2603,7 @@ w_append_path() _W_NEW_PATH="$(printf %s "$1" | sed 's,\\\\,\\\\\\\\,g')" _W_WIN_PATH="$(w_expand_env PATH | sed 's,\\\\,\\\\\\\\,g')" + # FIXME: OS X? https://github.com/Winetricks/winetricks/issues/697 sed 's/$/\r/' > "$W_TMP"/path.reg <<_EOF_ REGEDIT4 @@ -2612,6 +2618,64 @@ _EOF_ #---- Private Functions ---- +winetricks_dl_url_to_stdout() +{ + # FIXME: get common downloader variables supported + # FIXME: --torify support as well + if [ "${WINETRICKS_DOWNLOADER}" = "wget" ] ; then + w_try wget -q -O - "$1" + elif [ "${WINETRICKS_DOWNLOADER}" = "curl" ] ; then + w_try curl -s "$1" + elif [ "${WINETRICKS_DOWNLOADER}" = "aria2c" ] ; then + # aria2c doesn't have support downloading to stdout: + # https://github.com/aria2/aria2/issues/190 + # So instead, download to a temporary directory and cat the file: + stdout_tmpfile="${W_TMP_EARLY}/stdout.tmp" + + if [ -e "${stdout_tmpfile}" ] ; then + w_try rm "${stdout_tmpfile}" + fi + aria2c \ + --continue \ + --daemon=false \ + --dir="${W_TMP_EARLY}" \ + --enable-rpc=false \ + --input-file='' \ + --max-connection-per-server=5 \ + --out="stdout.tmp" \ + --save-session='' \ + --stream-piece-selector=geom \ + "$1" > /dev/null + w_try cat "${stdout_tmpfile}" + w_try rm "${stdout_tmpfile}" + else + w_die "Please install aria2c, curl, or wget" + fi +} + +winetricks_dl_warning() { + case $LANG in + ru*) _W_countrymsg="Скрипт определил, что ваш IP адрес принадлежит России. Если во время загрузки файлов вы увидите ошибки несоответствия сертификата, перезапустите скрипт с опцией '--torify' или скачайте файлы вручную, например, используя VPN." ;; + *) _W_countrymsg="Your IP address has been determined to belong to Russia. If you encounter a certificate error while downloading, please relaunch with the '--torify' option, or download files manually, for instance using VPN." ;; + esac + + # Lookup own country via IP address only once (i.e. don't run this function for every download invocation) + if [ -z "$W_COUNTRY" ] ; then + W_COUNTRY="$(winetricks_dl_url_to_stdout "http://ipinfo.io/$(winetricks_dl_url_to_stdout "http://ipinfo.io/ip")" | awk -F '"' '/country/{print $4}')" + export W_COUNTRY + + if [ -z "$W_COUNTRY" ] ; then + export W_COUNTRY="unknown" + fi + fi + + # TODO: Resolve a full country name via https://github.com/umpirsky/country-list/tree/master/data + case "$W_COUNTRY" in + "RU") w_warn "$_W_countrymsg" ;; + *) : ;; + esac +} + winetricks_get_sha1sum_prog() { # Mac folks tend to not have sha1sum, but we can make do with openssl if [ -x "$(which sha1sum 2>/dev/null)" ] @@ -2647,18 +2711,12 @@ winetricks_latest_version_check() return fi - latest_file="${W_TMP_EARLY}/LATEST" + latest_version="$(winetricks_dl_url_to_stdout https://raw.githubusercontent.com/Winetricks/winetricks/master/files/LATEST)" - # Obviously, always redownload: - if [ -e "$latest_file" ] ; then - w_try rm "${latest_file}" - fi + # Also check that $latest_version is an actual number in case github is down + if [ ! -z "${latest_version}" ] && [ ! "$WINETRICKS_VERSION" = "${latest_version}" ] && \ + echo "${latest_version}" | grep -E "[0-9]{8}" ; then - w_download_to ${W_TMP_EARLY} https://raw.githubusercontent.com/Winetricks/winetricks/master/files/LATEST - - latest_version="$(cat "${latest_file}")" - - if [ ! "$WINETRICKS_VERSION" = "${latest_version}" ] ; then if [ -f "${WINETRICKS_CONFIG}/enable-auto-update" ] ; then w_info "You are running winetricks-${WINETRICKS_VERSION}." w_info "New upstream release winetricks-${latest_version} is available." @@ -6970,14 +7028,19 @@ load_dirac() if ( w_opt_unattended > 0 ) { ControlClick, Button2 WinWait, Dirac, License + Sleep 1000 ControlClick, Button2 WinWait, Dirac, Location + Sleep 1000 ControlClick, Button2 WinWait, Dirac, Components + Sleep 1000 ControlClick, Button2 WinWait, Dirac, environment + Sleep 1000 ControlCLick, Button1 WinWait, Dirac, installed + Sleep 1000 ControlClick, Button2 } WinWaitClose @@ -14946,39 +15009,6 @@ load_gta_vc() #---------------------------------------------------------------- -w_metadata guildwars games \ - title="Guild Wars" \ - publisher="NCsoft" \ - year="2005" \ - media="download" \ - file1="GwSetup.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Guild Wars/Gw.exe" \ - homepage="http://www.guildwars.com" - -load_guildwars() -{ - w_download "http://guildwars.com/download/" a7c4c8cb3b8cbee20707dcf8176d3da6a1686c05 GwSetup.exe - - w_try_cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - Run, GwSetup.exe - WinWait, ahk_class ArenaNet_Dialog_Class - if ( w_opt_unattended > 0 ) { - ; Wait for network connection to finish. This might need to be longer. Can we detect this better? - Sleep 6000 - ; For some reason, the OK doesn't take for me unless I activate the window first - WinActivate - Send {Enter} - ; Installation takes a long time... and then starts the game, which we don't want. - } - WinWait, ahk_class ArenaNet_Dx_Window_Class - Sleep 4000 - WinClose, ahk_class ArenaNet_Dx_Window_Class - " -} - -#---------------------------------------------------------------- - w_metadata hegemonygold_demo games \ title="Hegemony Gold" \ publisher="Longbow Games" \ @@ -19212,6 +19242,7 @@ winetricks_stats_report() report="$(echo "$report" | sed 's/ /%20/g')" # Just do a HEAD request with the raw command line. # Yes, this can be fooled by caches. That's ok. + # FIXME: get common downloader variables supported if [ -x "$(which wget 2>/dev/null)" ] then wget --spider "http://kegel.com/data/winetricks-usage?$report" > /dev/null 2>&1 || true