From 05f015bd83c8c4cde72eb3edf37aed1ce0e4a1d1 Mon Sep 17 00:00:00 2001 From: "survolog (Andrey Grigorev)" Date: Fri, 29 Jan 2021 12:57:32 +0300 Subject: [PATCH] Update to 6.0 and 5.0.3 --- .abf.yml | 4 +- wine-6.0-disable-bans-winetricks.patch | 72 ++++++++++++++++++++++++++ wine.spec | 18 +++++-- 3 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 wine-6.0-disable-bans-winetricks.patch diff --git a/.abf.yml b/.abf.yml index f763b5e..fe289bd 100644 --- a/.abf.yml +++ b/.abf.yml @@ -2,7 +2,7 @@ sources: icons-4.0.tar.xz: 3063b6fcf8d9aeedcb9ecaab9c522bed88a21c0a rosa-wine-desktop-4.4.1.tar.xz: 299d6a589af1e4db705f0e09190a8b388bb74b95 wine-5.0.3.tar.xz: b9bcb22cb2e5777cdd8f16bee60e6080e18dae5b - wine-5.22.tar.xz: 1f2dfcb28de81baddda7ad5d0b7c0c8ef71b6b20 + wine-6.0.tar.xz: b9959c261029014c1a4d7f507e7791f3e58495fc wine-nine-standalone-0.7.tar.gz: b8dc24015d5445c8ab8a83682f039172f57a1663 - wine-staging-5.22.tar.gz: ff10da6fd288a31f5e075787c658dd23a1f28735 + wine-staging-6.0.tar.gz: 1159f0f6f4df2fa6ef370f283b721c54c3da0e7b winetricks-20201206.tar.gz: 41c21b38b90e472e935d1de4038ae03f4006058d diff --git a/wine-6.0-disable-bans-winetricks.patch b/wine-6.0-disable-bans-winetricks.patch new file mode 100644 index 0000000..07c6d89 --- /dev/null +++ b/wine-6.0-disable-bans-winetricks.patch @@ -0,0 +1,72 @@ +diff -ur BUILD/wine-6.0/winetricks-20201206/src/winetricks BUILD_patched/wine-6.0/winetricks-20201206/src/winetricks +--- BUILD/wine-6.0/winetricks-20201206/src/winetricks 2020-12-07 07:42:26.000000000 +0300 ++++ BUILD_patched/wine-6.0/winetricks-20201206/src/winetricks 2021-01-29 11:57:19.601989707 +0300 +@@ -8780,7 +8780,7 @@ + + verify_dotnet20() + { +- w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49550 5.7 ++ # w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49550 5.7 + + w_dotnet_verify dotnet20 + } +@@ -9153,7 +9153,7 @@ + + load_dotnet35() + { +- w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49690 5.12 ++ # w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49690 5.12 + + w_verify_cabextract_available + +@@ -9194,7 +9194,7 @@ + + load_dotnet35sp1() + { +- w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49690 5.12 ++ # w_package_broken_win64 https://bugs.winehq.org/show_bug.cgi?id=49690 5.12 + + w_verify_cabextract_available + +@@ -9232,7 +9232,7 @@ + + load_dotnet40() + { +- w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 ++ # w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 + + w_package_warn_win64 + +@@ -9319,8 +9319,8 @@ + + load_dotnet45() + { +- w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 +- w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 ++ # w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 ++ # w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 + + w_package_warn_win64 + +@@ -9369,8 +9369,8 @@ + + load_dotnet452() + { +- w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 +- w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 ++ # w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 ++ # w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 + + w_package_warn_win64 + +@@ -9613,8 +9613,8 @@ + + load_dotnet48() + { +- w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 +- w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 ++ # w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49532" 5.12 5.18 ++ # w_package_broken "https://bugs.winehq.org/show_bug.cgi?id=49897" 5.18 + + w_package_warn_win64 + diff --git a/wine.spec b/wine.spec index a356d41..14666ba 100644 --- a/wine.spec +++ b/wine.spec @@ -9,7 +9,7 @@ %bcond_without systemd # wine-staging tarball version -%define stagver 5.22 +%define stagver 6.0 # wine-stable tarball version %define stabver 5.0.3 @@ -82,6 +82,7 @@ Source25: README.install.urpmi.i586.stable Patch0: wine-5.10-mdkconf.patch # Russian localization Patch1: wine-5.22-staging-ru-localization.patch +Patch2: wine-6.0-disable-bans-winetricks.patch # For build in mock-urpm only Patch4: wine-staging-4.5-mock-urpm-broken-pipe.patch Patch5: wine-nine-standalone-0.7-ru-localization.patch @@ -95,9 +96,9 @@ Patch511: wine-cjk.patch # This is needed to build wine-nine-standalone %ifarch x86_64 -BuildRequires: %{wine64}-devel +BuildRequires: wine64-stable-devel %else -BuildRequires: %{wine}-devel +BuildRequires: wine-stable-devel %endif BuildRequires: bison BuildRequires: chrpath @@ -345,6 +346,7 @@ files needed to support 32-bit Windows programs. %{_libdir}/wine/crtdll.so %{_libdir}/wine/crypt32.so %{_libdir}/wine/gdi32.so +%{_libdir}/wine/qcap.so %{_libdir}/wine/mscms.so %{_libdir}/wine/msvcr100.so %{_libdir}/wine/msvcr110.so @@ -412,7 +414,10 @@ to develop programs running on Wine. %{_bindir}/wmc %{_bindir}/wrc %{_includedir}/* +%if %{with unstable} +%else %{_libdir}/libwine*.so +%endif %{_libdir}/wine/*.a %{_libdir}/wine/*.def %{_mandir}/man1/widl.1* @@ -527,6 +532,7 @@ from the 32-bit repository to be able to run 32-bit applications. %{_libdir}/wine/msvcrtd.so %{_libdir}/wine/ntdll.so %{_libdir}/wine/odbc32.so +%{_libdir}/wine/qcap.so %{_libdir}/wine/ucrtbase.so %{_libdir}/wine/user32.so %{_libdir}/wine/windowscodecs.so @@ -619,7 +625,10 @@ to develop programs running on Wine. %{_bindir}/wmc %{_bindir}/wrc %{_includedir}/* +%if %{with unstable} +%else %{_libdir}/libwine*.so +%endif %{_libdir}/wine/*.a %{_libdir}/wine/*.def %{_mandir}/man1/widl.1* @@ -692,8 +701,9 @@ systemctl stop systemd-binfmt.service %prep %setup -qn wine-%{version} -b5 -a6 -a11 -a12 %if %{with unstable} -%patch1 -p1 -b .staging-localization %patch0 -p1 -b .conf +%patch1 -p1 -b .staging-localization +%patch2 -p2 -b .winetricks %patch9 -p1 -b .assert %else %patch7 -p1 -b .civ3