From 10bc00ed5ae474cfaf163f83b6bb04452db3988fdfdedc12ecaa5548f9c664d9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 27 Apr 2018 18:59:19 +0000 Subject: [PATCH 1/3] - Update to 3.7 development release - MSI custom actions run in a separate process. - Support for job files in the Task Scheduler. - Improved viewport support in Direct 3D. - Larger resolution version of the standard icons. - Various bug fixes. - updated winetricks - updated staging to 3.7 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=503 --- _service | 4 ++-- wine-3.6.tar.xz | 3 --- wine-3.6.tar.xz.sign | 16 ---------------- wine-3.7.tar.xz | 3 +++ wine-3.7.tar.xz.sign | 16 ++++++++++++++++ wine.changes | 12 ++++++++++++ wine.spec | 4 ++-- winetricks | 2 ++ 8 files changed, 37 insertions(+), 23 deletions(-) delete mode 100644 wine-3.6.tar.xz delete mode 100644 wine-3.6.tar.xz.sign create mode 100644 wine-3.7.tar.xz create mode 100644 wine-3.7.tar.xz.sign diff --git a/_service b/_service index 6d5e14d..66e8583 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v3.6 + refs/tags/v3.7 v*.* git @@ -11,7 +11,7 @@ @PARENT_TAG@ wined3d9(.*) https://github.com/sarnex/wine-d3d9-patches.git - refs/tags/wine-d3d9-3.5 + refs/tags/wine-d3d9-3.6 git diff --git a/wine-3.6.tar.xz b/wine-3.6.tar.xz deleted file mode 100644 index f878ca9..0000000 --- a/wine-3.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78502dc79a60430d2a2ef66bee146e38eb6dd679fd36b54acfc8f9b2ac07905c -size 20005240 diff --git a/wine-3.6.tar.xz.sign b/wine-3.6.tar.xz.sign deleted file mode 100644 index de57b4d..0000000 --- a/wine-3.6.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlrRGN0ACgkQzvrI6q8X -UZ0BeQ/9ETZJBnOEqPoqpwfbG3qW3Y5IZFKhzU6LcJ/qdeVxsFGI5Mf+RkYYd3Hi -aSBNQdPxkz2lg2p9u8pVQfjI4z0g6h/RsRV7xiqA5ro00jWvBjTgA1y0spDoQ7lm -JqEs9gsL+uvy+/NWqdkcxR9BZP2Z0accStryo4oEeNfeejEEJlm0aeERQWqUttcJ -Xp/ijhtqFJrcGt5/ZJnnp6DaHsM2Fzn3XWydFT3cvuwavKRgZ1pKQShuQAEfXAyo -SjCXAuP5lRc6hp4Vd0ohSQgcg4fKqftYq32+nLa6j4xEa/NW5L5s4aJBdibA21dF -RJkTWBbx0E7CVwLSKy6uU3man5NhRco1PjEcp3ib/pfyTsVqAeOnbqVJ83YPmtqZ -zBPn7vEFfHjYRkXcCkKdM+jp8Gzqxn7qcUwM7W3W9kdmKaoROydUmlkvBFmX5Gao -okl9pa7ZsLf72E9heepycvsTXvPlk/m0bUuKNQ1frLVRBaSv3d0bQ9Nx9SpbSoP7 -QVLFEQaX+zR40B9T95d8NMk2yoDrnSmdlIMYDDJ3mg2Qt5Eikl7yYc6k0ZGcabbv -LydHCik9eHi6oty8womz6JByJbwQGOGBrduyIq/5DfA0W2/vZvlggCT+UtJMrv6O -Fc2lZzC3QLi20MkPf955yO2+hLVR2MP9hIGo+Xs5CpFh+b2NR68= -=ucD1 ------END PGP SIGNATURE----- diff --git a/wine-3.7.tar.xz b/wine-3.7.tar.xz new file mode 100644 index 0000000..cd01320 --- /dev/null +++ b/wine-3.7.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..90234a5 --- /dev/null +++ b/wine-3.7.tar.xz.sign @@ -0,0 +1,16 @@ +-----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.changes b/wine.changes index 596dc6c..36c1473 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Apr 27 18:55:43 UTC 2018 - meissner@suse.com + +- Update to 3.7 development release + - MSI custom actions run in a separate process. + - Support for job files in the Task Scheduler. + - Improved viewport support in Direct 3D. + - Larger resolution version of the standard icons. + - Various bug fixes. +- updated winetricks +- updated staging to 3.7 + ------------------------------------------------------------------- Sat Apr 14 13:09:33 UTC 2018 - meissner@suse.com diff --git a/wine.spec b/wine.spec index bd4de98..8389091 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.6 -Version: 3.6 +%define realver 3.7 +Version: 3.7 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1-or-later diff --git a/winetricks b/winetricks index 8798aa9..56625c9 100644 --- a/winetricks +++ b/winetricks @@ -5417,6 +5417,8 @@ load_amstream() w_try cp "$W_TMP/amd64_microsoft-windows-directshow-other_31bf3856ad364e35_6.1.7601.17514_none_6b778d68f75a1a54/amstream.dll" "$W_SYSTEM64_DLLS/amstream.dll" fi + w_try_regsvr amstream.dll + w_override_dlls native,builtin amstream } From f4b2b8c72fd88dd35ca4c0aad3dda3788cb314678723c0ef5229fbfeb998a930 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 30 Apr 2018 09:21:53 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=504 --- wine.spec | 4 +-- winetricks | 84 ++---------------------------------------------------- 2 files changed, 4 insertions(+), 84 deletions(-) diff --git a/wine.spec b/wine.spec index 8389091..37b4566 100644 --- a/wine.spec +++ b/wine.spec @@ -140,7 +140,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc %arm aarch64 %if %{staging} # upstream patch target version -%define staging_version 3.6 +%define staging_version 3.7 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel @@ -148,7 +148,7 @@ BuildRequires: libva-devel %endif %if %{nine} # upstream patch target version -%define nine_version 3.5 +%define nine_version 3.6 BuildRequires: Mesa-libd3d-devel BuildRequires: dri2proto-devel BuildRequires: libOSMesa-devel diff --git a/winetricks b/winetricks index 56625c9..55d029a 100644 --- a/winetricks +++ b/winetricks @@ -5342,7 +5342,8 @@ helper_winxpsp3() # https://www.microsoft.com/en-us/download/details.aspx?id=24 # https://download.microsoft.com/download/d/3/0/d30e32d8-418a-469d-b600-f32ce3edf42d/WindowsXP-KB936929-SP3-x86-ENU.exe # Mirror list: http://www.filewatcher.com/m/WindowsXP-KB936929-SP3-x86-ENU.exe.331805736-0.html - w_download_to winxpsp3 ftp://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/winxp/Service_Packs/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654 + # 2018/04/04: http://www.download.windowsupdate.com/msdownload/update/software/dflt/2008/04/windowsxp-kb936929-sp3-x86-enu_c81472f7eeea2eca421e116cd4c03e2300ebfde4.exe + w_download_to winxpsp3 ftp://ftp.emacinc.com/LegacyProducts/SBC/drivers/vdx/WINXP/WindowsXP-KB936929-SP3-x86-ENU.exe 62e524a552db9f6fd22d469010ea4d7e28ee06fa615a1c34362129f808916654 w_try_cabextract -d "$W_TMP" -L -F "$filename" "$W_CACHE"/winxpsp3/WindowsXP-KB936929-SP3-x86-ENU.exe } @@ -12321,53 +12322,6 @@ _EOF_ #---------------------------------------------------------------- -w_metadata picasa39 apps \ - title="Picasa 3.9" \ - publisher="Google" \ - year="2014" \ - file1="picasa39-setup.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Google/Picasa3/Picasa3.exe" - -load_picasa39() -{ - # 2016/01/02: 482c1a547d8d3aa25ee446d30ea986de63ef8c8d68b8d1109dd3d9b714e73e08 - - w_download https://dl.google.com/picasa/picasa39-setup.exe 482c1a547d8d3aa25ee446d30ea986de63ef8c8d68b8d1109dd3d9b714e73e08 - 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 https://bugs.winehq.org/show_bug.cgi?id=29434 for more details." - fi - w_try_cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - SetTitleMatchMode, 2 - run picasa39-setup.exe - WinWait, Picasa 3 Setup - if ( w_opt_unattended > 0 ) { - Sleep 1000 - ControlClick Button2 ;I Agree - License - Sleep 1000 - WinWait, Picasa 3 Setup, Choose Install Location - ControlClick Button2 ;Install - Sleep 1000 - WinWait, Picasa 3 Setup, Picasa 3 has been installed on your computer - Sleep 500 - ControlClick Button5 ; Desktop Icon - Sleep 500 - ControlClick Button6 ; Quick Launch - Sleep 500 - ControlClick Button7 ; Default search off - Sleep 500 - ControlClick Button8 ; Usage statistics sent - Sleep 500 - ControlClick Button4 ; Run Picasa - Sleep 500 - ControlClick Button2 ; Finish - } - WinWaitClose - " -} - -#---------------------------------------------------------------- - w_metadata protectionid apps \ title="Protection ID" \ publisher="CDKiLLER & TippeX" \ @@ -16756,40 +16710,6 @@ load_penpenxmas() #---------------------------------------------------------------- -w_metadata plantsvszombies games \ - title="Plants vs. Zombies" \ - publisher="PopCap Games" \ - year="2009" \ - media="download" \ - file1="PlantsVsZombiesSetup.exe" \ - installed_file1="$W_PROGRAMS_X86_WIN/PopCap Games/Plants vs. Zombies/PlantsVsZombies.exe" - -load_plantsvszombies() -{ - w_download "https://downloads.popcap.com/www/popcap_downloads/PlantsVsZombiesSetup.exe" 4b4bb4d19fb639e5698983e39d7ad061c7667bcec19056560532c7ad0d67d0e4 - - w_try_cd "$W_CACHE/$W_PACKAGE" - w_ahk_do " - run PlantsVsZombiesSetup.exe - winwait, Plants vs. Zombies Installer - if ( w_opt_unattended > 0 ) { - sleep 1000 - send {Enter} - winwait, Plants vs. Zombies License Agreement - ControlClick Button1 - } - winwait, Plants vs. Zombies Installation Complete! - if ( w_opt_unattended > 0 ) { - sleep 1000 - send {Space}{Enter} - ControlClick, x309 y278, Plants vs. Zombies Installation Complete!,,,, Pos - } - WinWaitClose - " -} - -#---------------------------------------------------------------- - w_metadata popfs games \ title="Prince of Persia: The Forgotten Sands" \ publisher="Ubisoft" \ From e32c677d3f7a7a73ee0ff9c57d4aa79fd81f7814de3231576c50eedd43d59495 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 30 Apr 2018 09:22:05 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=505 --- wine-d3d9-patches-3.5.tar.xz | 3 --- wine-d3d9-patches-3.6.tar.xz | 3 +++ wine-staging-3.6.tar.xz | 3 --- wine-staging-3.7.tar.xz | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 wine-d3d9-patches-3.5.tar.xz create mode 100644 wine-d3d9-patches-3.6.tar.xz delete mode 100644 wine-staging-3.6.tar.xz create mode 100644 wine-staging-3.7.tar.xz diff --git a/wine-d3d9-patches-3.5.tar.xz b/wine-d3d9-patches-3.5.tar.xz deleted file mode 100644 index bcce495..0000000 --- a/wine-d3d9-patches-3.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db152e6314902116e1ed1a90c7fe13d129a38ababdb7ec2ef05a55a5f9283803 -size 42348 diff --git a/wine-d3d9-patches-3.6.tar.xz b/wine-d3d9-patches-3.6.tar.xz new file mode 100644 index 0000000..b8b5803 --- /dev/null +++ b/wine-d3d9-patches-3.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdf24fb8374f8a1b06c9231d137abc6c56e2b6546ab7cdb952fdb0d080a908ff +size 42352 diff --git a/wine-staging-3.6.tar.xz b/wine-staging-3.6.tar.xz deleted file mode 100644 index 5a56287..0000000 --- a/wine-staging-3.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4250210cc40104817a3f3b7d84c70f1d56b1e86d95879f69a5ff62698b5cc624 -size 7541896 diff --git a/wine-staging-3.7.tar.xz b/wine-staging-3.7.tar.xz new file mode 100644 index 0000000..0eb5428 --- /dev/null +++ b/wine-staging-3.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:798085a29343dabc7c7a7832a4588cc1e5b9dc317493655060f4484fc109caf0 +size 7530408