From 4b1e56e6031fe0e49b97fa29d8c594ae9ec8f8c08f8fc803ecc3119ad399afff Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 3 Feb 2018 21:29:58 +0000 Subject: [PATCH 1/2] - Update to 3.1 - Kerberos authentication support. - Window class redirection for Common Controls 6. - Support for X11 ARGB visuals. - DOSBox required for running DOS executables. - Various bug fixes. - Updated winetricks OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=470 --- wine.changes | 11 +++++++++ wine.spec | 4 ++-- winetricks | 67 +++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/wine.changes b/wine.changes index 5d9be9e..3006b44 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Feb 3 21:27:49 UTC 2018 - meissner@suse.com + +- Update to 3.1 + - Kerberos authentication support. + - Window class redirection for Common Controls 6. + - Support for X11 ARGB visuals. + - DOSBox required for running DOS executables. + - Various bug fixes. +- Updated winetricks + ------------------------------------------------------------------- Thu Jan 18 15:51:47 UTC 2018 - meissner@suse.com diff --git a/wine.spec b/wine.spec index ff7026d..abf783d 100644 --- a/wine.spec +++ b/wine.spec @@ -79,8 +79,8 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(libudev) -%define realver 3.0 -Version: 3.0 +%define realver 3.1 +Version: 3.1 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ diff --git a/winetricks b/winetricks index 1fe00b6..ace84a6 100644 --- a/winetricks +++ b/winetricks @@ -310,6 +310,7 @@ w_package_unsupported_win64() { if [ "$W_ARCH" = "win64" ] ; then case $LANG in + pl*) w_die "Ten pakiet ($W_PACKAGE) nie działa z 64-bitową instalacją. Musisz użyć prefiksu utworzonego z WINEARCH=win32." ;; ru*) w_die "Данный пакет не работает в 64-битном окружении. Используйте префикс, созданный с помощью WINEARCH=win32." ;; *) w_die "This package ($W_PACKAGE) does not work on a 64-bit installation. You must use a prefix made with WINEARCH=win32." ;; esac @@ -322,6 +323,7 @@ w_package_warn_win64() { if [ "$W_ARCH" = "win64" ] ; then case $LANG in + pl*) w_warn "Ten pakiet ($W_PACKAGE) może nie działać poprawnie z 64-bitową instalacją. Prefiks 32-bitowy może działąć lepiej." ;; ru*) w_warn "Данный пакет может работать не полностью в 64-битном окружении. 32-битные префиксы могут работать лучше." ;; *) w_warn "This package ($W_PACKAGE) may not fully work on a 64-bit installation. 32-bit prefixes may work better." ;; esac @@ -356,6 +358,7 @@ w_try() status=$? if test $status -ne 0; then case $LANG in + pl*) w_die "Informacja: poelcenie $* zwróciło status $status. Przerywam." ;; ru*) w_die "Важно: команда $* вернула статус $status. Прерывание." ;; *) w_die "Note: command $* returned status $status. Aborting." ;; esac @@ -729,6 +732,7 @@ w_verify_sha1sum() w_get_sha1sum "$_W_vs_file" if [ "$_W_gotsha1sum"x != "$_W_vs_wantsum"x ] ; then case $LANG in + pl*) w_die "Niezgodność sumy sha1sum! Zmień nazwę $_W_vs_file i spróbuj ponownie." ;; ru*) w_die "Контрольная сумма sha1sum не совпадает! Переименуйте файл $_W_vs_file и попробуйте еще раз." ;; *) w_die "sha1sum mismatch! Rename $_W_vs_file and try again." ;; esac @@ -745,6 +749,7 @@ w_verify_sha256sum() w_get_sha256sum "$_W_vs_file" if [ "$_W_gotsha256sum"x != "$_W_vs_wantsum"x ] ; then case $LANG in + pl*) w_die "Niezgodność sumy sha256sum! Zmień nazwę $_W_vs_file i spróbuj ponownie." ;; ru*) w_die "Контрольная сумма sha256sum не совпадает! Переименуйте файл $_W_vs_file и попробуйте еще раз." ;; *) w_die "sha256sum mismatch! Rename $_W_vs_file and try again." ;; esac @@ -794,6 +799,8 @@ winetricks_parse_wget_progress() # Parse a percentage, a size, and a time into $1, $2 and $3 # then use them to create the output line. case $LANG in + pl*) perl -p -e \ + '$| = 1; s/^.* +([0-9]+%) +([0-9,.]+[GMKB]) +([0-9hms,.]+).*$/\1\n# Pobieranie… \2 (\3)/' ;; ru*) perl -p -e \ '$| = 1; s/^.* +([0-9]+%) +([0-9,.]+[GMKB]) +([0-9hms,.]+).*$/\1\n# Загрузка... \2 (\3)/' ;; *) perl -p -e \ @@ -1049,6 +1056,7 @@ w_download_to() if test ! "$WINETRICKS_CONTINUE_DOWNLOAD" ; then case $LANG in + pl*) w_warn "Niezgodność sum kontrolnych dla $_W_cache/$_W_file, pobieram ponownie" ;; ru*) w_warn "Контрольная сумма файла $_W_cache/$_W_file не совпадает, попытка повторной загрузки" ;; *) w_warn "Checksum for $_W_cache/$_W_file did not match, retrying download" ;; esac @@ -2817,7 +2825,6 @@ REGEDIT4 _EOF_ # too verbose w_try_regedit "$W_TMP_WIN"\\_register-font.reg - # shellcheck disable=SC1037 w_backup_reg_file "$W_TMP"/_register-font.reg # Wine also updates the win9x fonts key, so let's do that, too @@ -2828,7 +2835,6 @@ REGEDIT4 "$W_font"="$W_file" _EOF_ w_try_regedit "$W_TMP_WIN"\\_register-font.reg - # shellcheck disable=SC1037 w_backup_reg_file "$W_TMP"/_register-font.reg unset W_file W_font @@ -3047,6 +3053,7 @@ winetricks_latest_version_check() # Check that $latest_version is an actual number in case github is down if ! echo "${latest_version}" | grep -q -E "[0-9]{8}" || [ -z "${latest_version}" ] ; then case $LANG in + pl*) w_warn "GitHub nie działa? Wersja '${latest_version}' nie wydaje się być prawdiłową wersją" ;; ru*) w_warn "Отсутствует подключение к Github? версия '${latest_version}' может быть неактуальной" ;; *) w_warn "Github down? version '${latest_version}' doesn't appear to be a valid version" ;; esac @@ -3060,6 +3067,10 @@ winetricks_latest_version_check() winetricks_selfupdate else case $LANG in + pl*) + w_warn "Korzystasz z winetricks-${WINETRICKS_VERSION}, a najnowszą wersją winetricks-${latest_version}!" + w_warn "Zalecana jest aktualizacja z użyciem menedżera pakietów Twojej dystrybucji, --self-update lub ręczna aktualizacja." + ;; ru*) w_warn "Запущен winetricks-${WINETRICKS_VERSION}, последняя версия winetricks-${latest_version}!" w_warn "Вы можете ее обновить с помощью менеджера пакетов, --self-update или вручную." @@ -3195,7 +3206,7 @@ winetricks_prefixmenu() zh_TW*|zh_HK*) _W_msg_title="Windows 應用安裝向導 - 選取一個 wine 容器" _W_msg_body='君欲何為？' _W_msg_apps='安裝一個 windows 應用' - _W_msg_games='安裝一個游戲' + _W_msg_games='安裝一個遊戲' _W_msg_benchmarks='安裝一個基准測試軟體' _W_msg_default="選取預設的 wine 容器" _W_msg_unattended0="禁用靜默安裝" @@ -5300,9 +5311,9 @@ helper_win7sp1_x64() #--------------------------------------------------------- w_metadata adobeair dlls \ - title="Adobe AIR 20.x" \ + title="Adobe AIR" \ publisher="Adobe" \ - year="2015" \ + year="2017" \ media="download" \ file1="AdobeAIRInstaller.exe" \ installed_file1="$W_COMMONFILES_X86_WIN/Adobe AIR/Versions/1.0/Adobe AIR.dll" \ @@ -5311,7 +5322,8 @@ w_metadata adobeair dlls \ load_adobeair() { # 2017/03/14: 20.0.0.260 (strings 'Adobe AIR.dll' | grep 20\\. ) sha256sum 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45 - w_download https://airdownload.adobe.com/air/win/download/20.0/AdobeAIRInstaller.exe 318770b9a18e59ca4a721a1f5c2b0235cffdbe77a043e99cb2af32074d61de45 + # 2018/01/30: 28.0.0.127 (strings 'Adobe AIR.dll' | grep 28\\. ) sha256sum 9076489e273652089a4a53a1d38c6631e8b7477e39426a843e0273f25bfb109f + w_download https://airdownload.adobe.com/air/win/download/latest/AdobeAIRInstaller.exe 9076489e273652089a4a53a1d38c6631e8b7477e39426a843e0273f25bfb109f w_try_cd "$W_CACHE/$W_PACKAGE" # See https://bugs.winehq.org/show_bug.cgi?id=43506 @@ -12671,8 +12683,9 @@ load_wmp9() # remove builtin placeholders to allow update rm -f "$W_SYSTEM32_DLLS"/wmvcore.dll "$W_SYSTEM32_DLLS"/wmp.dll - # need native wmp override to allow update and later checks to succeed - w_override_dlls native wmp + rm -f "$W_PROGRAMS_X86_UNIX/Windows Media Player/wmplayer.exe" + # need native overrides to allow update and later checks to succeed + w_override_dlls native l3codeca.acm wmp wmplayer.exe wmvcore # FIXME: should we override quartz? Builtin crashes when you play # anything, but maybe that's bug 30557 and only affects new systems? @@ -12712,6 +12725,12 @@ load_wmp10() w_set_winver winxp + # remove builtin placeholders to allow update + rm -f "$W_SYSTEM32_DLLS"/wmvcore.dll "$W_SYSTEM32_DLLS"/wmp.dll + rm -f "$W_PROGRAMS_X86_UNIX/Windows Media Player/wmplayer.exe" + # need native overrides to allow update and later checks to succeed + w_override_dlls native l3codeca.acm wmp wmplayer.exe wmvcore + # Crashes on exit, but otherwise ok; see https://bugs.winehq.org/show_bug.cgi?id=12633 w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" MP10Setup.exe $W_UNATTENDED_SLASH_Q @@ -18391,7 +18410,6 @@ _EOF_ #---------------------------------------------------------------- # Other settings - #---------------------------------------------------------------- w_metadata alldlls=default settings \ @@ -18409,6 +18427,37 @@ load_alldlls() esac } +#---------------------------------------------------------------- + +w_metadata autostart_winedbg=enable settings \ + title="Automatically launch winedbg when an unhandled exception occurs (default)" +w_metadata autostart_winedbg=disable settings \ + title="Prevent winedbg from launching when an unhandled exception occurs" + +load_autostart_winedbg() +{ + case "$arg" in + enable) _W_debugger_value="winedbg --auto %ld %ld";; + disable) _W_debugger_value="false";; + *) w_die "Unexpected argument '$arg'. Should be enable/disable";; + esac + + echo "Setting HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug\\Debugger to '$arg'" + cat > "$W_TMP"/autostart_winedbg.reg <<_EOF_ +REGEDIT4 + +[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug] +"Debugger"="${_W_debugger_value}" +_EOF_ + + w_try_regedit "$W_TMP_WIN"\\autostart_winedbg.reg + w_backup_reg_file "$W_TMP"/autostart_winedbg.reg + + unset _W_debugger_value +} + +#---------------------------------------------------------------- + w_metadata fontsmooth=disable settings \ title_uk="Вимкнути згладжування шрифту" \ title="Disable font smoothing" From 8018ff59ee637dbcae72d8a1ba9a0ae79e81e06ad9fbba7fc4c136eee6536320 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 3 Feb 2018 21:33:12 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=471 --- wine-3.0.tar.xz | 3 --- wine-3.0.tar.xz.sign | 16 ---------------- wine-3.1.tar.xz | 3 +++ wine-3.1.tar.xz.sign | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 wine-3.0.tar.xz delete mode 100644 wine-3.0.tar.xz.sign create mode 100644 wine-3.1.tar.xz create mode 100644 wine-3.1.tar.xz.sign diff --git a/wine-3.0.tar.xz b/wine-3.0.tar.xz deleted file mode 100644 index a81240d..0000000 --- a/wine-3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:346a050aca5cd0d9978a655af11c30e68c201a58aea0c70d5e4c4f1b63c2fbec -size 19712932 diff --git a/wine-3.0.tar.xz.sign b/wine-3.0.tar.xz.sign deleted file mode 100644 index 944583e..0000000 --- a/wine-3.0.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlpgv84ACgkQzvrI6q8X -UZ1DYRAAr6Mz8Dy3szzNLNPdFrOrjqOJsu7dtkt+yR/gpsG0J6ZH1BR8AoRh1yTL -H6ypF4tqyfUdDPpZzb38k7EEkvQhraONTK0/DUvCf5rCDSVDOmzsxwExbc517ygd -KwNkIy65MNLlIh2TkClz4EGK1EuM59f6+Jbll5kWzzq1uE/Gb9GR1ozUu5NltcP1 -Rd3OtAxx01LWVi7B3fj73YlRBJTQOLpe8Ovtp3Wz1u/zJncIZe7H43zvnKAjvipR -Lj2Gie5bbEuR99xZeB40d8xmAMO8WF//Q2Exd5u02iHl/GWUjOHJ4GnXX2kG+mWM -36jmWEsX5iWX6qW40GLEB1P0hJn/9Zjtb69jQaV/olNdpvy1Lo66OrxBdPTGXnCN -frUqtzdCw3muCd/nzybhKViXRDG/M/ALSo7D1LZQhpt++qf6qNLmR54rWFRAEU6g -T4Mbu2CMTrK70gx8js302OkNfs8ToBd1j2e8kC3+0bbR4x9ZeS3AcFB0TECJqDw3 -8M/Fxuc2bi9QbSL3OTz6nz8CaLPsy4aSwS9Ou6i29bTo7mfLOZEIJOz2v+ipQhWM -nVIcB8sEAODjQCP81hX+N8wtacAtaX/rGKnHx0PhysJJr5zRsENOIvP7G0n3sTc2 -z7jdjx4hSL6qll7RMYEliYc2huOUOU1e4ozMk3N06TwzfgV0ZiY= -=uuUh ------END PGP SIGNATURE----- diff --git a/wine-3.1.tar.xz b/wine-3.1.tar.xz new file mode 100644 index 0000000..ae73747 --- /dev/null +++ b/wine-3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f33c021b9fdd35954c812dc09dc243f13796c254b41bb5fc47250f7cca42099 +size 19730700 diff --git a/wine-3.1.tar.xz.sign b/wine-3.1.tar.xz.sign new file mode 100644 index 0000000..b6d9946 --- /dev/null +++ b/wine-3.1.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlp0rJAACgkQzvrI6q8X +UZ1bcBAAq1l5U6x1NBTQgoaMGCAyBJKMNNJggqro/zssvD1TXBf6QJfHiRVLgRv/ +syWfbKitr1oBy7DEvW3Nbfr3imr14V51oYn7pG9w3eQk8e619j757qI8MZ0laz1v +UZzTOHFEbhZpYHFH8rSK1ysnCKxzdxoDqqoCN68tGq6fB4mCrGxP0G6jLeyWpnLF +sU5cACszTm/VdbOjgr7ZT414NZskTLsJ6Li3JSupCs5BScw9cBuCfmedqYJHhUOK +brfH7TV4Vbv0pvvrF2IyBZGN/7bMnKFPj/lVzAZgDpobchtGC+2zEGZBNsm3J7LP +BaGXrOe8rs1FQMTv2G3IgvOA8xyoTjLT+NroIk/jWjbv/fM0s+N0p1hdD7UdP1ce +RfjD/LU4WKLfdwILs6Yo9DTt3w80cqxUhh1T4wzl3Ol54wV8aeP7vkY5hVn20CAf +WaMg4XvZUpRmvVPDrlBiIMPJUVCUd3eAzDOFm7nmDOeuyaG/Cg2dUOCGgVLPyGrn +Xv6jCjlEq1m2oEgmtHhp1c+Gzp5esUq4uqKSoCoxbiu1s88vprUliOkD+opYzcvN +DZgwC9DHFYoIPGBJ9/GnKj1bVs+RiJFOCj4aMLLwkplHnlWHuM+SPlDQflC82VrJ +vOSq3cmNJ5Sf8QDRfZ3Rh86aHC1w6gm5zU6WglpQjjnueOKzRCA= +=oH+G +-----END PGP SIGNATURE-----