diff --git a/wine-3.7.tar.xz b/wine-3.7.tar.xz deleted file mode 100644 index cd01320..0000000 --- a/wine-3.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76c73760d72497c59e81dfd7c5def450171bd59e9cff3df0a42454e0c7fc2bb7 -size 20454036 diff --git a/wine-3.7.tar.xz.sign b/wine-3.7.tar.xz.sign deleted file mode 100644 index 90234a5..0000000 --- a/wine-3.7.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlrjaxMACgkQzvrI6q8X -UZ3T4A/+J/6/gdbpcO/ZNtuOI3taWe3IysyO8gBjvZ5XWLqP50Llhaq4hSzeXLq5 -DQjCMoVC/irp3E2E8dibrRWTEgKq7DyEK/7XYOQ6Bg/yqh93uDOJTpbLZNN51Bb+ -jviDavApqbE1zBUVv1pKn7GYlLETB0XaQvDkG7goNB5qVsSl+7DH76MIP7jo32ho -itNKdDvludJ+aXD/zUp4oGjuHyEqnKXl4keAmrype1VqHJm4sb25oPTCwH77uSMb -ikAnY/hnCVpKRsh1a6BphwOWAa718YVi/i7Rg+vFeX2G4kVXIQ3M7mb9UUkX5EtZ -12f8pzO1V4Q7noXs8ISyvrdgs52tb2/WHZ7zvFKnJCBgGeHc7X7xw9EhHRKO3js9 -b/yvcx367z9AFCZAqCa/CZFo0+yUKp4EpP1Fe58++ZEhPaWoJC4RzIQtJBjJ+jK3 -rDRI20rZ2LQMAPIvGcZkX0yvme6ZJ63kk1/w1MmNAyX80j9yx1GW/VgiVBdQQ4W4 -MJkq+1VI0/a8ukn5bCoS66xIduy6+cg6AOWmGoMUJx1ZfZwd3Or98bpdLKP+kRxP -Y+t9bUgEFZNWuazRFinqS3IrEJAefFHm3I9mdm+eJR9Gn8KPd6bHH/20TN0dQBei -1v1URKs7keif2Twdnj8d/oMrBPGhZ706c7+i28yRB3k96T4OTQo= -=Hvel ------END PGP SIGNATURE----- diff --git a/wine-3.8.tar.xz b/wine-3.8.tar.xz new file mode 100644 index 0000000..b55545e --- /dev/null +++ b/wine-3.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02b00c6c948b3bab717e1b1e2075a5406b14d138bd2e01fdb1268a93d1c20d51 +size 20473392 diff --git a/wine-3.8.tar.xz.sign b/wine-3.8.tar.xz.sign new file mode 100644 index 0000000..d6e86fb --- /dev/null +++ b/wine-3.8.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlr13zsACgkQzvrI6q8X +UZ1gXA/9GfsEY0TaUhZZiYZSTmQ0DJhK2DAVTTpeRV/shb3HxIF6Ik3PTycWRSPr +tcYKluwG7Kpni7CjcEIyt8qO5m+A9XD1kgwANyMNJNBfzLhuOl9ABHZkySBJasZ5 +Nj9n0HX/CrFSC66AekkidULY089VAIP+EkDknV0HvpGgQ3Q3c67sLwVTcFU/LMvK +U/uM4K52yQSAQJ1ujzGPIsGg+CWqsX2yGtTl+i89AWh5zlZoKAVGf08YravISB3i +/dwgIPaGmmsY4nV0ecfyUwADfD1u0/AIArN6Q5pff7d07SojZ2Ns8TRGaxXyQRGb +/F/OFdzdlSxeiW1lb3V+HcePRU7+ifk8KW8acAxzufBQLzrKdxQETwWL+IictQH+ +K6xfjJMFTPO+bRnBqKucy/yK4OMYwWB2+OgOThxU6wxvfuHRlnw/2NcJrEZxm0Ex +WVE6+46e1r9WS29ae0nDGtwDvi/86BqKc8v4E6etNadD+t0xNFwPgkdVD8OL4njg +X+WLwZp/9UiKhBYzsO7XNJ0Oo8h6fKf8H9AilYSEj0yluoagfMBS7oCxJ+F50yT6 +CuqO4rq1AZVMSrgYHV50c2G977ITMzzwAH9ZWkcg5d690yBj3y3dhr84iqdjIaSi ++fpNYWa3aYs9wcoF1JswVGMZpOZkg+/Wsjc5+gL+zQvYJQJSRfA= +=XNyn +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 36c1473..c4419b3 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri May 11 18:37:37 UTC 2018 - meissner@suse.com + +- Update to 3.8 development release + - Infrastructure for writing kernel driver tests. + - Support for showing file properties in the Shell browser. + - MP3 decoder as a DirectX Media Object. + - More support for the Task Scheduler. + - Support for COM aggregation in UrlMon. + - Various bug fixes. +- updated winetricks + ------------------------------------------------------------------- Fri Apr 27 18:55:43 UTC 2018 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 37b4566..ce4d584 100644 --- a/wine.spec +++ b/wine.spec @@ -101,8 +101,8 @@ BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) -%define realver 3.7 -Version: 3.7 +%define realver 3.8 +Version: 3.8 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1-or-later diff --git a/winetricks b/winetricks index 55d029a..caadbfc 100644 --- a/winetricks +++ b/winetricks @@ -41,7 +41,10 @@ WINETRICKS_VERSION=20180217-next # On Ubuntu, the following lines can be used to install all the prerequisites: # sudo add-apt-repository ppa:ubuntu-wine/ppa # sudo apt-get update -# sudo apt-get install binutils cabextract p7zip unrar unzip wget wine zenity +# sudo apt-get install binutils cabextract p7zip-full unrar unzip wget wine zenity +# On Fedora, these commands can be used (RPM Fusion is used to install unrar): +# sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm +# sudo dnf install binutils cabextract p7zip-plugins unrar unzip wget wine zenity # # See http://winetricks.org for documentation and tutorials, including # how to contribute changes to winetricks. @@ -192,7 +195,15 @@ w_askpermission() case $WINETRICKS_GUI in zenity) $WINETRICKS_GUI "$_W_timeout" --question --title=winetricks --text="$(echo "$@" | sed 's,\\\\,\\\\\\\\,g')" --no-wrap;; kdialog) $WINETRICKS_GUI --title winetricks --warningcontinuecancel "$@" ;; - none) printf %s "Press Y or N, then Enter: " ; read -r response ; test "$response" = Y || test "$response" = y;; + none) + if [ -n "$_W_timeout" ]; then + # -t / TMOUT don't seem to be portable, so just assume yes in unattended mode + w_info "Unattended mode, not prompting for confirmation" + else + printf %s "Press Y or N, then Enter: " + read -r response + test "$response" = Y || test "$response" = y + fi esac if test $? -ne 0; then @@ -380,7 +391,7 @@ w_try_7z() if test -x "$(which 7z 2>/dev/null)"; then w_try 7z x "$filename" -o"$destdir" "$@" else - w_warn "Cannot find 7z. Using Windows 7-Zip instead. (You can avoid this by installing 7z, e.g. 'sudo apt-get install p7zip-full' or 'sudo yum install p7zip p7zip-plugins')." + w_warn "Cannot find 7z. Using Windows 7-Zip instead. (You can avoid this by installing 7z, e.g. 'sudo apt-get install p7zip-full' or 'sudo yum install p7zip-plugins')." WINETRICKS_OPT_SHAREDPREFIX=1 w_call 7zip # errors out if there is a space between -o and path w_try "$WINE" "$W_PROGRAMS_X86_WIN\\7-Zip\\7z.exe" x "$(w_pathconv -w "$filename")" -o"$(w_pathconv -w "$destdir")" "$@" @@ -3145,18 +3156,24 @@ winetricks_detect_gui() { if test -x "$(which zenity 2>/dev/null)"; then WINETRICKS_GUI=zenity - + WINETRICKS_GUI_VERSION="$(zenity --version)" WINETRICKS_MENU_HEIGHT=500 WINETRICKS_MENU_WIDTH=1010 elif test -x "$(which kdialog 2>/dev/null)"; then echo "Zenity not found! Using kdialog as poor substitute." WINETRICKS_GUI=kdialog + WINETRICKS_GUI_VERSION="$(kdialog --version)" else echo "No arguments given, so tried to start GUI, but zenity not found." echo "Please install zenity if you want a graphical interface, or " echo "run with --help for more options." exit 1 fi + + # Print zenity/dialog version info for debugging: + if [ ! "$WINETRICKS_SUPER_QUIET" ] ; then + echo "winetricks GUI enabled, using $WINETRICKS_GUI $WINETRICKS_GUI_VERSION" + fi } # Detect which sudo to use @@ -3987,6 +4004,7 @@ winetricks_metadata_exists() winetricks_is_cached() { # FIXME: also check file2... if given + # https://github.com/Winetricks/winetricks/issues/989 # shellcheck disable=SC2154 _W_path="$W_CACHE/$1/$file1" case "$_W_path" in @@ -4809,10 +4827,14 @@ winetricks_set_wineprefix() W_32BIT_DLLS="$W_WINDIR_UNIX/syswow64" # Probably need fancier handling/checking, but for a basic start: + # Note 'wine' may be named 'wine-stable'/'wine-staging'/etc.): # WINE64 = wine64, available on 64-bit prefixes # WINE_ARCH = the native wine for the prefix (wine for 32-bit, wine64 for 64-bit) # WINE_MULTI = generic wine, new name - WINE64="${WINE}64" + case "$WINE" in + *64) WINE64="${WINE}" ;; + *) WINE64="${WINE}64" ;; + esac WINE_ARCH="${WINE64}" WINE_MULTI="${WINE}" @@ -5090,6 +5112,7 @@ list-cached: vis en liste over verber for allerede-hentede installationsprogramm list-download: vis en liste over verber for programmer der kan hentes list-manual-download: list applications which can be downloaded with some help from the user list-installed: list already-installed applications +annihilate Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX _EOF_ ;; de*) @@ -5126,6 +5149,7 @@ list-download Verben für automatisch herunterladbare Anwendungen auflis 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 +annihilate ALLE DATEIEN UND PROGRAMME IN DIESEM WINEPREFIX Löschen _EOF_ ;; *) @@ -5164,6 +5188,7 @@ list-download list verbs which download automatically list-manual-download list verbs which download with some help from the user list-installed list already-installed verbs prefix=foobar select WINEPREFIX=$W_PREFIXES_ROOT/foobar +annihilate Delete ALL DATA AND APPLICATIONS INSIDE THIS WINEPREFIX _EOF_ ;; esac @@ -7177,10 +7202,6 @@ load_dotnet35() w_call dotnet30sp1 w_wineserver -w - if w_workaround_wine_bug 33450 "Installing msxml3" ,1.5.28; then - w_call msxml3 - fi - # See also https://blogs.msdn.microsoft.com/astebner/2008/07/17/scenarios-where-net-framework-3-5-setup-tries-to-connect-to-the-internet-and-how-to-avoid-them/ w_try_cd "$W_TMP" w_try_cabextract $W_UNATTENDED_DASH_Q "$W_CACHE"/dotnet35/dotnetfx35.exe @@ -7684,6 +7705,7 @@ load_esent() #---------------------------------------------------------------- # FIXME: update winetricks_is_installed to look at installed_file2..n +# https://github.com/Winetricks/winetricks/issues/988 w_metadata flash dlls \ title="Flash Player 14" \ publisher="Adobe" \ @@ -8141,7 +8163,12 @@ w_metadata jet40 dlls \ load_jet40() { - w_call mdac27 + # mdac27 is 32-bit only, so use mdac28 for win64: + if [ "$W_ARCH" = "win64" ] ; then + w_call mdac28 + else + w_call mdac27 + fi w_call wsh57 # https://support.microsoft.com/kb/239114 @@ -9136,6 +9163,9 @@ load_remove_mono() "${WINE_ARCH}" reg delete "HKLM\\Software\\Microsoft\\NET Framework Setup\\NDP\\v4" /f || true w_try rm -f "$W_WINDIR_UNIX/system32/mscoree.dll" + if [ "$W_ARCH" = "win64" ]; then + w_try rm -f "$W_WINDIR_UNIX/syswow64/mscoree.dll" + fi } #---------------------------------------------------------------- @@ -11037,7 +11067,7 @@ w_metadata opensymbol fonts \ publisher="OpenOffice.org" \ year="2017" \ media="download" \ - file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u10_all.deb" \ + file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u11_all.deb" \ installed_file1="$W_FONTSDIR_WIN/opens___.ttf" load_opensymbol() @@ -11045,7 +11075,7 @@ load_opensymbol() # The OpenSymbol fonts are a replacement for the Windows Wingdings font from OpenOffice.org. # Need to w_download Debian since I can't find a standalone download from OpenOffice # Note: The source download package on debian is for _all_ of OpenOffice, which is 266 MB. - w_download "http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u10_all.deb" 33fe227786ae6dd89d265199bf3c03f09e540a5d2b96a38d7a581b4a039db696 + w_download "http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u11_all.deb" b105ec27c738f92bd9801962f10fd05125c38224c92e702f84b00cbb482dfce7 w_try_cd "$W_TMP" w_try_ar "$W_CACHE/$W_PACKAGE/$file1" data.tar.xz @@ -11361,6 +11391,30 @@ load_autohotkey() #---------------------------------------------------------------- +w_metadata busybox apps \ + title="BusyBox FRP-2121" \ + publisher="Ron Yorston / Busybox authors" \ + year="2015" \ + media="download" \ + file1="busybox-w32-FRP-2121-ga316078ad.exe" \ + installed_exe1="" + +load_busybox() +{ + # Could use https://frippery.org/files/busybox/busybox.exe, but it hasn't updated in last 3 years.. + w_download https://frippery.org/files/busybox/busybox-w32-FRP-2121-ga316078ad.exe 1bab530f2fd2a9d69528bc2b35ba1f9f75481ae053443b47cb23ad2c2740d887 + + if test "$W_ARCH" = "win64"; then + w_download https://frippery.org/files/busybox/busybox-w64-FRP-2121-ga316078ad.exe dcb2faf17f996fda8d273d513bc195aec615ef468e3d55b8b4dc9c089b22e035 + w_try cp "${W_CACHE}/${W_PACKAGE}/${file1}" "$W_SYSTEM32_DLLS/busybox.exe" + w_try cp "${W_CACHE}/${W_PACKAGE}/busybox-w64-FRP-2121-ga316078ad.exe" "$W_SYSTEM64_DLLS/busybox.exe" + else + w_try cp "${W_CACHE}/${W_PACKAGE}/${file1}" "$W_SYSTEM32_DLLS/busybox.exe" + fi +} + +#---------------------------------------------------------------- + w_metadata cmake apps \ title="CMake 2.8" \ publisher="Kitware" \ @@ -11531,10 +11585,6 @@ load_ev3() if w_workaround_wine_bug 40729 "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" 1.9.10,1.9.12; then - w_call ie8_kb2936068 - fi } #----------------------------------------------------------------