From e621da3a7aab954f293ce83e59e907433c0ec4d0 Mon Sep 17 00:00:00 2001 From: Michael Cronenworth Date: Tue, 2 Jun 2020 15:52:14 -0500 Subject: [PATCH] Add patch for WineHQ bug 49208 --- wine-5.8-kernel32.patch | 27 +++++++++++++++++++++++++++ wine.spec | 4 ++++ 2 files changed, 31 insertions(+) create mode 100644 wine-5.8-kernel32.patch diff --git a/wine-5.8-kernel32.patch b/wine-5.8-kernel32.patch new file mode 100644 index 0000000..4345b38 --- /dev/null +++ b/wine-5.8-kernel32.patch @@ -0,0 +1,27 @@ +From 613389059006270fc89abdfb984c43e6fa742a9a Mon Sep 17 00:00:00 2001 +From: Alexandre Julliard +Date: Tue, 26 May 2020 12:26:31 +0200 +Subject: [PATCH] kernel32: Leave some more space for kernelbase. + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49208 +Signed-off-by: Alexandre Julliard +--- + dlls/kernel32/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in +index b3877fe13b..d9b1ca575c 100644 +--- a/dlls/kernel32/Makefile.in ++++ b/dlls/kernel32/Makefile.in +@@ -3,7 +3,7 @@ MODULE = kernel32.dll + IMPORTLIB = kernel32 + IMPORTS = winecrt0 kernelbase ntdll + EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) $(RT_LIBS) +-EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b400000 ++EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b600000 + + C_SRCS = \ + actctx.c \ +-- +2.20.1 + diff --git a/wine.spec b/wine.spec index 26a3f7a..ffb9fc9 100644 --- a/wine.spec +++ b/wine.spec @@ -74,6 +74,8 @@ Source109: wine-oleview.desktop Source150: wine.appdata.xml # wine bugs +# https://source.winehq.org/git/wine.git/commit/613389059006270fc89abdfb984c43e6fa742a9a +Patch100: wine-5.8-kernel32.patch # desktop dir Source200: wine.menu @@ -681,6 +683,7 @@ This package adds the opencl driver for wine. %prep %setup -q -n wine-%{version} %patch511 -p1 -b.cjk +%patch100 -p1 -b.kernel32 %if 0%{?wine_staging} # setup and apply wine-staging patches @@ -2311,6 +2314,7 @@ fi %changelog * Tue Jun 02 2020 Michael Cronenworth 5.9-2 - drop typelibs from 32-bit devel package +- add patch for wine bug 49208 * Fri May 29 2020 Michael Cronenworth 5.9-1 - version update