diff --git a/wine-1.7.52.tar.bz2 b/wine-1.7.52.tar.bz2 deleted file mode 100644 index a463e65..0000000 --- a/wine-1.7.52.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0773b32a0c358323db4c383ceb1e9e28d5d4ed4ea37570af2bcb41fecf0d554b -size 22707539 diff --git a/wine-1.7.52.tar.bz2.sign b/wine-1.7.52.tar.bz2.sign deleted file mode 100644 index 43ca50e..0000000 --- a/wine-1.7.52.tar.bz2.sign +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlYOkroACgkQ9ebp7rlGHdfbyQCfUGdlCb4IKfkzARMdvDDphzbw -cd4An0HDx4oSSQwstU6dPgaVuIQGiu4n -=izSO ------END PGP SIGNATURE----- diff --git a/wine-1.7.53.tar.bz2 b/wine-1.7.53.tar.bz2 new file mode 100644 index 0000000..30bd323 --- /dev/null +++ b/wine-1.7.53.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efba70b106cde683a50a4b1f42df3d900f8ffc291a3689cb897afcc12cc2c6a3 +size 22763993 diff --git a/wine-1.7.53.tar.bz2.sign b/wine-1.7.53.tar.bz2.sign new file mode 100644 index 0000000..3ab61ab --- /dev/null +++ b/wine-1.7.53.tar.bz2.sign @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlYhA4IACgkQ9ebp7rlGHdf+IQCgr+4xT3jOe5WDKdpvZSXCS/c/ +XJoAnAvZ//aGCsNbJ4dpx1FRVqCAosd3 +=0Ihm +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index c118bbf..f304a7f 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Oct 16 14:24:25 UTC 2015 - meissner@suse.com + +- Updated to 1.7.53 development snapshot + - Support for the various versions of XAudio. + - More implementation of the Web Services DLL. + - Improved OLE object embedding. + - Various code cleanups in Direct3D. + - New MAINTAINERS file and Signed-off-by requirement to + improve the patch review process. + - Various bug fixes. +- updated winetricks + ------------------------------------------------------------------- Fri Oct 2 14:37:06 UTC 2015 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 4face5e..27c087a 100644 --- a/wine.spec +++ b/wine.spec @@ -60,19 +60,15 @@ BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.52 +Version: 1.7.53 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ Group: System/Emulators/PC Url: http://www.winehq.org/ -# while sf is down -#Source0: http://downloads.sourceforge.net/project/wine/Source/%{name}-%{version}.tar.bz2 -Source0: http://mirrors.ibiblio.org/wine/source/1.7/wine-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/wine/Source//wine-%{version}.tar.bz2 Source41: wine.keyring -# while sf is down -#Source42: http://downloads.sourceforge.net/project/wine/Source/%{name}-%{version}.tar.bz2.sign -Source42: http://mirrors.ibiblio.org/wine/source/1.7/%{name}-%{version}.tar.bz2.sign +Source42: http://downloads.sourceforge.net/project/wine/Source//%{name}-%{version}.tar.bz2.sign Source1: https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks Source11: https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.1 Source2: http://kegel.com/wine/wisotool diff --git a/winetricks b/winetricks index 7cdcf1b..6a0feed 100644 --- a/winetricks +++ b/winetricks @@ -8058,6 +8058,70 @@ load_vcrun2013() #---------------------------------------------------------------- +w_metadata vcrun2015 dlls \ + title="Visual C++ 2015 libraries (concrt140.dll,mfc140.dll,mfc140u.dll,mfcm140.dll,mfcm140u.dll,msvcp140.dll,vcamp140.dll,vccorlib140.dll,vcomp140.dll,vcruntime140.dll)" \ + publisher="Microsoft" \ + year="2015" \ + media="download" \ + file1="vc_redist.x86.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/mfc140.dll" + +load_vcrun2015() +{ + # https://www.microsoft.com/en-us/download/details.aspx?id=48145 + # 2015/10/12: bfb74e498c44d3a103ca3aa2831763fb417134d1 + w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe bfb74e498c44d3a103ca3aa2831763fb417134d1 + + w_override_dlls native,builtin atl140 msvcp140 msvcr140 vcomp140 + cd "$W_CACHE"/vcrun2015 + if w_workaround_wine_bug 17273 "Manually extracting dlls" + then + w_try_cabextract --directory="$W_TMP" vc_redist.x86.exe + w_try_cabextract --directory="$W_TMP" "$W_TMP/a10" + w_try_cabextract --directory="$W_TMP" "$W_TMP/a11" + cp "$W_TMP"/concrt140.dll "$W_SYSTEM32_DLLS"/concrt140.dll + cp "$W_TMP"/mfc140.dll "$W_SYSTEM32_DLLS"/mfc140.dll + cp "$W_TMP"/mfc140u.dll "$W_SYSTEM32_DLLS"/mfc140u.dll + cp "$W_TMP"/mfcm140.dll "$W_SYSTEM32_DLLS"/mfcm140.dll + cp "$W_TMP"/mfcm140u.dll "$W_SYSTEM32_DLLS"/mfcm140u.dll + cp "$W_TMP"/msvcp140.dll "$W_SYSTEM32_DLLS"/msvcp140.dll + cp "$W_TMP"/vcamp140.dll "$W_SYSTEM32_DLLS"/vcamp140.dll + cp "$W_TMP"/vccorlib140.dll "$W_SYSTEM32_DLLS"/vccorlib140.dll + cp "$W_TMP"/vcomp140.dll "$W_SYSTEM32_DLLS"/vcomp140.dll + cp "$W_TMP"/vcruntime140.dll "$W_SYSTEM32_DLLS"/vcruntime140.dll + else + w_try "$WINE" vc_redist.x86.exe $W_UNATTENDED_SLASH_Q + fi + + case "$W_ARCH" in + win64) + # Also install the 64 bit version + # 2015/10/12: 3155cb0f146b927fcc30647c1a904cd162548c8c + w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe 3155cb0f146b927fcc30647c1a904cd162548c8c + if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls" + then + w_try_cabextract --directory="$W_TMP" vc_redist.x64.exe + w_try_cabextract --directory="$W_TMP" "$W_TMP/a10" + w_try_cabextract --directory="$W_TMP" "$W_TMP/a11" + cp "$W_TMP"/concrt140.dll "$W_SYSTEM64_DLLS"/concrt140.dll + cp "$W_TMP"/mfc140.dll "$W_SYSTEM64_DLLS"/mfc140.dll + cp "$W_TMP"/mfc140u.dll "$W_SYSTEM64_DLLS"/mfc140u.dll + cp "$W_TMP"/mfcm140.dll "$W_SYSTEM64_DLLS"/mfcm140.dll + cp "$W_TMP"/mfcm140u.dll "$W_SYSTEM64_DLLS"/mfcm140u.dll + cp "$W_TMP"/msvcp140.dll "$W_SYSTEM64_DLLS"/msvcp140.dll + cp "$W_TMP"/vcamp140.dll "$W_SYSTEM64_DLLS"/vcamp140.dll + cp "$W_TMP"/vccorlib140.dll "$W_SYSTEM64_DLLS"/vccorlib140.dll + cp "$W_TMP"/vcomp140.dll "$W_SYSTEM64_DLLS"/vcomp140.dll + cp "$W_TMP"/vcruntime140.dll "$W_SYSTEM64_DLLS"/vcruntime140.dll + else + w_try "$WINE" vc_redist.x64.exe $W_UNATTENDED_SLASH_Q + fi + ;; + esac +} + +#---------------------------------------------------------------- + w_metadata vjrun20 dlls \ title="MS Visual J# 2.0 SE libraries (requires dotnet20)" \ publisher="Microsoft" \