From d0f8ce1d04adefada677008ee30c45c2b216baf7a2bfe4202aba7f03f543b1a1 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Fri, 28 Nov 2014 20:44:20 +0000
Subject: [PATCH] - Updated to 1.7.32 development snapshot - New version of
the Mono engine. - A few more functions implemented in MSHTML. - Improved
support for restoring display mode. - Font metrics improvements in
DirectWrite. - Various bug fixes. - updated winetricks to current version
OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=252
---
wine-1.7.31.tar.bz2 | 3 ---
wine-1.7.31.tar.bz2.sign | 7 -------
wine-1.7.32.tar.bz2 | 3 +++
wine-1.7.32.tar.bz2.sign | 7 +++++++
wine.changes | 11 +++++++++++
wine.spec | 2 +-
winetricks | 38 ++++++++++++++++++++------------------
7 files changed, 42 insertions(+), 29 deletions(-)
delete mode 100644 wine-1.7.31.tar.bz2
delete mode 100644 wine-1.7.31.tar.bz2.sign
create mode 100644 wine-1.7.32.tar.bz2
create mode 100644 wine-1.7.32.tar.bz2.sign
diff --git a/wine-1.7.31.tar.bz2 b/wine-1.7.31.tar.bz2
deleted file mode 100644
index f38bd9f..0000000
--- a/wine-1.7.31.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c6e62cb3bfab8505f8b9cbde0fe81072043875c4e655bd1dedd2a5f613ce490
-size 21886336
diff --git a/wine-1.7.31.tar.bz2.sign b/wine-1.7.31.tar.bz2.sign
deleted file mode 100644
index 95b0f57..0000000
--- a/wine-1.7.31.tar.bz2.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.15 (GNU/Linux)
-
-iEYEABECAAYFAlRmA40ACgkQ9ebp7rlGHddjGACfRDGQb4qFfllbf+3EX0xUVrsQ
-w8cAnjlOl/1Ffjua//paxrbRS/25ffOk
-=NwZQ
------END PGP SIGNATURE-----
diff --git a/wine-1.7.32.tar.bz2 b/wine-1.7.32.tar.bz2
new file mode 100644
index 0000000..4ebf31c
--- /dev/null
+++ b/wine-1.7.32.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66a9c26089ad3b300aac1ac52e9515c69a7e6f26aff3250a7f1401e3f14de4db
+size 21893431
diff --git a/wine-1.7.32.tar.bz2.sign b/wine-1.7.32.tar.bz2.sign
new file mode 100644
index 0000000..be7069b
--- /dev/null
+++ b/wine-1.7.32.tar.bz2.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlR40coACgkQ9ebp7rlGHdfMjACgmv8bOrSRi1ygQTDVemyEgyZ7
+6V0An34X/1YKGhWPJ1UqwRovd4y6/l8F
+=F2EQ
+-----END PGP SIGNATURE-----
diff --git a/wine.changes b/wine.changes
index fbb35a3..1eddf77 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Nov 28 20:42:30 UTC 2014 - meissner@suse.com
+
+- Updated to 1.7.32 development snapshot
+ - New version of the Mono engine.
+ - A few more functions implemented in MSHTML.
+ - Improved support for restoring display mode.
+ - Font metrics improvements in DirectWrite.
+ - Various bug fixes.
+- updated winetricks to current version
+
-------------------------------------------------------------------
Sun Nov 16 07:57:54 UTC 2014 - meissner@suse.com
diff --git a/wine.spec b/wine.spec
index 4992942..3bd29bf 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.31
+Version: 1.7.32
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+
diff --git a/winetricks b/winetricks
index 8a274f4..8422249 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=20140817
+WINETRICKS_VERSION=20141125
# This is a utf-8 file
# You should see an o with two dots over it here [รถ]
@@ -1986,6 +1986,7 @@ w_do_call()
load_vd $arg
_W_status=$?
test "$W_OPT_NOCLEAN" = 1 || rm -rf "$W_TMP"
+ mkdir -p "$W_TMP"
return $_W_status
fi
@@ -2018,6 +2019,7 @@ w_do_call()
w_override_dlls $cmd $arg
_W_status=$?
test "$W_OPT_NOCLEAN" = 1 || rm -rf "$W_TMP"
+ mkdir -p "$W_TMP"
return $_W_status
else
w_die "No such verb $1"
@@ -2091,6 +2093,7 @@ w_do_call()
# Clean up after this verb
test "$W_OPT_NOCLEAN" = 1 || rm -rf "$W_TMP"
+ mkdir -p "$W_TMP"
# Calling subshell must explicitly propagate error code with exit $?
) || exit $?
@@ -3688,13 +3691,7 @@ winetricks_init()
w_die "No sha1sum utility available."
fi
- # Which sourceforge mirror to use. Rotate based on time, since
- # their mirror picker sometimes persistantly sends you to a broken
- # mirror.
- case `date +%S` in
- *[3]) WINETRICKS_SOURCEFORGE=http://surfnet.dl.sourceforge.net/sourceforge ;;
- *) WINETRICKS_SOURCEFORGE=http://downloads.sourceforge.net;;
- esac
+ WINETRICKS_SOURCEFORGE=http://downloads.sourceforge.net
#---- Public Variables ----
@@ -4056,7 +4053,8 @@ load_adobeair()
# 2014-03-01: 4.0 sha1sum 0034bdd4e0b2ce0fa6198b0b715fba85754d9a57
# http://helpx.adobe.com/en/flash-player/release-note/fp_12_air_4_release_notes.html
# 2014-09-30: 15.0 sha1sum 46341f1358bc6e0b9ddeae3591662a2ac68dc360
- w_download http://airdownload.adobe.com/air/win/download/15.0/AdobeAIRInstaller.exe 46341f1358bc6e0b9ddeae3591662a2ac68dc360
+ # 2014-11-24: i15.0.0.356 sha1sum c0e6b8b1ed5ffa282945d21b21f8a5e03febc904
+ w_download http://airdownload.adobe.com/air/win/download/15.0/AdobeAIRInstaller.exe c0e6b8b1ed5ffa282945d21b21f8a5e03febc904
cd "$W_CACHE"/adobeair
w_try "$WINE" AdobeAIRInstaller.exe $W_UNATTENDED_DASH_SILENT
}
@@ -4965,7 +4963,8 @@ load_dotnet_verifier()
# http://blogs.msdn.com/b/astebner/archive/2008/10/13/8999004.aspx
# 2013/03/28: sha1sum 0eba832a0733cd47b7639463dd5a22a41e95ee6e
# 2014/01/23: sha1sum 8818f3460826145e2a66bb91727afa7cd531037b
- w_download http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-99-90-04/netfx_5F00_setupverifier_5F00_new.zip 8818f3460826145e2a66bb91727afa7cd531037b
+ # 2014/11/22: sha1sum 47de0b849c4c3d354df23588c709108e7816d788
+ w_download http://blogs.msdn.com/cfs-file.ashx/__key/CommunityServer-Components-PostAttachments/00-08-99-90-04/netfx_5F00_setupverifier_5F00_new.zip 47de0b849c4c3d354df23588c709108e7816d788
cd "$W_CACHE"/dotnet_verifier
@@ -6827,8 +6826,9 @@ load_shockwave() {
# 2014-02-26 sha1sum: ae2855b729bfaedc766f3addd8c2b74eac576909
# 2014-04-15 sha1sum: c2ea56450fb4a5bac66cb7d70e3b522431521787
# 2014-05-21 sha1sum: d95d1a14ee264235b29e093105bd2baa8b06eb12
-
- w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi d95d1a14ee264235b29e093105bd2baa8b06eb12
+ # 2014-11-22 sha1sum: 644d3228654ded798eabe40e7044b96b90e742f6x
+
+ w_download http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi 644d3228654ded798eabe40e7044b96b90e742f6
cd "$W_CACHE"/shockwave
w_try "$WINE" msiexec /i sw_lic_full_installer.msi $W_UNATTENDED_SLASH_Q
}
@@ -7961,7 +7961,9 @@ load_droid()
{
# See http://en.wikipedia.org/wiki/Droid_(font)
# Old url was http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/'
- DROID_URL='https://github.com/android/platform_frameworks_base/blob/master/data/fonts/'
+ # Then it was https://github.com/android/platform_frameworks_base/blob/master/data/fonts/
+ # but the fonts are no longer in master. Using an older commit instead:
+ DROID_URL='https://github.com/android/platform_frameworks_base/blob/feef9887e8f8eb6f64fc1b4552c02efb5755cdc1/data/fonts/'
do_droid DroidSans-Bold.ttf "Droid Sans Bold" 560e4bcafdebaf29645fbf92633a2ae0d2f9801f
do_droid DroidSansFallback.ttf "Droid Sans Fallback" c5e4f11e2f1d0b84e5f268a7ebfd28b54dc6bcdc
@@ -8639,21 +8641,21 @@ load_emu8086()
#----------------------------------------------------------------
w_metadata firefox apps \
- title="Firefox 24" \
+ title="Firefox 33.1" \
publisher="Mozilla" \
- year="2013" \
+ year="2014" \
media="download" \
- file1="Firefox Setup 24.0.exe" \
+ file1="Firefox Setup 33.1.exe" \
installed_exe1="$W_PROGRAMS_X86_WIN/Mozilla Firefox/firefox.exe"
load_firefox()
{
- if w_workaround_wine_bug 29077
+ if w_workaround_wine_bug 29077 "" 1.7.25,
then
w_warn "Visit about:config, search for dom.ipc, and set those booleans false if you want to use flash."
fi
- w_download "http://download.mozilla.org/?product=firefox-24.0&os=win&lang=en-US" d6213601b69a606f4537c394dfa0dd7968b17b93 "$file1"
+ w_download "http://download.mozilla.org/?product=firefox-33.1&os=win&lang=en-US" c721219fda2915c570e3de0954c8033ed7b1e7fa "$file1"
cd "$W_CACHE"/firefox
w_try "$WINE" "$file1" ${W_OPT_UNATTENDED:+ -ms}