rpm/wine
SHA256
1
0
Fork 0
forked from pool/wine
Code Pull Requests Activity

Accepting request 342035 from Emulators

Browse Source 
- Updated to 1.7.54 development snapshot
  - Implementation of the TransmitFile function.
  - More implementation of the Web Services DLL.
  - Improved video decoding.
  - Alternative for the deprecated prelink tool.
  - Major Turkish translation update.
  - Various bug fixes.
- wine-relocate-base.patch: is upstream
- winetricks: updated

OBS-URL: https://build.opensuse.org/request/show/342035
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=186
This commit is contained in:
Dominique Leuenberger 2015-11-02 11:55:56 +00:00 committed by Git OBS Bridge
commit 49fe4cd4e3
8 changed files with 77 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wine-1.7.53.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:efba70b106cde683a50a4b1f42df3d900f8ffc291a3689cb897afcc12cc2c6a3
size 22763993

7
wine-1.7.53.tar.bz2.sign
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlYhA4IACgkQ9ebp7rlGHdf+IQCgr+4xT3jOe5WDKdpvZSXCS/c/
XJoAnAvZ//aGCsNbJ4dpx1FRVqCAosd3
=0Ihm
-----END PGP SIGNATURE-----

3
wine-1.7.54.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e0f311f392815468df774b33312cde80bf1ff3a894c9c2b462825fd49619bb27
size 22800326

7
wine-1.7.54.tar.bz2.sign Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlYzbtAACgkQ9ebp7rlGHdentwCfY93eywie52ua631Fqzv3Ze7l
1VwAoKPkKxZlxWNRdXMmr+a50PlO+Ycr
=Y3a6
-----END PGP SIGNATURE-----

68
wine-relocate-base.patch
View File

@ -1,68 +0,0 @@
Prelink was used to rewrite binares and set their text segment, but
modern linkers support setting the value at link time. Prelink is
being retired by upstream.
Signed-off-by: Michael Cronenworth <mike@cchtml.com>
---
configure.ac | 11 ++++++++---
tools/winegcc/winegcc.c | 11 +++++++++--
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index de8cde5..f283802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -988,10 +988,15 @@ wine-installed: main.o
*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;;
esac
])
- AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
- if test "x$PRELINK" = xfalse
+ WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],
+ [HAVE_TTEXT_SEGMENT="yes"])
+ if test "x$HAVE_TTEXT_SEGMENT" != "xyes"
then
- WINE_WARNING([prelink not found, base address of core dlls won't be set correctly.])
+ AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
+ if test "x$PRELINK" = xfalse
+ then
+ WINE_WARNING([prelink not found and linker does not support relocation, base address of core dlls won't be set correctly.])
+ fi
fi
;;
esac
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 3b2794e..4acd12d 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1134,6 +1134,12 @@ static void build(struct options* opts)
}
break;
default:
+ /* Try option first, modern linkers support this */
+ if (opts->image_base &&
+ !try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)))
+ {
+ strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base));
+ }
break;
}
@@ -1167,8 +1173,9 @@ static void build(struct options* opts)
spawn(opts->prefix, link_args, 0);
strarray_free (link_args);
- /* set the base address */
- if (opts->image_base && !opts->target)
+ /* set the base address with prelink if linker support is not present */
+ if (opts->image_base && !opts->target &&
+ try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)))
{
const char *prelink = PRELINK;
if (prelink[0] && strcmp(prelink,"false"))
--
2.4.3

13
wine.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Oct 30 13:46:11 UTC 2015 - meissner@suse.com
- Updated to 1.7.54 development snapshot
- Implementation of the TransmitFile function.
- More implementation of the Web Services DLL.
- Improved video decoding.
- Alternative for the deprecated prelink tool.
- Major Turkish translation update.
- Various bug fixes.
- wine-relocate-base.patch: is upstream
- winetricks: updated
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 23 09:25:26 UTC 2015 - meissner@suse.com Fri Oct 23 09:25:26 UTC 2015 - meissner@suse.com

10
wine.spec
View File

@ -52,7 +52,7 @@ BuildRequires: sane-backends-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
Version: 1.7.53 Version: 1.7.54
Release: 0 Release: 0
Summary: An MS Windows Emulator Summary: An MS Windows Emulator
License: LGPL-2.1+ License: LGPL-2.1+
@ -72,7 +72,6 @@ Source7: baselibs.conf
# SUSE specific patches # SUSE specific patches
# - currently none, but add them here # - currently none, but add them here
#Patch0: susepatches.patch #Patch0: susepatches.patch
Patch1: wine-relocate-base.patch
Recommends: wine-gecko >= 2.24 Recommends: wine-gecko >= 2.24
Recommends: wine-mp3 Recommends: wine-mp3
# not packaged in distro... # not packaged in distro...
@ -118,7 +117,6 @@ libraries.
%prep %prep
%setup -q %setup -q
#%patch0 -p1 #%patch0 -p1
%patch1 -p1
# #
cp %{S:3} . cp %{S:3} .
# #
@ -174,7 +172,9 @@ install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/
install -m 0755 %SOURCE2 %{buildroot}%{_bindir}/ install -m 0755 %SOURCE2 %{buildroot}%{_bindir}/
mv %{buildroot}/%{_mandir}/de.UTF-8 %{buildroot}/%{_mandir}/de mv %{buildroot}/%{_mandir}/de.UTF-8 %{buildroot}/%{_mandir}/de
mv %{buildroot}/%{_mandir}/fr.UTF-8 %{buildroot}/%{_mandir}/fr mv %{buildroot}/%{_mandir}/fr.UTF-8 %{buildroot}/%{_mandir}/fr
%ifnarch x86_64
mv %{buildroot}/%{_mandir}/pl.UTF-8 %{buildroot}/%{_mandir}/pl mv %{buildroot}/%{_mandir}/pl.UTF-8 %{buildroot}/%{_mandir}/pl
%endif
install -c %{SOURCE11} %{buildroot}/%{_mandir}/man1/ install -c %{SOURCE11} %{buildroot}/%{_mandir}/man1/
tar xjf %{SOURCE5} tar xjf %{SOURCE5}
@ -238,12 +238,16 @@ chmod 755 %winedir/my-find-requires.sh
%{_bindir}/wisotool %{_bindir}/wisotool
%{_datadir}/wine %{_datadir}/wine
%{_datadir}/applications/wine.desktop %{_datadir}/applications/wine.desktop
%ifnarch x86_64
%doc %{_mandir}/man1/wine.1* %doc %{_mandir}/man1/wine.1*
%endif
%doc %{_mandir}/man1/winedbg.1* %doc %{_mandir}/man1/winedbg.1*
%doc %{_mandir}/man1/wineserver.1* %doc %{_mandir}/man1/wineserver.1*
%ifnarch x86_64
%doc %dir %doc %{_mandir}/pl %doc %dir %doc %{_mandir}/pl
%doc %dir %doc %{_mandir}/pl/man1 %doc %dir %doc %{_mandir}/pl/man1
%doc %{_mandir}/*/man1/wine.1* %doc %{_mandir}/*/man1/wine.1*
%endif
%doc %{_mandir}/*/man1/wineserver.1* %doc %{_mandir}/*/man1/wineserver.1*
%doc %{_mandir}/man1/msiexec.1.* %doc %{_mandir}/man1/msiexec.1.*
%doc %{_mandir}/man1/notepad.1.* %doc %{_mandir}/man1/notepad.1.*

48
winetricks
View File

@ -8020,6 +8020,29 @@ load_vcrun2012()
else else
w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q
fi fi
case "$W_ARCH" in
win64)
# Also install the 64 bit version
# 2015/10/19: 1a5d93dddbc431ab27b1da711cd3370891542797
w_download http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe 1a5d93dddbc431ab27b1da711cd3370891542797
if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls"
then
rm -f "$W_TMP"/* # Avoid permission error
w_try_cabextract --directory="$W_TMP" vcredist_x64.exe
w_try_cabextract --directory="$W_TMP" "$W_TMP/a2"
w_try_cabextract --directory="$W_TMP" "$W_TMP/a3"
cp "$W_TMP"/F_CENTRAL_atl110_x64 "$W_SYSTEM64_DLLS"/atl110.dll
cp "$W_TMP"/F_CENTRAL_mfc110_x64 "$W_SYSTEM64_DLLS"/mfc110.dll
cp "$W_TMP"/F_CENTRAL_mfc110u_x64 "$W_SYSTEM64_DLLS"/mfc110u.dll
cp "$W_TMP"/F_CENTRAL_msvcp110_x64 "$W_SYSTEM64_DLLS"/msvcp110.dll
cp "$W_TMP"/F_CENTRAL_msvcr110_x64 "$W_SYSTEM64_DLLS"/msvcr110.dll
cp "$W_TMP"/F_CENTRAL_vcomp110_x64 "$W_SYSTEM64_DLLS"/vcomp110.dll
else
w_try "$WINE" vcredist_x64.exe $W_UNATTENDED_SLASH_Q
fi
;;
esac
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
@ -8054,6 +8077,28 @@ load_vcrun2013()
else else
w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q w_try "$WINE" vcredist_x86.exe $W_UNATTENDED_SLASH_Q
fi fi
case "$W_ARCH" in
win64)
# Also install the 64 bit version
# 2015/10/19: 8bf41ba9eef02d30635a10433817dbb6886da5a2
w_download http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe 8bf41ba9eef02d30635a10433817dbb6886da5a2
if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls"
then
rm -f "$W_TMP"/* # Avoid permission error
w_try_cabextract --directory="$W_TMP" vcredist_x64.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_x64 "$W_SYSTEM64_DLLS"/mfc120.dll
cp "$W_TMP"/F_CENTRAL_mfc120u_x64 "$W_SYSTEM64_DLLS"/mfc120u.dll
cp "$W_TMP"/F_CENTRAL_msvcp120_x64 "$W_SYSTEM64_DLLS"/msvcp120.dll
cp "$W_TMP"/F_CENTRAL_msvcr120_x64 "$W_SYSTEM64_DLLS"/msvcr120.dll
cp "$W_TMP"/F_CENTRAL_vcomp120_x64 "$W_SYSTEM64_DLLS"/vcomp120.dll
else
w_try "$WINE" vcredist_x64.exe $W_UNATTENDED_SLASH_Q
fi
;;
esac
} }
#---------------------------------------------------------------- #----------------------------------------------------------------
@ -8100,6 +8145,7 @@ load_vcrun2015()
w_download https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe 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" if w_workaround_wine_bug 30713 "Manually extracting the 64-bit dlls"
then then
rm -f "$W_TMP"/* # Avoid permission error
w_try_cabextract --directory="$W_TMP" vc_redist.x64.exe 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/a10"
w_try_cabextract --directory="$W_TMP" "$W_TMP/a11" w_try_cabextract --directory="$W_TMP" "$W_TMP/a11"
@ -8945,7 +8991,7 @@ load_fontfix()
# SDKSetup encountered an error: The type initializer for 'Microsoft.WizardFramework.WizardSettings' threw an exception # SDKSetup encountered an error: The type initializer for 'Microsoft.WizardFramework.WizardSettings' threw an exception
# and WINEDEBUG=+relay,+seh shows an exception very quickly after # and WINEDEBUG=+relay,+seh shows an exception very quickly after
# Call KERNEL32.CreateFileW(0c83b36c L"Z:\\USR\\SHARE\\FONTS\\TRUETYPE\\TTF-ORIYA-FONTS\\SAMYAK-ORIYA.TTF",80000000,00000001,00000000,00000003,00000080,00000000) ret=70d44091 # Call KERNEL32.CreateFileW(0c83b36c L"Z:\\USR\\SHARE\\FONTS\\TRUETYPE\\TTF-ORIYA-FONTS\\SAMYAK-ORIYA.TTF",80000000,00000001,00000000,00000003,00000080,00000000) ret=70d44091
if xlsfonts 2>/dev/null | egrep -i "samyak|oriya" if xlsfonts 2>/dev/null | egrep -i "samyak.*oriya"
then then
w_die "Please uninstall the Samyak/Oriya font, e.g. 'sudo dpkg -r ttf-oriya-fonts', then log out and log in again. That font causes strange crashes in .net programs." w_die "Please uninstall the Samyak/Oriya font, e.g. 'sudo dpkg -r ttf-oriya-fonts', then log out and log in again. That font causes strange crashes in .net programs."
fi fi