Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2015-10-19 22:53:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2015-10-06 13:26:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2015-10-20 00:07:04.000000000 +0200 @@ -1,0 +2,20 @@ +Sat Oct 17 18:13:42 UTC 2015 - [email protected] + +- remove prelink build dependency +- wine-relocate-base.patch: Use the -Ttext-segment linker option to + specify the text segment start. + +------------------------------------------------------------------- +Fri Oct 16 14:24:25 UTC 2015 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- wine-1.7.52.tar.bz2 wine-1.7.52.tar.bz2.sign New: ---- wine-1.7.53.tar.bz2 wine-1.7.53.tar.bz2.sign wine-relocate-base.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.l7yRT1/_old 2015-10-20 00:07:06.000000000 +0200 +++ /var/tmp/diff_new_pack.l7yRT1/_new 2015-10-20 00:07:06.000000000 +0200 @@ -48,10 +48,6 @@ BuildRequires: openldap2-devel BuildRequires: openssl-devel BuildRequires: pkgconfig -%ifarch %{ix86} x86_64 -# only used on win32 and win64 today -BuildRequires: prelink -%endif # Marcus: remove it in devel too if you remove it here. BuildRequires: gcc48 @@ -60,19 +56,15 @@ 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 @@ -84,6 +76,7 @@ # SUSE specific patches # - currently none, but add them here #Patch0: susepatches.patch +Patch1: wine-relocate-base.patch Recommends: wine-gecko >= 2.24 Recommends: wine-mp3 # not packaged in distro... @@ -130,6 +123,7 @@ %prep %setup -q #%patch0 -p1 +%patch1 -p1 # cp %{S:3} . # ++++++ wine-1.7.52.tar.bz2 -> wine-1.7.53.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.7.52.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.7.53.tar.bz2 differ: char 11, line 1 ++++++ wine-relocate-base.patch ++++++ 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 <[email protected]> --- 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 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.l7yRT1/_old 2015-10-20 00:07:06.000000000 +0200 +++ /var/tmp/diff_new_pack.l7yRT1/_new 2015-10-20 00:07:06.000000000 +0200 @@ -8058,6 +8058,70 @@ #---------------------------------------------------------------- +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" \
