diff --git a/wine-1.9.1.tar.bz2 b/wine-1.9.1.tar.bz2 deleted file mode 100644 index cb0b338..0000000 --- a/wine-1.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b3265fb9ae82ddf1b3629bac61bd2340b7b4cfa7210f696c679e8e4a5b80bb6 -size 22909563 diff --git a/wine-1.9.1.tar.bz2.sign b/wine-1.9.1.tar.bz2.sign deleted file mode 100644 index dd3cf10..0000000 --- a/wine-1.9.1.tar.bz2.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJWkNNhAAoJEM76yOqvF1Gdg6MP/Rp6euY1HMsw6X5pfbEndZKb -mzQ8q2xy0uINj11T5PQR3tFdBiTe87ukPL8l9G/sVuYVA/1DG7RtiPC6YeD6LAry -2DwNqyxcqdxQlZ/7tWhcMXd6/sDZKj/DgVC1wBtMPdfPcTB1cMsVnFE67+rzrzdv -f0ONEEGEAUcD2Xjpt0fdV6l8KXLMeeM6QfYJJas7qR/ENjhj2rjGIT+A8maW2TVG -A+SkhzrPODz+3yOKnMsZgM0P9sGFiLgw4cw7GJ1v7ksvIatAfM5Krdj5nldNOf9J -E8BBqaseXYx7P2nQ1UQDeQ70qEOovGUxpaDlqrnK3TkmITMWM23qJr56XLuRNCbG -g/BMF6zYnmj7AbjLd7em410yQQlZx2n6QbLBT7RxUtp4a8jFzXZ7KjvHqx5Qwc/i -+8MoqTg5JmL3IcPTec0WVARzAA6wyxwlqrgfORtJ3909QD+fnQO8sSTY7ayjsYyg -AauyEzTcZQHyAKPCW2jgRtuOTRc3yXWPqNAQJsP7j9KntPkytwn7cts+mtWP7zWz -RNQQHK1lJWBRB/IUT0fBo+Sp8cCvbvwimVIBt/ldKE/6f8Q0YwleABvxxTZcfIW+ -ydyfv1caLNP0JCbhhNszUh1HUVFcZ8Bh4oDbbSAqwb/rmZnIU0i5khiVWQYneqI5 -+3RQnJ1DXcOLD3Xle27z -=V0+/ ------END PGP SIGNATURE----- diff --git a/wine-1.9.2.tar.bz2 b/wine-1.9.2.tar.bz2 new file mode 100644 index 0000000..3dd7fb7 --- /dev/null +++ b/wine-1.9.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:334d4d6a71ef2e4a385e01d05d66c1727cbe52646299378d19d203e645044e7a +size 22965698 diff --git a/wine-1.9.2.tar.bz2.sign b/wine-1.9.2.tar.bz2.sign new file mode 100644 index 0000000..3440aae --- /dev/null +++ b/wine-1.9.2.tar.bz2.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJWojy0AAoJEM76yOqvF1GdN+EP/AmKRq2nLT+sxQhyrbKFoIAV +dVqPCHPIMrdI24b0Y6BjXoEXcWeRgMAdoKXEpAkbApWeiJGXg+tOMugAmyCSxzPy +IFkKcLk2YSLFzfEKWUEXgxdbKka+AfNpWZFkuyYWFOi0WwWTPyvepriE7gsmJWhf +jg3kXXvc6DEobUwBk7IaHcPtorxRQ/gWD6RJgiRNiYjRbLIUREQnWoFqiDhRH/Mt +CUYf5GSj6MFdVqENXyEyD+1NMrGaFaDh+yuadpWT/s61z8M5WQHwqvuV5R/J+9xF +PNKv2mpLub5b0gmWjDUFxlZ/r2OmrQ0v0gVSSis1lITrxL7ZLdDOiFiD8JXJTXb6 +paJ71VZLx0XZV9zU5xtjlo8Q5JFagesxfC5Q8+/qqLzW7WdmrXdluv6GbuRCItFm +12wU3rWQFJ0Hjeu4alEgG/qjcM65IEcDUrp+Kj8PkTEl+ld236v44PQxtajbcdpR +J/A1HcDG9YGLRg5/50BZDGk4r8DWLXGCp+Tr1Q7Ke/4h8p+H8hYPd/6WEpQd8qgx +FoU3dmaveSbUuzSxrqZ2mL3N6I+OefCcgxQf850F/p3lgKOCQEbPw36ek8vDHGfx +cJXjS1DALoA9dCqabSoX9j0ZShT5PzugKWV0wD1vHztpEHDN9Lagbq/yvSDFr6Fr +9i5bhEQyOS8+Q8q7qoYM +=tMiC +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 475b012..ce1c142 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jan 22 14:54:12 UTC 2016 - meissner@suse.com + +- Updated to 1.9.2 development snapshot + - GStreamer 1.0 support. + - Support for SHA hashes in BCrypt. + - Synthesizing bold glyphs also for bitmap fonts. + - Underlines support in DirectWrite. + - Still more Shader Model 4 instructions. + - Various bug fixes. + ------------------------------------------------------------------- Tue Jan 12 16:08:11 UTC 2016 - i@marguerite.su diff --git a/wine.spec b/wine.spec index fb951cb..a7f5334 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.1 -Version: 1.9.1 +%define realver 1.9.2 +Version: 1.9.2 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ diff --git a/winetricks b/winetricks index 8b0bf79..6c3ae24 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=20151227 +WINETRICKS_VERSION=20160109 # This is a utf-8 file # You should see an o with two dots over it here [ö] @@ -42,7 +42,7 @@ WINETRICKS_VERSION=20151227 # # Copyright # Copyright (C) 2007-2014 Dan Kegel -# Copyright (C) 2008-2015 Austin English +# Copyright (C) 2008-2016 Austin English # Copyright (C) 2010-2011 Phil Blankenship # Copyright (C) 2010-2015 Shannon VanWagner # Copyright (C) 2010 Belhorma Bendebiche @@ -62,6 +62,7 @@ WINETRICKS_VERSION=20151227 # Copyright (C) 2011 Matthew Bozarth # Copyright (C) 2013-2014 Andrey Gusev # Copyright (C) 2013-2015 Hillwood Yang +# Copyright (C) 2013,2016 André Hentschel # # License # This program is free software; you can redistribute it and/or @@ -400,7 +401,7 @@ w_read_key() mkdir -p "$W_CACHE/$W_PACKAGE" - # backwards compatibile location + # backwards compatible location # Auth doesn't belong in cache, since restoring it requires user input _W_keyfile="$W_CACHE/$W_PACKAGE/key.txt" if ! test -f "$_W_keyfile" @@ -414,7 +415,7 @@ w_read_key() da*) _W_keymsg="Angiv venligst registrerings-nøglen for pakken '$_PACKAGE'" _W_nokeymsg="Ingen nøgle angivet" ;; - de*) _W_keymsg="Bitte einen Key für Pakete '$W_PACKAGE' eingeben" + de*) _W_keymsg="Bitte einen Key für Paket '$W_PACKAGE' eingeben" _W_nokeymsg="Keinen Key eingegeben?" ;; pl*) _W_keymsg="Proszę podać klucz dla programu '$W_PACKAGE'" @@ -882,7 +883,7 @@ w_download_manual_to() case $LANG in 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 diesen Kommando.";; + 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.";; uk*) _W_dlmsg="Будь ласка, звантажте $_W_file з $_W_url, розташуйте в $W_CACHE/$_W_packagename, потім запустіть скрипт знову.";; zh_CN*) _W_dlmsg="请从 $_W_url 下载 $_W_file，并置放于 $W_CACHE/$_W_packagename, 然后重新运行 winetricks.";; @@ -1199,7 +1200,7 @@ fi # other_files # Extra installer files, in one string, space-separated. # reader_control -# If set, the control id of the configuration pannel checkbox controling +# If set, the control id of the configuration panel checkbox controling # Adobe Reader installation. # Some games don't have it, some games do with different ids. # run_command @@ -2482,6 +2483,18 @@ winetricks_prefixmenu() _W_msg_showbroken1="有問題的程式 (例如那些有數字版權問題)" _W_msg_help="檢視輔助說明" ;; + de*) _W_msg_title="Winetricks - wineprefix auswählen" + _W_msg_body='Was möchten Sie tun?' + _W_msg_apps='Eine Programm installieren' + _W_msg_games='Ein Spiel installieren' + _W_msg_benchmarks='Ein Benchmark installieren' + _W_msg_default="Standard wineprefix auswählen" + _W_msg_unattended0="Automatische Installation deaktivieren" + _W_msg_unattended1="Automatische Installation aktivieren" + _W_msg_showbroken0="Defekte Programme nicht anzeigen (z.B. solche mit DRM Problemen)" + _W_msg_showbroken1="Defekte Programme anzeigen (z.B. solche mit DRM Problemen)" + _W_msg_help="Hilfe anzeigen" + ;; *) _W_msg_title="Winetricks - choose a wineprefix" _W_msg_body='What do you want to do?' _W_msg_apps='Install an app' @@ -2540,6 +2553,7 @@ winetricks_prefixmenu() case $LANG in zh_CN*) printf %s " FALSE prefix='$p' '选择管理 $_W_msg_name' " ;; zh_TW*|zh_HK*) printf %s " FALSE prefix='$p' '選擇管理 $_W_msg_name' " ;; + de*) printf %s " FALSE prefix='$p' '$_W_msg_name auswählen' " ;; *) printf %s " FALSE prefix='$p' 'Select $_W_msg_name' " ;; esac done >> "$WINETRICKS_WORKDIR"/zenity.sh @@ -2605,14 +2619,14 @@ winetricks_mainmenu() _W_msg_body='Was möchten Sie tun?' _W_msg_dlls="Windows-DLL installieren" _W_msg_fonts='Schriftart installieren' - _W_msg_settings='Change Wine settings' - _W_msg_winecfg='Run winecfg' - _W_msg_regedit='Run regedit' - _W_msg_taskmgr='Run taskmgr' - _W_msg_uninstaller='Run uninstaller' - _W_msg_shell='Run a commandline shell (for debugging)' - _W_msg_folder='Browse files' - _W_msg_annihilate="Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX" + _W_msg_settings='Wine Einstellungen ändern' + _W_msg_winecfg='winecfg starten' + _W_msg_regedit='regedit starten' + _W_msg_taskmgr='taskmgr starten' + _W_msg_uninstaller='uninstaller starten' + _W_msg_shell='Eine Kommandozeile zum debuggen starten' + _W_msg_folder='Ordner durchsuchen' + _W_msg_annihilate="ALLE DATEIEN UND PROGRAMME IN DIESEM WINEPREFIX Löschen" ;; pl*) _W_msg_title="Winetricks - obecny prefiks to \"$WINEPREFIX\"" _W_msg_body='What would you like to do to this wineprefix?' @@ -2648,7 +2662,7 @@ winetricks_mainmenu() _W_msg_winecfg='运行 winecfg' _W_msg_regedit='运行注册表' _W_msg_taskmgr='运行任务管理器' - _W_msg_uninstaller='Run uninstaller' + _W_msg_uninstaller='运行卸载程序' _W_msg_shell='运行命令提示窗口 (作为调试)' _W_msg_folder='浏览容器中的文件' _W_msg_annihilate="删除当前容器所有相关文件，包括启动器，完全卸载" @@ -2661,7 +2675,7 @@ winetricks_mainmenu() _W_msg_winecfg='執行 winecfg' _W_msg_regedit='執行註冊表' _W_msg_taskmgr='執行工作管理者' - _W_msg_uninstaller='Run uninstaller' + _W_msg_uninstaller='執行反安裝程式' _W_msg_shell='執行指令輔助說明視窗 (作為除錯)' _W_msg_folder='瀏覽容器中的檔案' _W_msg_annihilate="移除目前容器所有相依檔案，包括啟動器，完全卸載" @@ -2740,8 +2754,8 @@ winetricks_settings_menu() da*) _W_msg_title='Vælg en pakke' _W_msg_body='Which settings would you like to change?' ;; - de*) _W_msg_title='Pakete auswählen' - _W_msg_body='Which settings would you like to change?' + de*) _W_msg_title="Winetricks - Aktueller Prefix ist \"$WINEPREFIX\"" + _W_msg_body='Welche Einstellungen möchten Sie ändern?' ;; pl*) _W_msg_title="Winetricks - obecny prefiks to \"$WINEPREFIX\"" _W_msg_body='Which settings would you like to change?' @@ -2781,7 +2795,7 @@ winetricks_settings_menu() --list \ --checklist \ --column '' \ - --column Paket \ + --column Einstellung \ --column Name \ --height $WINETRICKS_MENU_HEIGHT \ --width $WINETRICKS_MENU_WIDTH \ @@ -2893,8 +2907,8 @@ winetricks_showmenu() _W_msg_body='Vilken pakke vil du installere?' _W_cached="cached" ;; - de*) _W_msg_title='Pakete auswählen' - _W_msg_body='Welche Pakete möchten Sie installieren?' + de*) _W_msg_title="Winetricks - Aktueller Prefix ist \"$WINEPREFIX\"" + _W_msg_body='Welche Paket(e) möchten Sie installieren?' _W_cached="gecached" ;; pl*) _W_msg_title="Winetricks - obecny prefiks to \"$WINEPREFIX\"" @@ -3181,7 +3195,7 @@ winetricks_is_installed() esac if test -d "$_W_prefix/dosdevices" then - # 'win7 vcrun2005' creates diffrent file than 'winxp vcrun2005' + # 'win7 vcrun2005' creates different file than 'winxp vcrun2005' # so let it specify multiple, separated by | _W_IFS="$IFS" IFS='|' @@ -3740,7 +3754,7 @@ winetricks_mount_real_volume() case $LANG in da*)_W_mountmsg="Indsæt venligst disken '$_W_expected_volname' (krævet af pakken '$_PACKAGE')" ;; - de*)_W_mountmsg="Disc '$_W_expected_volname' bitte einlegen (für Pakete '$W_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')" ;; uk*) _W_mountmsg="Будь ласка, вставте том '$_W_expected_volname' (потрібний для пакунка '$W_PACKAGE')" ;; zh_CN*) _W_mountmsg="请插入卷 '$_W_expected_volname' (为包 '$W_PACKAGE 所需')" ;; @@ -3824,7 +3838,7 @@ winetricks_set_unattended() } # Usage: winetricks_set_wineprefix [bottlename] -# Bottlename must not contain spaces, slashes, or other special charaters +# Bottlename must not contain spaces, slashes, or other special characters # If bottlename is omitted, the default bottle (~/.wine) is used. winetricks_set_wineprefix() { @@ -4049,15 +4063,14 @@ winetricks_init() ;; *) WINE="${WINE:-wine}" - # Find wineserver. Some distros (Debian) don't have it on the path, - # on the mistaken understanding that user scripts never need it :-( - # If wineserver is from wine-development set WINE to wine-development. - # FIXME: get packagers to put wineserver on the path. + # Find wineserver. + # Some distros (Debian before wine 1.8-2) don't have it on the path. for x in \ "$WINESERVER" \ "${WINE}server" \ "`which wineserver 2> /dev/null`" \ "`dirname $WINE`/server/wineserver" \ + /usr/bin/wineserver-development \ /usr/lib/wine/wineserver \ /usr/lib/i386-kfreebsd-gnu/wine/wineserver \ /usr/lib/i386-linux-gnu/wine/wineserver \ @@ -4075,7 +4088,7 @@ winetricks_init() if test -x "$x" then case "$x" in - /usr/lib/*/wine-development/wineserver) + /usr/lib/*/wine-development/wineserver|/usr/bin/wineserver-development) if test -x /usr/bin/wine-development then WINE="/usr/bin/wine-development" @@ -4163,24 +4176,37 @@ _EOF_ ;; de*) cat <<_EOF_ -Usage: $0 [options] [verb|path-to-verb] ... +Benutzung: $0 [options] [Kommando|Verb|Pfad-zu-Verb] ... Angegebene Verben ausführen. -Jeder Verb installiert z.B. eine Anwendung oder ändert eine Einstellung. +Jedes Verb installiert eine Anwendung oder ändert eine Einstellung. + Optionen: --k|--keep_isos: isos local speichern (erlaubt spätere Installierung ohne Disk) --q|--unattended: keine Fragen stellen, alles automatisch installieren --r|--ddrescue: alternative Zugriffsmodus (hilft bei gekratzten Disks) --v|--verbose: alle ausgeführten Kommandos anzeigen --V|--version: Programmversion anzeigen --h|--help: diese Hilfemeldung anzeigen -Verben: -apps: Typ 'Andwendungen' auswählen -games: Typ 'Spiele' auswählen -list: Verben von ausgewählte Typ auflisten -list-cached: Verben für schon gecachte Installers auflisten -list-download: Verben für herunterladbare Anwendungen auflisten -list-manual-download: list applications which can be downloaded with some help from the user -list-installed: Verben für schon installlierte Programme auflisten + --force Nicht prüfen ob Pakete bereits installiert wurden + --gui GUI Diagnosen anzeigen, auch wenn von der Kommandozeile gestartet + --isolate Jedes Programm oder Spiel in eigener Bottle (WINEPREFIX) installieren +-k, --keep_isos ISOs local speichern (erlaubt spätere Installation ohne Disk) + --no-clean Temp Verzeichnisse nicht löschen (nützlich beim debuggen) +-q, --unattended Keine Fragen stellen, alles automatisch installieren +-r, --ddrescue Alternativer Zugriffsmodus (hilft bei zerkratzten Disks) + --showbroken Auch Verben anzeigen die momentan in Wine nicht funktionieren + --verify Wenn Möglisch automatische GUI Tests für Verben starten +-v, --verbose Alle ausgeführten Kommandos anzeigen +-h, --help Diese Hilfemeldung anzeigen +-V, --version Programmversion anzeigen und Beenden + +Kommandos: +list Kategorien auflisten +list-all Alle Kategorien und deren Verben auflisten +apps list Verben der Kategorie 'Anwendungen' auflisten +benchmarks list Verben der Kategorie 'Benchmarks' auflisten +dlls list Verben der Kategorie 'DLLs' auflisten +games list Verben der Kategorie 'Spiele' auflisten +settings list Verben der Kategorie 'Einstellungen' auflisten +list-cached Verben für bereits gecachte Installers auflisten +list-download Verben für automatisch herunterladbare Anwendungen auflisten +list-manual-download Verben für vom Benutzer herunterladbare Anwendungen auflisten +list-installed Bereits installierte Verben auflisten +prefix=foobar WINEPREFIX=$W_PREFIXES_ROOT/foobar auswählen _EOF_ ;; *) @@ -4269,7 +4295,7 @@ winetricks_install_app() { case $LANG in da*) fail_msg="Installationen af pakken $1 fejlede" ;; - de*) fail_msg="Installieren von Pakete $1 gescheitert" ;; + de*) fail_msg="Installieren von Paket $1 gescheitert" ;; pl*) fail_msg="Niepowodzenie przy instalacji paczki $1" ;; uk*) fail_msg="Помилка встановлення пакунка $1" ;; zh_CN*) fail_msg="$1 安装失败" ;; @@ -6627,7 +6653,11 @@ load_kindle() w_download http://kindleforpc.amazon.com/42039/KindleForPC-installer-1.13.42039.exe 2316102823d295fb346062e03a8bb594b93cb536 cd "$W_CACHE"/kindle w_try "$WINE" $file1 ${W_OPT_UNATTENDED:+ /S} - w_declare_exe "$W_PROGRAMS_WIN\\Amazon\\Kindle" Kindle.exe + + if w_workaround_wine_bug 39980 "Installing native vcrun2008" + then + w_call vcrun2008 + fi } #---------------------------------------------------------------- @@ -8255,9 +8285,10 @@ load_vcrun2015() cp "$W_TMP"/vcomp140.dll "$W_SYSTEM32_DLLS"/vcomp140.dll cp "$W_TMP"/vcruntime140.dll "$W_SYSTEM32_DLLS"/vcruntime140.dll - w_override_dlls native,builtin api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 ucrtbase vcruntime140 + w_override_dlls native,builtin api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0.dll api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 ucrtbase vcruntime140 cp "$W_TMP"/api_ms_win_crt_heap_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-heap-l1-1-0.dll cp "$W_TMP"/api_ms_win_crt_locale_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-locale-l1-1-0.dll + cp "$W_TMP"/api_ms_win_crt_math_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-math-l1-1-0.dll cp "$W_TMP"/api_ms_win_crt_runtime_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-runtime-l1-1-0.dll cp "$W_TMP"/api_ms_win_crt_stdio_l1_1_0.dll "$W_SYSTEM32_DLLS"/api-ms-win-crt-stdio-l1-1-0.dll cp "$W_TMP"/ucrtbase.dll "$W_SYSTEM32_DLLS"/ucrtbase.dll @@ -8287,9 +8318,10 @@ load_vcrun2015() cp "$W_TMP"/vcomp140.dll "$W_SYSTEM64_DLLS"/vcomp140.dll cp "$W_TMP"/vcruntime140.dll "$W_SYSTEM64_DLLS"/vcruntime140.dll - w_override_dlls native,builtin api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 ucrtbase vcruntime140 + w_override_dlls native,builtin api-ms-win-crt-heap-l1-1-0 api-ms-win-crt-locale-l1-1-0 api-ms-win-crt-math-l1-1-0.dll api-ms-win-crt-runtime-l1-1-0 api-ms-win-crt-stdio-l1-1-0 ucrtbase vcruntime140 cp "$W_TMP"/api_ms_win_crt_heap_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-heap-l1-1-0.dll cp "$W_TMP"/api_ms_win_crt_locale_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-locale-l1-1-0.dll + cp "$W_TMP"/api_ms_win_crt_math_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-math-l1-1-0.dll cp "$W_TMP"/api_ms_win_crt_runtime_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-runtime-l1-1-0.dll cp "$W_TMP"/api_ms_win_crt_stdio_l1_1_0.dll "$W_SYSTEM64_DLLS"/api-ms-win-crt-stdio-l1-1-0.dll cp "$W_TMP"/ucrtbase.dll "$W_SYSTEM64_DLLS"/ucrtbase.dll @@ -8862,17 +8894,17 @@ w_metadata corefonts fonts \ load_corefonts() { # FIXME: why is this commented out? Should be removed or enabled. - #w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/andale32.exe c4db8cbe42c566d12468f5fdad38c43721844c69 - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/arial32.exe 6d75f8436f39ab2da5c31ce651b7443b4ad2916e - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/arialb32.exe d45cdab84b7f4c1efd6d1b369f50ed0390e3d344 - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/comic32.exe 2371d0327683dcc5ec1684fe7c275a8de1ef9a51 - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/courie32.exe 06a745023c034f88b4135f5e294fece1a3c1b057 - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/georgi32.exe 90e4070cb356f1d811acb943080bf97e419a8f1e - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/impact32.exe 86b34d650cfbbe5d3512d49d2545f7509a55aad2 - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/times32.exe 20b79e65cdef4e2d7195f84da202499e3aa83060 - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/trebuc32.exe 50aab0988423efcc9cf21fac7d64d534d6d0a34a - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/verdan32.exe f5b93cedf500edc67502f116578123618c64a42a - w_download http://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/webdin32.exe 2fb4a42c53e50bc70707a7b3c57baf62ba58398f + #w_download ftp://ftp.fi.debian.org/gentoo/distfiles/andale32.exe c4db8cbe42c566d12468f5fdad38c43721844c69 + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/arial32.exe 6d75f8436f39ab2da5c31ce651b7443b4ad2916e + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/arialb32.exe d45cdab84b7f4c1efd6d1b369f50ed0390e3d344 + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/comic32.exe 2371d0327683dcc5ec1684fe7c275a8de1ef9a51 + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/courie32.exe 06a745023c034f88b4135f5e294fece1a3c1b057 + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/georgi32.exe 90e4070cb356f1d811acb943080bf97e419a8f1e + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/impact32.exe 86b34d650cfbbe5d3512d49d2545f7509a55aad2 + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/times32.exe 20b79e65cdef4e2d7195f84da202499e3aa83060 + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/trebuc32.exe 50aab0988423efcc9cf21fac7d64d534d6d0a34a + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/verdan32.exe f5b93cedf500edc67502f116578123618c64a42a + w_download ftp://ftp.fi.debian.org/gentoo/distfiles/webdin32.exe 2fb4a42c53e50bc70707a7b3c57baf62ba58398f # Natively installed versions of these fonts will cause the installers # to exit silently. Because there are apps out there that depend on the @@ -10044,7 +10076,7 @@ load_ie7() # Change the override to the native so we are sure we use and register them w_override_dlls native,builtin itircl itss jscript mshtml msimtf shdoclc shdocvw shlwapi urlmon wininet xmllite - # IE7 installer will check version the number of iexplore.exe which causes IE7 installer to fail on wine-1.9.0+ + # IE7 installer will check the version number of iexplore.exe which causes IE7 installer to fail on wine-1.9.0+ w_override_dlls native iexplore.exe # Bundled updspapi cannot work on wine @@ -10159,7 +10191,7 @@ load_ie8() # Change the override to the native so we are sure we use and register them w_override_dlls native,builtin itircl itss jscript msctf mshtml shdoclc shdocvw shlwapi urlmon wininet xmllite - # IE8 installer will check version the number of iexplore.exe which causes IE8 installer to fail on wine-1.9.0+ + # IE8 installer will check the version number of iexplore.exe which causes IE8 installer to fail on wine-1.9.0+ w_override_dlls native iexplore.exe # Bundled updspapi cannot work on wine @@ -10523,7 +10555,9 @@ load_picasa39() { # 2015/01/17: 39b2df46dbc423e250371e826026a2827f55b956 # 2015/09/21: 55907fc84b1d9d6a450463869b16927f07737298 - w_download http://dl.google.com/picasa/picasa39-setup.exe 55907fc84b1d9d6a450463869b16927f07737298 + # 2016/01/02: b3f7e2ee168811cb1d924eb34afe2b0d8153f89f + + w_download http://dl.google.com/picasa/picasa39-setup.exe b3f7e2ee168811cb1d924eb34afe2b0d8153f89f if w_workaround_wine_bug 29434 "Picasa 3.9 fails to authenticate with Google" then w_warn "Picasa 3.9 authentication to the Google account is currently broken under wine. See http://bugs.winehq.org/show_bug.cgi?id=29434 for more details." @@ -11234,7 +11268,7 @@ load_vc2005trial() then w_call msxml6 fi - # Without mfc42.dll, pidgen.dll won't load, and the app claims "A trial edition is alread installed..." + # Without mfc42.dll, pidgen.dll won't load, and the app claims "A trial edition is already installed..." w_call mfc42 w_download http://download.microsoft.com/download/6/f/5/6f5f7a01-50bb-422d-8742-c099c8896969/En_vs_2005_vsts_180_Trial.img f66ae07618d67e693ca0524d3582208c20e07823 @@ -14155,7 +14189,7 @@ load_dragonage_ue() w_mount DRAGONAGE Setup.exe 1 - # Annoyingly, it runs a webrowser so you can activate the extra stuff. Disable that, and w_warn the user after install: + # Annoyingly, it runs a webbrowser so you can activate the extra stuff. Disable that, and w_warn the user after install: WINEDLLOVERRIDES="winebrowser.exe=" export WINEDLLOVERRIDES @@ -16505,31 +16539,26 @@ load_popfs() #---------------------------------------------------------------- w_metadata qq apps \ - title="QQ 7.1 (Chinese chat app)" \ + title="QQ 8.0(Chinese chat app)" \ publisher="Tencent" \ year="2015" \ media="download" \ - file1="QQ7.1.exe" \ + file1="QQ8.0.exe" \ file2="QQ.tar.gz"\ - installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQ/Bin/QQ.exe" \ + installed_exe1="$W_PROGRAMS_X86_WIN/Tencent/QQ/Bin/QQScLauncher.exe" \ homepage="http://www.qq.com" \ unattended="no" load_qq() { - w_download http://dldir1.qq.com/qqfile/qq/QQ7.1/14522/QQ7.1.exe 700b469560b1bd8521ede61a0e169ff8c38b1d29 + w_download http://dldir1.qq.com/qqfile/qq/QQ8.0/16968/QQ8.0.exe ef92f3863113971c95a79aa75e601893d803826c w_download http://hillwoodhome.net/wine/QQ.tar.gz 08de45d3e5bb34b22e7c33e1163daec69742db58 - if w_workaround_wine_bug 29636 "Installing native riched20 to work around crash bug" + if w_workaround_wine_bug 5162 "Installing native riched20 to work around can't input username." then w_call riched20 fi - if w_workaround_wine_bug 34566 "Installing native ctf to work around crash" - then - w_call msctf - fi - # Make sure chinese fonts are available w_call fakechinese @@ -16546,12 +16575,23 @@ load_qq() w_try mv QQ/腾讯QQ.desktop ~/.local/share/applications/wine/Programs/腾讯软件/QQ w_try mv QQ/48x48/QQ.png ~/.local/share/icons/hicolor/48x48/apps w_try mv QQ/256x256/QQ.png ~/.local/share/icons/hicolor/256x256/apps - echo Exec=env WINEPREFIX=$WINEPREFIX $WINE C:\/Program\\ Files\/Tencent\/QQ\/Bin\/QQ.exe >> $HOME/.local/share/applications/wine/Programs/腾讯软件/QQ/腾讯QQ.desktop + echo Exec=env WINEPREFIX="$WINEPREFIX" "$WINE" $W_PROGRAMS_X86_WIN\/Tencent\/QQ\/bin\/QQScLauncher.exe >> $HOME/.local/share/applications/wine/Programs/腾讯软件/QQ/腾讯QQ.desktop + fi + + if w_workaround_wine_bug 39657 "Disable ntoskrnl.exe to work around can't be started bug" + then + w_override_dlls disabled ntoskrnl.exe + fi + + if w_workaround_wine_bug 37680 "Disable txplatform.exe to work around QQ can't be quit cleanly" + then + w_override_dlls disabled txplatform.exe fi cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" "$file1" - w_declare_exe "$W_PROGRAMS_X86_WIN\\Tencent\\QQ\\Bin" QQ.exe + + w_declare_exe "$W_PROGRAMS_X86_WIN\\Tencent\\QQ\\Bin" QQScLauncher.exe } #---------------------------------------------------------------- @@ -16585,6 +16625,11 @@ load_qqintl() w_call wininet fi + if w_workaround_wine_bug 37680 "Disable txplatform.exe to work around QQ can't be quit cleanly" + then + w_override_dlls disabled txplatform.exe + fi + # Make sure chinese fonts are available w_call fakechinese @@ -19584,6 +19629,12 @@ winetricks_stats_init() case $WINETRICKS_GUI in zenity) case $LANG in + de*) + title="Einmalige Frage zur Hilfe an der Winetricks Entwicklung" + question="Möchten Sie die Winetricks Entwicklung unterstützen indem Sie Winetricks Statistiken übermitteln lassen? Sie können die Übermittlung jederzeit mit 'winetricks --optout' ausschalten" + thanks="Danke! Sie bekommen diese Frage nicht mehr gestellt. Sie können die Übermittlung jederzeit mit 'winetricks --optout' wieder ausschalten" + declined="OK, Winetricks wird *keine* Statistiken übermitteln. Sie bekommen diese Frage nicht mehr gestellt." + ;; *) title="One-time question about helping Winetricks development" question="Would you like to help winetricks development by letting winetricks report statistics? You can turn reporting off at any time with the command 'winetricks --optout'"