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

Accepting request 798934 from Emulators

Browse Source 
- patch.txt: fix for wineserver crash (https://bugs.winehq.org/show_bug.cgi?id=49011)

- Fix file list for %arm and aarch64

OBS-URL: https://build.opensuse.org/request/show/798934
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=306
This commit is contained in:
Dominique Leuenberger 2020-04-29 18:51:34 +00:00 committed by Git OBS Bridge
commit b6be38fa10
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patch.txt Normal file
View File

@ -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 );

10
wine.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Sat Apr 25 06:01:10 UTC 2020 - Marcus Meissner <meissner@suse.com>

10
wine.spec
View File

@ -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} .
#
@ -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