From 168d34a467cf66f4433bca40e14b8c387c78535ab70c9ce689bda2f33b752053 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 1 Nov 2014 09:06:06 +0000 Subject: [PATCH] - Updated to 1.7.30 development snapshot - Support for shaping and BiDi mirroring in DirectWrite. - Some page fault handling fixes. - A few more C runtime functions. - Various bug fixes. - updated winetricks OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=244 --- wine-1.7.29.tar.bz2 | 3 -- wine-1.7.29.tar.bz2.sign | 7 --- wine-1.7.30.tar.bz2 | 3 ++ wine-1.7.30.tar.bz2.sign | 7 +++ wine.changes | 10 +++++ wine.spec | 2 +- winetricks | 93 +++++++++++++++++++++++++++++++--------- 7 files changed, 93 insertions(+), 32 deletions(-) delete mode 100644 wine-1.7.29.tar.bz2 delete mode 100644 wine-1.7.29.tar.bz2.sign create mode 100644 wine-1.7.30.tar.bz2 create mode 100644 wine-1.7.30.tar.bz2.sign diff --git a/wine-1.7.29.tar.bz2 b/wine-1.7.29.tar.bz2 deleted file mode 100644 index e37d23f..0000000 --- a/wine-1.7.29.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae48190d35533197811eeabed989ed9fd3201c44af917107f35ec0bf75b8de62 -size 21823063 diff --git a/wine-1.7.29.tar.bz2.sign b/wine-1.7.29.tar.bz2.sign deleted file mode 100644 index 3afc01a..0000000 --- a/wine-1.7.29.tar.bz2.sign +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.15 (GNU/Linux) - -iEYEABECAAYFAlRBBUMACgkQ9ebp7rlGHddmjQCeOtuBEaly/ejzqMbeYZ3qsiLp -2MwAnjrtHvvl92Fesed/PiwQovmnsYZ4 -=s4wx ------END PGP SIGNATURE----- diff --git a/wine-1.7.30.tar.bz2 b/wine-1.7.30.tar.bz2 new file mode 100644 index 0000000..ce0302c --- /dev/null +++ b/wine-1.7.30.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10f7caf0420970772d868ab2ae24578f89b8a04b93604473e7c41bb295e0086c +size 21835863 diff --git a/wine-1.7.30.tar.bz2.sign b/wine-1.7.30.tar.bz2.sign new file mode 100644 index 0000000..092d005 --- /dev/null +++ b/wine-1.7.30.tar.bz2.sign @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.15 (GNU/Linux) + +iEYEABECAAYFAlRTkicACgkQ9ebp7rlGHdf1aQCgqshTD0/eDVaurEJk153TJi3h +fSwAnikzMBoY7TpBktNtur+0mXJKRyjD +=AKj/ +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 1c5483c..01f56c7 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Nov 1 07:50:51 UTC 2014 - meissner@suse.com + +- Updated to 1.7.30 development snapshot + - Support for shaping and BiDi mirroring in DirectWrite. + - Some page fault handling fixes. + - A few more C runtime functions. + - Various bug fixes. +- updated winetricks + ------------------------------------------------------------------- Fri Oct 17 12:06:51 UTC 2014 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 1337c40..d670ab2 100644 --- a/wine.spec +++ b/wine.spec @@ -56,7 +56,7 @@ BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.29 +Version: 1.7.30 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ diff --git a/winetricks b/winetricks index bed6f68..8a274f4 100644 --- a/winetricks +++ b/winetricks @@ -2172,7 +2172,17 @@ _EOF_ #---- Private Functions ---- winetricks_print_version() { - echo "$WINETRICKS_VERSION" + # Also print sha1, since WINETRICKS_VERSION isn't incremented often + if [ -x "`which sha1sum 2>/dev/null`" ] + then + winetricks_sha1=`sha1sum < $0 | sed 's/ .*//'` + elif [ -x "`which openssl 2>/dev/null`" ] + then + winetricks_sha1=`openssl dgst -sha1 < $0 | sed 's/ .*//'` + else + w_warn "No sha1sum utility available." + fi + echo "$WINETRICKS_VERSION - sha1sum: $winetricks_sha1" } # Run a small wine command for internal use @@ -3720,25 +3730,37 @@ 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. for x in \ "$WINESERVER" \ "${WINE}server" \ "`which wineserver 2> /dev/null`" \ - /usr/lib*/wine-unstable/wineserver \ - /usr/lib*/wine/wineserver \ - /usr/lib*/wine/bin/wineserver \ - /usr/lib/*/wine-unstable/wineserver \ - /usr/lib/*/wine-unstable/bin/wineserver \ - /usr/lib/*/wine-unstable/wine/wineserver \ - /usr/lib/*/wine-unstable/wine/bin/wineserver \ - /usr/lib/*/wine/wineserver \ - /usr/lib/*/wine/bin/wineserver \ "`dirname $WINE`/server/wineserver" \ + /usr/lib/wine/wineserver \ + /usr/lib/i386-kfreebsd-gnu/wine/wineserver \ + /usr/lib/i386-linux-gnu/wine/wineserver \ + /usr/lib/powerpc-linux-gnu/wine/wineserver \ + /usr/lib/i386-kfreebsd-gnu/wine/bin/wineserver \ + /usr/lib/i386-linux-gnu/wine/bin/wineserver \ + /usr/lib/powerpc-linux-gnu/wine/bin/wineserver \ + /usr/lib/x86_64-linux-gnu/wine/bin/wineserver \ + /usr/lib/i386-kfreebsd-gnu/wine-development/wineserver \ + /usr/lib/i386-linux-gnu/wine-development/wineserver \ + /usr/lib/powerpc-linux-gnu/wine-development/wineserver \ + /usr/lib/x86_64-linux-gnu/wine-development/wineserver \ file-not-found do if test -x "$x" then + case "$x" in + /usr/lib/*/wine-development/wineserver) + if test -x /usr/bin/wine-development + then + WINE="/usr/bin/wine-development" + fi + ;; + esac break fi done @@ -4015,7 +4037,7 @@ helper_win7sp1() #--------------------------------------------------------- w_metadata adobeair dlls \ - title="Adobe AIR 4.0" \ + title="Adobe AIR 15.0" \ publisher="Adobe" \ year="2014" \ media="download" \ @@ -4033,7 +4055,8 @@ load_adobeair() # 2011-10-26: 2.7 sha1sum dfa337d4b53e9d924356febc116450190fa183dd # 2014-03-01: 4.0 sha1sum 0034bdd4e0b2ce0fa6198b0b715fba85754d9a57 # http://helpx.adobe.com/en/flash-player/release-note/fp_12_air_4_release_notes.html - w_download http://airdownload.adobe.com/air/win/download/4.0/AdobeAIRInstaller.exe 0034bdd4e0b2ce0fa6198b0b715fba85754d9a57 + # 2014-09-30: 15.0 sha1sum 46341f1358bc6e0b9ddeae3591662a2ac68dc360 + w_download http://airdownload.adobe.com/air/win/download/15.0/AdobeAIRInstaller.exe 46341f1358bc6e0b9ddeae3591662a2ac68dc360 cd "$W_CACHE"/adobeair w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT } @@ -5630,10 +5653,8 @@ load_flash() # See # http://blogs.adobe.com/psirt/ # http://get.adobe.com/de/flashplayer/otherversions/ - # In theory we could install older versions like 10.3 by using zipfiles at + # Now, we install older versions by using zipfiles at # http://helpx.adobe.com/flash-player/kb/archived-flash-player-versions.html - # They don't have installers, just raw files. Let's wait until we have - # a reason to do that. # Active X plugin # 2013-03-28 @@ -5643,10 +5664,13 @@ load_flash() # 2014-01-21 #w_download http://fpdownload.macromedia.com/get/flashplayer/pdc/12.0.0.38/install_flash_player_ax.exe 8deb33bcbbbbecfcbcbeb0f861d2c7492599da2b # 2014-08-17 - w_download https://fpdownload.macromedia.com/get/flashplayer/pdc/14.0.0.176/install_flash_player_ax.exe 16231b509d8e689dc34ae36597d41c4fb1b3a67e - cd "$W_CACHE"/flash - - w_try "$WINE" install_flash_player_ax.exe ${W_OPT_UNATTENDED:+ /install} + #w_download https://fpdownload.macromedia.com/get/flashplayer/pdc/14.0.0.176/install_flash_player_ax.exe 16231b509d8e689dc34ae36597d41c4fb1b3a67e + # 2014-10-02 + w_download http://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.176_archive.zip 40df72ab2c22bcd4442aa35eb586000776129982 + + w_try_unzip -d "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.176_archive.zip fp_14.0.0.176_archive/14_0_r0_176/flashplayer14_0r0_176_winax.exe + cd "$W_TMP"/fp_14.0.0.176_archive/14_0_r0_176 + w_try "$WINE" flashplayer14_0r0_176_winax.exe ${W_OPT_UNATTENDED:+ /install} # Mozilla / Firefox plugin # 2013-03-28 @@ -5656,8 +5680,13 @@ load_flash() # 2014-01-21 #w_download http://fpdownload.macromedia.com/get/flashplayer/pdc/12.0.0.43/install_flash_player.exe 5a68f7aa21c4217cf801a46616fe724d601f773a # 2014-08-17 - w_download https://fpdownload.macromedia.com/get/flashplayer/pdc/14.0.0.179/install_flash_player.exe 1d5725fd0d50eb1361213179ffae9ee24944755a - w_try "$WINE" install_flash_player.exe ${W_OPT_UNATTENDED:+ /install} + #w_download https://fpdownload.macromedia.com/get/flashplayer/pdc/14.0.0.179/install_flash_player.exe 1d5725fd0d50eb1361213179ffae9ee24944755a + # 2014-10-02 + w_download http://download.macromedia.com/pub/flashplayer/installers/archive/fp_14.0.0.179_archive.zip b94860ca0eff3e1420c24f9647a5f9f5e610ce34 + + w_try_unzip -d "$W_TMP" "$W_CACHE"/flash/fp_14.0.0.179_archive.zip fp_14.0.0.179_archive/14_0_r0_179/flashplayer14_0r0_179_win.exe + cd "$W_TMP"/fp_14.0.0.179_archive/14_0_r0_179 + w_try "$WINE" flashplayer14_0r0_179_win.exe ${W_OPT_UNATTENDED:+ /install} if w_workaround_wine_bug 25966 "Flash11 still needs native visual c++ 2005 runtimes" 1.5.7, then @@ -9796,6 +9825,28 @@ load_vc2005express() #---------------------------------------------------------------- +w_metadata vc2005expresssp1 apps \ + title="MS Visual C++ 2005 Express SP1" \ + publisher="Microsoft" \ + year="2007" \ + media="download" \ + file1="VS80sp1-KB926748-X86-INTL.exe" + +load_vc2005expresssp1() +{ + w_call vc2005express + + # http://www.microsoft.com/downloads/details.aspx?FamilyId=7B0B0339-613A-46E6-AB4D-080D4D4A8C4E + if w_workaround_wine_bug 37375 + then + w_warn "Installer currently fails" + fi + w_download http://download.microsoft.com/download/7/7/3/7737290f-98e8-45bf-9075-85cc6ae34bf1/VS80sp1-KB926748-X86-INTL.exe 8b9a0172efad64774aa122f29e093ad2043b308d + w_try $WINE "$W_CACHE"/vc2005expresssp1/VS80sp1-KB926748-X86-INTL.exe +} + +#---------------------------------------------------------------- + w_metadata vc2005trial apps \ title="MS Visual C++ 2005 Trial" \ publisher="Microsoft" \