diff --git a/wine-1.9.4.tar.bz2 b/wine-1.9.4.tar.bz2 deleted file mode 100644 index 546d87d..0000000 --- a/wine-1.9.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75c1eab6b980870b367a73db6e57eb0dc9242c2be8546f94084577a0ed0bbbb8 -size 22974777 diff --git a/wine-1.9.4.tar.bz2.sign b/wine-1.9.4.tar.bz2.sign deleted file mode 100644 index 0ec6a58..0000000 --- a/wine-1.9.4.tar.bz2.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJWxyzKAAoJEM76yOqvF1Gdy88P/R6+mNvQT9onQMieEYvaQvcI -8zDCU2N4o2GRu+ZEAK5y9dScPZ22AldV4QsnYuLOHbHW38ToSd7y1bOG/o8/r0vY -EMYO6q9XaBe52/KnTpX6SBY3sQHw1ph5frR6GK+S9axfBBsHGwg7Mzc48mOEx31G -LjWDwiqhwSWWsFB9eLVrHb09qUvbC73xJZHIFDJ98l9LM6GIKYFHrUFa7k64GU+o -0bSXKZuvZXv4xDHF2m3koidCBgmyIwB8mUz1aGyu/GYeQpCfP/HyRxxrQVC0usdz -u9LJoNrjYU2AjALJ7C7Hi75Vi1i7muD5hyroPmexUMc8ePn8v8HoRetv+QN4Q7Gl -PN0kcCL0mIlUsAI9tz/DZPhqElQtVyLbag1h+Pgtl70T7RnJSyPTDeG/P0vu4Yoq -40EvT1avoaKy/X2Depuk7NphSOfSynro0swXBncScXpZBrmzzXtY3T1/jKEknxNa -5UXxHUJozoapCAz0ZT9MmTjNV+4rBGBPEUmGpVFZ6Saq13bGZ3BQDhl1unicsDEy -hJNJwyE20QGZp4gAgv+ORH9XbMwyPxbaQjjrOj9sRGgmQzGZn5RCXO9nvZTQqt4q -zHKOIaLIRo8X6dRv3BvO4gSwi7PZyEnDYTIqQmQVD/sXWAqmUmZIvTu0lQhDW6If -M+oS6O6JdMzVBwIXAjOl -=MP4/ ------END PGP SIGNATURE----- diff --git a/wine-1.9.5.tar.bz2 b/wine-1.9.5.tar.bz2 new file mode 100644 index 0000000..434b30f --- /dev/null +++ b/wine-1.9.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb526308e7ac5e202c0f0b663d4c7a943419d9eec766af6831caf23914300f09 +size 23034629 diff --git a/wine-1.9.5.tar.bz2.sign b/wine-1.9.5.tar.bz2.sign new file mode 100644 index 0000000..81da665 --- /dev/null +++ b/wine-1.9.5.tar.bz2.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJW2a4TAAoJEM76yOqvF1GdZ24P/3Yh3dHydSv3qBmgUHRdQYYT +8/YYCOpYg34U8BuK9dV9njLG9cY4vs6lK6UqdggZHaIwqVooVDlqKDT9IkWr77KO +Sp4bhlsQhZROW8TBKfaFoAFgowgWXmGGF0NMOfNhHvVpNV5z2tmfwZpMfAjqWNJE +cbKhXxZbACdcygDUE1eygfxAGs4lesWyff2+F5BIyxWaZ+LnNLC8iaqcDM6ZgouJ +MRndD0ziUWWYeUexX0CByYFigFGRhfbgDX1AZHxDdl4ycfkK0rq2Fdi5fJ0rYjPk +eIb29oG9VWRW6HQqirbD31HgKXz/9D4VqXn6CwmlnkuslvFQh1lY4Vg9/+SbHGus +wodr+9hS+0RtmdVzruVpxxEMDaKFIw9pxqaGJbPGBCVn5yodTq5rEftrXxn1VVJw +3D8A5dk2y5LLyNoUH3LJ3nij8WrtypyASbgHtY/Y2mzEppW0oK2Ptfqq/fEr2xyX +NKafXkvafLpMQrGXKJUWPlwMmuIzlGmLRBd14qWIyrv/MCz5DAdFuJfLC7EoJJfs +mUJzaTsabA+B80NaF6iSa1pdLedq4ZTXqXqOInis/ZWN9E8psAguqwBGvDEq14O4 +qRvNovcPmDQTvkI7Uv7r+fKpSTxhcw3vLWS07VTg/0yClhCBpyDXWDY54c11IbdG +ljaV6GNpsSwDnFWFFT1X +=Ul7V +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 821788c..2f3e084 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Mar 4 16:41:56 UTC 2016 - meissner@suse.com + +- Updated to 1.9.4 development snapshot + - New version of the Mono engine, with 64-bit support. + - Beginnings of the WineD3D command stream. + - Support for effect states in Direct3DX. + - Drag & drop improvements. + - Various bug fixes. +- updated winetricks +- wine.keyring: alexandre switched his gpg key + ------------------------------------------------------------------- Fri Feb 19 16:27:50 UTC 2016 - meissner@suse.com diff --git a/wine.keyring b/wine.keyring index caa6751..ffebe55 100644 --- a/wine.keyring +++ b/wine.keyring @@ -1,40 +1,52 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.18 (GNU/Linux) -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 -rG6TnHJhffPNhEAOoCzan79neJs= -=P3+D +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 +=6vF7 -----END PGP PUBLIC KEY BLOCK----- diff --git a/wine.spec b/wine.spec index 453862d..c490609 100644 --- a/wine.spec +++ b/wine.spec @@ -53,8 +53,8 @@ BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -%define realver 1.9.4 -Version: 1.9.4 +%define realver 1.9.5 +Version: 1.9.5 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ diff --git a/winetricks b/winetricks index 74ec280..f32c520 100644 --- a/winetricks +++ b/winetricks @@ -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=20160109 +WINETRICKS_VERSION=20160219 # This is a utf-8 file # You should see an o with two dots over it here [ö] @@ -421,6 +421,9 @@ w_read_key() pl*) _W_keymsg="Proszę podać klucz dla programu '$W_PACKAGE'" _W_nokeymsg="Nie podano klucza" ;; + ru*) _W_keymsg="Пожалуйста, введите ключ для приложения '$W_PACKAGE'" + _W_nokeymsg="Ключ не введён" + ;; uk*) _W_keymsg="Будь ласка, введіть ключ для додатка '$W_PACKAGE'" _W_nokeymsg="Ключ не надано" ;; @@ -889,6 +892,7 @@ w_download_manual_to() da*) _W_dlmsg="Hent venligst filen $_W_file fra $_W_url og placér den i $W_CACHE/$_W_packagename, kør derefter dette skript.";; de*) _W_dlmsg="Bitte laden Sie $_W_file von $_W_url runter, stellen Sie's in $W_CACHE/$_W_packagename, dann wiederholen Sie dieses Kommando.";; pl*) _W_dlmsg="Proszę pobrać plik $_W_file z $_W_url, następnie umieścić go w $W_CACHE/$_W_packagename, a na końcu uruchomić ponownie ten skrypt.";; + ru*) _W_dlmsg="Пожалуйста, скачайте файл $_W_file по адресу $_W_url, и поместите его в $W_CACHE/$_W_packagename, а затем запустите winetricks заново.";; uk*) _W_dlmsg="Будь ласка, звантажте $_W_file з $_W_url, розташуйте в $W_CACHE/$_W_packagename, потім запустіть скрипт знову.";; zh_CN*) _W_dlmsg="请从 $_W_url 下载 $_W_file，并置放于 $W_CACHE/$_W_packagename, 然后重新运行 winetricks.";; zh_TW*|zh_HK*) _W_dlmsg="請從 $_W_url 下載 $_W_file，并置放於 $W_CACHE/$_W_packagename, 然后重新執行 winetricks.";; @@ -904,7 +908,12 @@ w_download_manual_to() w_die "$_W_dlmsg" # FIXME: wait in loop until file is finished? fi - # FIXME: verify $sha1sum of $file + + if test "$_W_sha1sum" + then + w_verify_sha1sum $_W_sha1sum "$W_CACHE/$_W_packagename/$_W_file" + fi + unset _W_url _W_file _W_sha1sum _W_dlmsg } @@ -2016,6 +2025,7 @@ w_workaround_wine_bug() da*) w_warn "Arbejder uden om wine-fejl ${1} $_W_msg" ;; de*) w_warn "Wine-Fehler ${1} wird umgegangen $_W_msg" ;; pl*) w_warn "Obchodzenie błędu w wine ${1} $_W_msg" ;; + ru*) w_warn "Обход ошибки ${1} $_W_msg" ;; uk*) w_warn "Обхід помилки ${1} $_W_msg" ;; zh_CN*) w_warn "绕过 wine bug ${1} $_W_msg" ;; zh_TW*|zh_HK*) w_warn "繞過 wine bug ${1} $_W_msg" ;; @@ -2420,6 +2430,18 @@ winetricks_get_prefix_var() winetricks_prefixmenu() { case $LANG in + ru*) _W_msg_title="Winetricks - выберите путь wine (wineprefix)" + _W_msg_body='Что вы хотите сделать?' + _W_msg_apps='Установить программу' + _W_msg_games='Установить игру' + _W_msg_benchmarks='Установить приложение для оценки производительности' + _W_msg_default="Выберите путь для wine по умолчанию" + _W_msg_unattended0="Отключить автоматическую установку" + _W_msg_unattended1="Включить автоматическую установку" + _W_msg_showbroken0="Спрятать нерабочие программы (например, использующие DRM)" + _W_msg_showbroken1="Отобразить нерабочие программы (например, использующие DRM)" + _W_msg_help="Просмотр справки (в веб браузере)" + ;; uk*) _W_msg_title="Winetricks - виберіть wineprefix" _W_msg_body='Що Ви хочете зробити?' _W_msg_apps='Встановити додаток' @@ -2470,7 +2492,7 @@ winetricks_prefixmenu() ;; *) _W_msg_title="Winetricks - choose a wineprefix" _W_msg_body='What do you want to do?' - _W_msg_apps='Install an app' + _W_msg_apps='Install an application' _W_msg_games='Install a game' _W_msg_benchmarks='Install a benchmark' _W_msg_default="Select the default wineprefix" @@ -2614,6 +2636,19 @@ winetricks_mainmenu() _W_msg_folder='Przeglądaj pliki' _W_msg_annihilate="Usuń WSZYSTKIE DANE I APLIKACJE WEWNĄTRZ TEGO WINEPREFIXA" ;; + ru*) _W_msg_title="Winetricks - текущий путь для wine (wineprefix) \"$WINEPREFIX\"" + _W_msg_body='Что вы хотите сделать с этим wineprefix?' + _W_msg_dlls="Установить DLL библиотеку или компонент Windows" + _W_msg_fonts='Установить шрифт' + _W_msg_settings='Поменять настройки' + _W_msg_winecfg='Запустить winecfg (редактор настроек wine)' + _W_msg_regedit='Запустить regedit (редактор рееста)' + _W_msg_taskmgr='Запустить taskmgr (менеджер задач)' + _W_msg_uninstaller='Запустить uninstaller (деинсталятор)' + _W_msg_shell='Запустить графический терминал (для отладки)' + _W_msg_folder='Проводник файлов' + _W_msg_annihilate="Удалить ВСЕ ДАННЫЕ И ПРИЛОЖЕНИЯ В ЭТОМ WINEPREFIX" + ;; uk*) _W_msg_title="Winetricks - поточний prefix \"$WINEPREFIX\"" _W_msg_body='Що Ви хочете зробити для цього wineprefix?' _W_msg_dlls="Встановити Windows DLL чи компонент(и)" @@ -2733,6 +2768,9 @@ winetricks_settings_menu() pl*) _W_msg_title="Winetricks - obecny prefiks to \"$WINEPREFIX\"" _W_msg_body='Which settings would you like to change?' ;; + ru*) _W_msg_title="Winetricks - текущий путь wine (wineprefix) \"$WINEPREFIX\"" + _W_msg_body='Какие настройки вы хотите изменить?' + ;; uk*) _W_msg_title="Winetricks - поточний prefix \"$WINEPREFIX\"" _W_msg_body='Які налаштування Ви хочете змінити?' ;; @@ -2786,6 +2824,18 @@ winetricks_settings_menu() --width $WINETRICKS_MENU_WIDTH \ " ;; + ru*) printf %s "zenity \ + --title '$_W_msg_title' \ + --text '$_W_msg_body' \ + --list \ + --checklist \ + --column '' \ + --column Установка \ + --column Имя \ + --height $WINETRICKS_MENU_HEIGHT \ + --width $WINETRICKS_MENU_WIDTH \ + " + ;; uk*) printf %s "zenity \ --title '$_W_msg_title' \ --text '$_W_msg_body' \ @@ -2888,6 +2938,10 @@ winetricks_showmenu() _W_msg_body='Które paczki chesz zainstalować?' _W_cached="zarchiwizowane" ;; + ru*) _W_msg_title="Winetricks - текущий путь wine (wineprefix) \"$WINEPREFIX\"" + _W_msg_body='Какое приложение(я) вы хотите установить?' + _W_cached="в кэше" + ;; uk*) _W_msg_title="Winetricks - поточний prefix \"$WINEPREFIX\"" _W_msg_body='Які пакунки Ви хочете встановити?' _W_cached="кешовано" @@ -2964,6 +3018,24 @@ winetricks_showmenu() --width $WINETRICKS_MENU_WIDTH \ " ;; + ru*) printf %s "zenity \ + --title '$_W_msg_title' \ + --text '$_W_msg_body' \ + --list \ + --checklist \ + --column '' \ + --column Пакет \ + --column Название \ + --column Издатель \ + --column Год \ + --column Источник \ + --column Статус \ + --column 'Размер (МБ)' \ + --column 'Время (сек)' \ + --height $WINETRICKS_MENU_HEIGHT \ + --width $WINETRICKS_MENU_WIDTH \ + " + ;; uk*) printf %s "zenity \ --title '$_W_msg_title' \ --text '$_W_msg_body' \ @@ -3270,6 +3342,7 @@ winetricks_list_all() da*) _W_cached="cached" ; _W_download="kan hentes" ;; de*) _W_cached="gecached" ; _W_download="herunterladbar";; pl*) _W_cached="zarchiwizowane" ; _W_download="do pobrania" ;; + ru*) _W_cached="в кэше" ; _W_download="доступно для скачивания" ;; uk*) _W_cached="кешовано" ; _W_download="завантажуване" ;; zh_CN*) _W_cached="已缓存" ; _W_download="可下载" ;; zh_TW*|zh_HK*) _W_cached="已緩存" ; _W_download="可下載" ;; @@ -3507,9 +3580,10 @@ winetricks_cache_iso() then case $LANG in da*) w_warn "Forkert disk [$_W_volname] indsat. Indsæt venligst disken [$_W_expected_volname]" ;; - de*) w_warn "Falsche Disk [$_W_volname] eingelegt. Bitte legen Sie Disk [$_W_expected_volname] ein!" ;; - pl*) w_warn "Włożono zły dysk [$_W_volname]. Proszę włożyć dysk [$_W_expected_volname]" ;; - uk*) w_warn "Неправильний диск [$_W_volname]. Будь ласка, вставте диск [$_W_expected_volname]" ;; + de*) w_warn "Falsche Disk [$_W_volname] eingelegt. Bitte legen Sie Disk [$_W_expected_volname] ein!" ;; + pl*) w_warn "Włożono zły dysk [$_W_volname]. Proszę włożyć dysk [$_W_expected_volname]" ;; + ru*) w_warn "Неверный диск [$_W_volname]. Пожалуйста, вставьте диск [$_W_expected_volname]" ;; + uk*) w_warn "Неправильний диск [$_W_volname]. Будь ласка, вставте диск [$_W_expected_volname]" ;; zh_CN*) w_warn " [$_W_volname] 光盘插入错误，请插入光盘 [$_W_expected_volname]" ;; zh_TW*|zh_HK*) w_warn " [$_W_volname] 光碟插入錯誤，請插入光碟 [$_W_expected_volname]" ;; *) w_warn "Wrong disc [$_W_volname] inserted. Please insert disc [$_W_expected_volname]" ;; @@ -3729,6 +3803,7 @@ winetricks_mount_real_volume() da*)_W_mountmsg="Indsæt venligst disken '$_W_expected_volname' (krævet af pakken '$_PACKAGE')" ;; de*)_W_mountmsg="Bitte Disk '$_W_expected_volname' einlegen (für Paket '$W_PACKAGE')" ;; pl*) _W_mountmsg="Proszę włożyć dysk '$_W_expected_volname' (potrzebny paczce '$W_PACKAGE')" ;; + ru*) _W_mountmsg="Пожалуйста, вставьте том '$_W_expected_volname' (требуется для пакета '$W_PACKAGE')" ;; uk*) _W_mountmsg="Будь ласка, вставте том '$_W_expected_volname' (потрібний для пакунка '$W_PACKAGE')" ;; zh_CN*) _W_mountmsg="请插入卷 '$_W_expected_volname' (为包 '$W_PACKAGE 所需')" ;; zh_TW*|zh_HK*) _W_mountmsg="請插入卷 '$_W_expected_volname' (為包 '$W_PACKAGE 所需')" ;; @@ -3797,6 +3872,8 @@ winetricks_set_unattended() W_UNATTENDED_SLASH_Q="/q" W_UNATTENDED_SLASH_QN="/qn" W_UNATTENDED_SLASH_QNT="/qnt" + W_UNATTENDED_SLASH_QT="/qt" + W_UNATTENDED_SLASH_QUIET="/quiet" W_UNATTENDED_SLASH_S="/S" W_UNATTENDED_DASH_SILENT="-silent" W_UNATTENDED_SLASH_SILENT="/silent" @@ -3807,6 +3884,8 @@ winetricks_set_unattended() W_UNATTENDED_SLASH_Q="" W_UNATTENDED_SLASH_QN="" W_UNATTENDED_SLASH_QNT="" + W_UNATTENDED_SLASH_QT="" + W_UNATTENDED_SLASH_QUIET="" W_UNATTENDED_SLASH_S="" W_UNATTENDED_DASH_SILENT="" W_UNATTENDED_SLASH_SILENT="" @@ -4102,7 +4181,7 @@ winetricks_init() unset _abswine ;; esac - winetricks_set_wineprefix + winetricks_set_wineprefix $1 # FIXME: don't hardcode W_PROGRAMS_DRIVE=c @@ -4265,7 +4344,13 @@ then shift done - winetricks_init + # Workaround for https://github.com/Winetricks/winetricks/issues/599 + # If --isolate is used, pass verb to winetricks_init, so it can set the wineprefix using winetricks_set_wineprefix() + # Otherwise, an arch mismatch between ${WINEPREFIX:-$HOME/.wine} and the prefix to be made for the isolated app would cause it to fail + case $WINETRICKS_OPT_SHAREDPREFIX in + 0) winetricks_init $1 ;; + *) winetricks_init ;; + esac fi winetricks_install_app() @@ -4274,6 +4359,7 @@ winetricks_install_app() da*) fail_msg="Installationen af pakken $1 fejlede" ;; de*) fail_msg="Installieren von Paket $1 gescheitert" ;; pl*) fail_msg="Niepowodzenie przy instalacji paczki $1" ;; + ru*) fail_msg="Ошибка установки пакета $1" ;; uk*) fail_msg="Помилка встановлення пакунка $1" ;; zh_CN*) fail_msg="$1 安装失败" ;; zh_TW*|zh_HK*) fail_msg="$1 安裝失敗" ;; @@ -4507,8 +4593,8 @@ w_metadata cmd dlls \ load_cmd() { - w_download http://download.microsoft.com/download/8/d/c/8dc79965-dfbc-4b25-9546-e23bc4b791c6/Q811493_W2K_SP4_X86_EN.exe ac6e28cfd12942e74aa08bddf7715705edb85b6b - w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_CACHE"/cmd/Q811493_W2K_SP4_X86_EN.exe -F cmd.exe + w_download ftp://ftp.sunet.se/pub/security/vendor/microsoft/win2000/Security_Bulletins/Q811493_W2K_SP4_X86_EN.exe ac6e28cfd12942e74aa08bddf7715705edb85b6b + w_try_cabextract --directory="$W_SYSTEM32_DLLS" "$W_CACHE/$W_PACKAGE/$file1" -F cmd.exe w_override_dlls native,builtin cmd.exe } @@ -5446,7 +5532,7 @@ load_dotnet20() # FIXME: verify on pristine windows XP: if w_workaround_wine_bug 34803 then - "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled' + "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled' /f fi cd "$W_CACHE"/"$W_PACKAGE" @@ -5625,7 +5711,7 @@ load_dotnet20sp2() # FIXME: verify on pristine windows XP: if w_workaround_wine_bug 34803 then - "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled' + "$WINE" reg delete 'HKLM\Software\Microsoft\.NETFramework\v2.0.50727\SBSDisabled' /f fi cd "$W_CACHE/$W_PACKAGE" @@ -5812,7 +5898,7 @@ load_dotnet35() w_call msxml3 fi - "$WINE" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5" + "$WINE" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v3.5" /f # See also http://blogs.msdn.com/astebner/archive/2008/07/17/8745415.aspx cd "$W_TMP" @@ -6535,6 +6621,33 @@ load_jet40() #---------------------------------------------------------------- +w_metadata ie8_kb2936068 dlls \ + title="Cumulative Security Update for Internet Explorer 8" \ + publisher="Microsoft" \ + year="2014" \ + media="download" \ + file1="IE8-WindowsXP-KB2936068-x86-ENU.exe" \ + installed_file1="c:/windows/KB2936068-IE8.log" + +load_ie8_kb2936068() +{ + w_call ie8 + + w_download https://download.microsoft.com/download/3/8/C/38CE0ABB-01FD-4C0A-A569-BC5E82C34A17/IE8-WindowsXP-KB2936068-x86-ENU.exe 1bdeb741085b8f1ef6efc83f8615121373107347 + + if [ $W_UNATTENDED_SLASH_Q ] + then + quiet="$W_UNATTENDED_SLASH_QUIET /forcerestart" + else + quiet="" + fi + + cd "$W_CACHE"/"$W_PACKAGE" + w_try "$WINE" IE8-WindowsXP-KB2936068-x86-ENU.exe $quiet +} + +#---------------------------------------------------------------- + w_metadata kde apps \ title="KDE on Windows" \ publisher="various" \ @@ -6561,15 +6674,15 @@ load_kde() w_metadata kindle apps \ title="Amazon Kindle" \ publisher="Amazon" \ - year="2015" \ + year="2016" \ media="download" \ - file1="KindleForPC-installer-1.13.42039.exe" \ + file1="KindleForPC-installer-1.15.43061.exe" \ installed_exe1="$W_PROGRAMS_WIN/Amazon/Kindle/Kindle.exe" \ homepage="http://www.amazon.com/gp/feature.html/?docId=1000426311" load_kindle() { - w_download http://kindleforpc.amazon.com/42039/KindleForPC-installer-1.13.42039.exe 2316102823d295fb346062e03a8bb594b93cb536 + w_download http://kindleforpc.amazon.com/43061/KindleForPC-installer-1.15.43061.exe 27364a6867aac562426494312c2b3f4b673f13e2 cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S} @@ -8540,7 +8653,7 @@ load_xna31() w_call dotnet20sp2 w_download http://download.microsoft.com/download/5/9/1/5912526C-B950-4662-99B6-119A83E60E5C/xnafx31_redist.msi bdd33b677c9576a63ff2a6f65e12c0563cc116e6 cd "$W_CACHE/$W_PACKAGE" - w_try "$WINE" msiexec ${W_OPT_UNATTENDED:+/quiet} /i $file1 + w_try "$WINE" msiexec $W_UNATTENDED_SLASH_QUIET /i $file1 } #---------------------------------------------------------------- @@ -8560,7 +8673,7 @@ load_xna40() # http://www.microsoft.com/en-us/download/details.aspx?id=20914 w_download http://download.microsoft.com/download/A/C/2/AC2C903B-E6E8-42C2-9FD7-BEBAC362A930/xnafx40_redist.msi 49efdc29f65fc8263c196338552c7009fc96c5de cd "$W_CACHE/$W_PACKAGE" - w_try "$WINE" msiexec ${W_OPT_UNATTENDED:+/quiet} /i $file1 + w_try "$WINE" msiexec $W_UNATTENDED_SLASH_QUIET /i $file1 } #---------------------------------------------------------------- @@ -9506,11 +9619,7 @@ load_controlpad() echo "If setup says 'Unable to start DDE ...', press Ignore" cd "$W_TMP" - case "$W_UNATTENDED_SLASH_Q" in - "") quiet="" ;; - *) quiet="/qt" - esac - w_try "$WINE" setup $quiet + w_try "$WINE" setup $W_UNATTENDED_SLASH_QT if ! test -f "$W_SYSTEM32_DLLS"/FM20.DLL then @@ -9588,6 +9697,46 @@ load_emu8086() #---------------------------------------------------------------- +w_metadata ev3 apps \ + title="Lego Mindstorms EV3 Home Edition" \ + publisher="Lego" \ + year="2014" \ + media="download" \ + file1="LMS-EV3-WIN32-ENUS-01-01-01-full-setup.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/LEGO Software/LEGO MINDSTORMS EV3 Home Edition/MindstormsEV3.exe" + +load_ev3() +{ + if w_workaround_wine_bug 40192 "Installing vcrun2005 as Wine does not have MFC80.dll" + then + w_call vcrun2005 + fi + + if w_workaround_wine_bug 40193 "Installing IE8 is built-in Gecko is not sufficient" + then + w_call ie8 + fi + + w_call dotnet40 + + w_download http://esd.lego.com.edgesuite.net/digitaldelivery/mindstorms/6ecda7c2-1189-4816-b2dd-440e22d65814/public/LMS-EV3-WIN32-ENUS-01-01-01-full-setup.exe 855c914d9a3cf0f4793a046872658fd661389671 + + cd "$W_CACHE"/"$W_PACKAGE" + w_try "$WINE" LMS-EV3-WIN32-ENUS-01-01-01-full-setup.exe + + if w_workaround_wine_bug 40174 "Setting override for urlmon.dll to native to avoid crash" + then + w_override_dlls native urlmon + fi + + if w_workaround_wine_bug 34897 "Installing update KB2936068 to work around bug 34897" + then + w_call ie8_kb2936068 + fi +} + +#---------------------------------------------------------------- + w_metadata firefox apps \ title="Firefox 39.0" \ publisher="Mozilla" \ @@ -9736,8 +9885,8 @@ w_metadata ie6 dlls \ title="Internet Explorer 6" \ publisher="Microsoft" \ year="2002" \ - media="manual_download" \ - file1="msie60.exe" \ + media="download" \ + file1="ie60.exe" \ installed_file1="c:/Program Files/Internet Explorer/iedetect.dll" load_ie6() @@ -9748,10 +9897,10 @@ load_ie6() w_die "This package does not work on a 64-bit installation" fi - w_download_manual http://www.oldversion.com/download-Internet-Explorer-6.0.html msie60.exe 8e483db28ff01a7cabd39147ab6c59753ea1f533 + w_download http://download.oldapps.com/Internet_Explorer/ie60.exe 8e483db28ff01a7cabd39147ab6c59753ea1f533 cd "$W_TMP" - "$WINE" "$W_CACHE"/ie6/$file1 + "$WINE" "$W_CACHE"/"$W_PACKAGE"/$file1 w_call msls31 @@ -9885,15 +10034,9 @@ load_ie7() # Install w_download http://download.microsoft.com/download/3/8/8/38889DC1-848C-4BF2-8335-86C573AD86D9/IE7-WindowsXP-x86-enu.exe d39b89c360fbaa9706b5181ae4718100687a5326 - if test "$W_UNATTENDED_SLASH_Q" = "" - then - quiet="" - else - quiet="/quiet" - fi cd "$W_CACHE/$W_PACKAGE" - "$WINE" IE7-WindowsXP-x86-enu.exe $quiet + "$WINE" IE7-WindowsXP-x86-enu.exe $W_UNATTENDED_SLASH_QUIET # IE7 exits with 194 to signal a reboot status=$? @@ -9990,9 +10133,9 @@ load_ie8() w_try cp -f "$W_CACHE"/ie8/winetest.cat "$W_SYSTEM32_DLLS"/catroot/\{f750e6c3-38ee-11d1-85e5-00c04fc295ee\}/oem0.cat w_download http://download.microsoft.com/download/C/C/0/CC0BD555-33DD-411E-936B-73AC6F95AE11/IE8-WindowsXP-x86-ENU.exe e489483e5001f95da04e1ebf3c664173baef3e26 - if [ $W_UNATTENDED_SLASH_Q ] + if [ $W_UNATTENDED_SLASH_QUIET ] then - quiet="/quiet /forcerestart" + quiet="$W_UNATTENDED_SLASH_QUIET /forcerestart" else quiet="" fi @@ -18560,7 +18703,7 @@ execute_command() # Hard-coded verbs main) WINETRICKS_CURMENU=main ;; - help) w_open_webpage http://winetricks.org/help ;; + help) w_open_webpage https://code.google.com/archive/p/winetricks/wikis ;; list) winetricks_list_all ;; list-cached) winetricks_list_cached ;; list-download) winetricks_list_download ;;