From e82757173131d21e0c02247dca793c79da63bcc2e135a85e4d7b5775d146f942 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 11 Aug 2014 06:22:30 +0000
Subject: [PATCH] - Updated to 1.7.24 development snapshot   - Beginning of
 some DirectWrite classes implementation.   - Initial wrapper dll for the
 packet capture library.   - Some crypto improvements.   - Various bug fixes.
 - updated winetricks

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=231
---
 wine-1.7.23.tar.bz2      |  3 ---
 wine-1.7.23.tar.bz2.sign |  7 -------
 wine-1.7.24.tar.bz2      |  3 +++
 wine-1.7.24.tar.bz2.sign |  7 +++++++
 wine.changes             | 10 ++++++++++
 wine.spec                |  2 +-
 winetricks               | 33 ++++++++++++++++++++++++++++++++-
 7 files changed, 53 insertions(+), 12 deletions(-)
 delete mode 100644 wine-1.7.23.tar.bz2
 delete mode 100644 wine-1.7.23.tar.bz2.sign
 create mode 100644 wine-1.7.24.tar.bz2
 create mode 100644 wine-1.7.24.tar.bz2.sign

diff --git a/wine-1.7.23.tar.bz2 b/wine-1.7.23.tar.bz2
deleted file mode 100644
index c0a5466..0000000
--- a/wine-1.7.23.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db9c7b3b87edde7c63b2c5ae81631771b03650d7435461139fca2b177de05c04
-size 21712056
diff --git a/wine-1.7.23.tar.bz2.sign b/wine-1.7.23.tar.bz2.sign
deleted file mode 100644
index d86fd50..0000000
--- a/wine-1.7.23.tar.bz2.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.15 (GNU/Linux)
-
-iEYEABECAAYFAlPSbzIACgkQ9ebp7rlGHdes9gCgoxyJl0PrxNmDFqGdiSoD2gHJ
-/+0Ani89EYEZr7YUafLzkPv/6HaGEmuc
-=LZlQ
------END PGP SIGNATURE-----
diff --git a/wine-1.7.24.tar.bz2 b/wine-1.7.24.tar.bz2
new file mode 100644
index 0000000..ab5ea46
--- /dev/null
+++ b/wine-1.7.24.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e9a9f250b6eb703cdc13c6dcfe025958dadddfdd3f8e683f46c2d642b5ec749
+size 21715711
diff --git a/wine-1.7.24.tar.bz2.sign b/wine-1.7.24.tar.bz2.sign
new file mode 100644
index 0000000..c45807e
--- /dev/null
+++ b/wine-1.7.24.tar.bz2.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.15 (GNU/Linux)
+
+iEYEABECAAYFAlPlMOwACgkQ9ebp7rlGHdfXkwCdEo0MTbxHcXAdkhSwcC6kAXee
+rSMAn08rT4LxkV9c/S/xCzMe4fvmVoSz
+=9mTh
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index 903c0e8..5174473 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Aug 11 05:36:04 UTC 2014 - meissner@suse.com
+
+- Updated to 1.7.24 development snapshot
+  - Beginning of some DirectWrite classes implementation.
+  - Initial wrapper dll for the packet capture library.
+  - Some crypto improvements.
+  - Various bug fixes.
+- updated winetricks
+
 -------------------------------------------------------------------
 Sat Jul 26 08:13:06 UTC 2014 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index 41d970e..97a6692 100644
--- a/wine.spec
+++ b/wine.spec
@@ -55,7 +55,7 @@ BuildRequires:  sane-backends-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  valgrind-devel
 BuildRequires:  xorg-x11-devel
-Version:        1.7.23
+Version:        1.7.24
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1+
diff --git a/winetricks b/winetricks
index 33d802b..be8514d 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=20140609
+WINETRICKS_VERSION=20140726
 
 # This is a utf-8 file
 # You should see an o with two dots over it here [ö]
@@ -7259,7 +7259,38 @@ load_vcrun2012()
     else
         w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q
     fi
+}
 
+#----------------------------------------------------------------
+
+w_metadata vcrun2013 dlls \
+    title="Visual C++ 2013 libraries (mfc120,mfc120u,msvcp120,msvcr120,vcomp120)" \
+    publisher="Microsoft" \
+    year="2013" \
+    media="download" \
+    file1="vcredist_x86.exe" \
+    installed_file1="$W_SYSTEM32_DLLS_WIN/mfc120.dll"
+
+load_vcrun2013()
+{
+    # http://www.microsoft.com/en-us/download/details.aspx?id=40784
+    w_download http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe 18f81495bc5e6b293c69c28b0ac088a96debbab2
+
+    w_override_dlls native,builtin atl120 msvcp120 msvcr120 vcomp120
+    cd "$W_CACHE"/vcrun2013
+    if w_workaround_wine_bug 17273 "Manually extracting dlls"
+    then
+        w_try_cabextract --directory="$W_TMP" vcredist_x86.exe
+        w_try_cabextract --directory="$W_TMP" "$W_TMP/a2"
+        w_try_cabextract --directory="$W_TMP" "$W_TMP/a3"
+        cp "$W_TMP"/F_CENTRAL_mfc120_x86 "$W_SYSTEM32_DLLS"/mfc120.dll
+        cp "$W_TMP"/F_CENTRAL_mfc120u_x86 "$W_SYSTEM32_DLLS"/mfc120u.dll
+        cp "$W_TMP"/F_CENTRAL_msvcp120_x86 "$W_SYSTEM32_DLLS"/msvcp120.dll
+        cp "$W_TMP"/F_CENTRAL_msvcr120_x86 "$W_SYSTEM32_DLLS"/msvcr120.dll
+        cp "$W_TMP"/F_CENTRAL_vcomp120_x86 "$W_SYSTEM32_DLLS"/vcomp120.dll
+    else
+        w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q
+    fi
 }
 
 #----------------------------------------------------------------