diff --git a/patch.txt b/patch.txt new file mode 100644 index 0000000..0dc6821 --- /dev/null +++ b/patch.txt @@ -0,0 +1,13 @@ +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 ); diff --git a/wine.changes b/wine.changes index 161d43c..6ea7931 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 29 13:36:55 UTC 2020 - Marcus Meissner + +- 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 diff --git a/wine.spec b/wine.spec index b6364a0..51e820d 100644 --- a/wine.spec +++ b/wine.spec @@ -138,7 +138,7 @@ Source7: baselibs.conf 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 @@ libraries. %prep %setup -q -n wine-%{realver} -#patch0 -p1 +%patch0 -p1 # cp %{S:3} . #