rpms
/
wine
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 5.10

Browse Source
f38
Michael Cronenworth 5 years ago
parent e621da3a7a
commit 4a5b3c2883
4 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File

6
.gitignore vendored
Unescape View File

@ -1,3 +1,3 @@
/wine-5.9.tar.xz
/wine-5.9.tar.xz.sign
/wine-staging-5.9.tar.gz
/wine-5.10.tar.xz
/wine-5.10.tar.xz.sign
/wine-staging-5.10.tar.gz

6
sources
Unescape View File

@ -1,3 +1,3 @@
SHA512 (wine-5.9.tar.xz) = edc6d55a275cf37430a62dc6d6d86bff6d5a434e708dbd99d245018db7f6a0abe39581a1d91eb947f204a45ac94cc5c931745169a3b63a2aecf8db277553b74b
SHA512 (wine-5.9.tar.xz.sign) = 1a048d9e4229eb6391a8a48027af8c2511b5c921c70fb1c6a398570d5656c0747746d34d7d3458a7be68220d00130676ad97ddeaaee94023a63f9afeba833357
SHA512 (wine-staging-5.9.tar.gz) = 8fcf448be21edc0ccf8afef75013298c8f1634b51cd4d927ee5a1d039552d7c29609f65f283519b6561d09eb6eeae91fa6db70b9e78e4fd8bb5318408b39fb33
SHA512 (wine-5.10.tar.xz) = 669d6861525cd4ab000113e8d9c5e10822b62b293914542ee34a826696df66e1d2f09b09f576f714e4117e79e25d1fd0b2a06c57d29da0efa0bdfcb9fee59c60
SHA512 (wine-5.10.tar.xz.sign) = 809c9d4d37440bc6beac0b6da9c69e81c055f3ea606261c21dd2e1ce02e71976f3fc3433e0bd87cc8431b5cd49cab9db01d4bf62bd23fe294ca7a5180adab7ee
SHA512 (wine-staging-5.10.tar.gz) = fca5ddb648ac45c242b9bd7ccb0980161bff1e3539aa1a116f1cceece9d3b4a3188c82bd93624f561653dda793ad16dc00a87c7ed0c38f19a93b538519ef806c

27
wine-5.8-kernel32.patch
Unescape View File

@ -1,27 +0,0 @@
From 613389059006270fc89abdfb984c43e6fa742a9a Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
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 <julliard@winehq.org>
---
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

42
wine.spec
Unescape View File

@ -32,7 +32,8 @@
# build with wine-staging patches, see: https://github.com/wine-staging/wine-staging
%if 0%{?fedora}
%global wine_staging 1
%endif # 0%{?fedora}
%endif
# 0%%{?fedora}
# binfmt macros for RHEL
%if 0%{?rhel} == 7
@ -43,8 +44,8 @@
%endif
Name: wine
Version: 5.9
Release: 2%{?dist}
Version: 5.10
Release: 1%{?dist}
Summary: A compatibility layer for windows applications
License: LGPLv2+
@ -74,8 +75,6 @@ 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
@ -185,7 +184,8 @@ BuildRequires: libappstream-glib
BuildRequires: gtk3-devel
BuildRequires: libattr-devel
BuildRequires: libva-devel
%endif # 0%{?wine_staging}
%endif
# 0%%{?wine_staging}
%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
BuildRequires: openal-soft-devel
@ -432,9 +432,11 @@ BuildArch: noarch
# arial-fonts are available with wine-staging patchset, only.
%if 0%{?wine_staging}
Requires: wine-arial-fonts = %{version}-%{release}
%else # 0%{?wine_staging}
%else
# 0%%{?wine_staging}
Obsoletes: wine-arial-fonts <= %{version}-%{release}
%endif # 0%{?wine_staging}
%endif
# 0%%{?wine_staging}
Requires: wine-courier-fonts = %{version}-%{release}
Requires: wine-fixedsys-fonts = %{version}-%{release}
Requires: wine-small-fonts = %{version}-%{release}
@ -445,10 +447,12 @@ Requires: wine-tahoma-fonts = %{version}-%{release}
# times-new-roman-fonts are available with wine_staging-patchset, only.
%if 0%{?wine_staging}
Requires: wine-times-new-roman-fonts = %{version}-%{release}
%else # 0%{?wine_staging}
%else
# 0%%{?wine_staging}
Obsoletes: wine-times-new-roman-fonts <= %{version}-%{release}
Obsoletes: wine-times-new-roman-fonts-system <= %{version}-%{release}
%endif # 0%{?wine_staging}
%endif
# 0%%{?wine_staging}
Requires: wine-symbol-fonts = %{version}-%{release}
Requires: wine-wingdings-fonts = %{version}-%{release}
# intermediate fix for #593140
@ -468,7 +472,8 @@ Requires: fontpackages-filesystem
%description arial-fonts
%{summary}
%endif # 0%{?wine_staging}
%endif
# 0%%{?wine_staging}
%package courier-fonts
Summary: Wine Courier font family
@ -683,7 +688,6 @@ 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
@ -694,7 +698,8 @@ patches/patchinstall.sh DESTDIR="`pwd`" --all
# fix parallelized build
sed -i -e 's!^loader server: libs/port libs/wine tools.*!& include!' Makefile.in
%endif # 0%{?wine_staging}
%endif
# 0%%{?wine_staging}
%build
@ -1273,9 +1278,11 @@ fi
%{_libdir}/wine/api-ms-win-core-libraryloader-l1-2-0.%{winedll}
%{_libdir}/wine/api-ms-win-core-libraryloader-l1-2-1.%{winedll}
%{_libdir}/wine/api-ms-win-core-libraryloader-l1-2-2.%{winedll}
%{_libdir}/wine/api-ms-win-core-libraryloader-l2-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-core-localization-l1-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-core-localization-l1-2-0.%{winedll}
%{_libdir}/wine/api-ms-win-core-localization-l1-2-1.%{winedll}
%{_libdir}/wine/api-ms-win-core-localization-l1-2-2.%{winedll}
%{_libdir}/wine/api-ms-win-core-localization-l2-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-core-localization-obsolete-l1-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-core-localization-obsolete-l1-2-0.%{winedll}
@ -1285,6 +1292,7 @@ fi
%{_libdir}/wine/api-ms-win-core-memory-l1-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-core-memory-l1-1-1.%{winedll}
%{_libdir}/wine/api-ms-win-core-memory-l1-1-2.%{winedll}
%{_libdir}/wine/api-ms-win-core-memory-l1-1-4.%{winedll}
%{_libdir}/wine/api-ms-win-core-misc-l1-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-core-namedpipe-l1-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-core-namedpipe-l1-2-0.%{winedll}
@ -1373,6 +1381,7 @@ fi
%{_libdir}/wine/api-ms-win-devices-query-l1-1-1.%{winedll}
%{_libdir}/wine/api-ms-win-downlevel-advapi32-l1-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-downlevel-advapi32-l2-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-downlevel-kernel32-l2-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-downlevel-normaliz-l1-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-downlevel-ole32-l1-1-0.%{winedll}
%{_libdir}/wine/api-ms-win-downlevel-shell32-l1-1-0.%{winedll}
@ -1766,6 +1775,7 @@ fi
%{_libdir}/wine/ndis.%{winesys}
%{_libdir}/wine/netapi32.dll.so
%{_libdir}/wine/netcfgx.%{winedll}
%{_libdir}/wine/netio.%{winesys}
%{_libdir}/wine/netprofm.%{winedll}
%{_libdir}/wine/netsh.%{wineexe}
%{_libdir}/wine/newdev.%{winedll}
@ -2147,7 +2157,8 @@ fi
%files arial-fonts
%doc COPYING.LIB
%{_datadir}/wine/fonts/arial*
%endif #0%{?wine_staging}
%endif
#0%%{?wine_staging}
%files courier-fonts
%doc COPYING.LIB
@ -2312,6 +2323,9 @@ fi
%endif
%changelog
* Sun Jun 07 2020 Michael Cronenworth <mike@cchtml.com> 5.10-1
- version update
* Tue Jun 02 2020 Michael Cronenworth <mike@cchtml.com> 5.9-2
- drop typelibs from 32-bit devel package
- add patch for wine bug 49208

Write Preview
Loading…
Cancel
Save