From bfe1c18c1fa96b5d50add09e415bc0a3ecfaca2636cff22a2bd6a9a3a56a78af Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 29 Apr 2020 09:18:41 +0000 Subject: [PATCH 1/2] Accepting request 798811 from home:Guillaume_G:branches:Emulators - Fix file list for %arm and aarch64 OBS-URL: https://build.opensuse.org/request/show/798811 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=722 --- wine.changes | 5 +++++ wine.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/wine.changes b/wine.changes index f789ad0..161d43c 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 29 07:54:01 UTC 2020 - Guillaume GARDET + +- Fix file list for %arm and aarch64 + ------------------------------------------------------------------- Sat Apr 25 06:01:10 UTC 2020 - Marcus Meissner diff --git a/wine.spec b/wine.spec index faa638e..b6364a0 100644 --- a/wine.spec +++ b/wine.spec @@ -446,10 +446,12 @@ chmod 755 %winedir/my-find-requires.sh %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 @@ chmod 755 %winedir/my-find-requires.sh %{_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 From ac8636ef6a7efda941dd96ae5c945e51609cfe3d581056ea65448f801056ae3a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 29 Apr 2020 13:37:54 +0000 Subject: [PATCH 2/2] - patch.txt: fix for wineserver crash (https://bugs.winehq.org/show_bug.cgi?id=49011) OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=723 --- patch.txt | 13 +++++++++++++ wine.changes | 5 +++++ wine.spec | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 patch.txt 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} . #