commit wine for openSUSE:Factory
Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2020-04-29 20:51:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Wed Apr 29 20:51:34 2020 rev:306 rq:798934 version:5.7 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2020-04-27 23:32:13.918803420 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new.2738/wine.changes 2020-04-29 20:53:37.605168900 +0200 @@ -1,0 +2,10 @@ +Wed Apr 29 13:36:55 UTC 2020 - Marcus Meissner <meissner@suse.com> + +- patch.txt: fix for wineserver crash (https://bugs.winehq.org/show_bug.cgi?id=49011) + +------------------------------------------------------------------- +Wed Apr 29 07:54:01 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org> + +- Fix file list for %arm and aarch64 + +------------------------------------------------------------------- New: ---- patch.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.OI3Ke9/_old 2020-04-29 20:53:38.761171549 +0200 +++ /var/tmp/diff_new_pack.OI3Ke9/_new 2020-04-29 20:53:38.765171558 +0200 @@ -138,7 +138,7 @@ Source8: wine-rpmlintrc # SUSE specific patches # - currently none, but add them here -#Patch0: susepatches.patch +Patch0: patch.txt Recommends: wine-gecko >= 2.47.1 Conflicts: wine-gecko < 2.47.1 Recommends: wine-mono >= 4.9.2 @@ -215,7 +215,7 @@ %prep %setup -q -n wine-%{realver} -#patch0 -p1 +%patch0 -p1 # cp %{S:3} . # @@ -446,10 +446,12 @@ %endif %{_libdir}/wine/*.so %if 0%{?suse_version} >= 1550 +%ifnarch %arm aarch64 %{_libdir}/wine/*.acm %{_libdir}/wine/*.com %{_libdir}/wine/*.cpl %{_libdir}/wine/*.dll +%endif %ifarch %ix86 %{_libdir}/wine/*.dll16 %{_libdir}/wine/*.drv16 @@ -457,12 +459,16 @@ %{_libdir}/wine/*.mod16 %{_libdir}/wine/*.vxd %endif +%ifnarch %arm aarch64 %{_libdir}/wine/*.drv %{_libdir}/wine/*.exe %{_libdir}/wine/*.ocx %{_libdir}/wine/*.sys %endif +%endif +%ifnarch %arm aarch64 %{_libdir}/wine/*.tlb +%endif %{_libdir}/lib*.so.* %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls ++++++ patch.txt ++++++ diff --git a/server/thread.c b/server/thread.c index cfdf42c756..e5b670649a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1848,7 +1848,7 @@ DECL_HANDLER(get_thread_context) { assert( reply->self ); memset( context, 0, sizeof(context_t) ); - context->cpu = thread_context->regs.cpu; + context->cpu = current->process->cpu; if (req->flags & system_flags) { get_thread_context( thread, context, req->flags & system_flags );
participants (1)
-
root