From 268012040e6190fa5824253a566928d202fd581b19d64f1cbca3e5b0ed59fd4e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 27 Feb 2021 08:24:13 +0000 Subject: [PATCH 1/3] - Updated to 6.3 development release - Better debugger support in the NT syscall interface. - WineGStreamer library converted to PE. - Still more WinRT support in WIDL. - Optional support for build IDs. - Various bug fixes. - update staging to 6.3 release OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=798 --- _service | 2 +- wine-6.2.tar.xz | 3 --- wine-6.2.tar.xz.sign | 16 ---------------- wine-6.3.tar.xz | 3 +++ wine-6.3.tar.xz.sign | 16 ++++++++++++++++ wine-staging-6.2.tar.xz | 3 --- wine-staging-6.3.tar.xz | 3 +++ wine.changes | 11 +++++++++++ wine.spec | 6 +++--- 9 files changed, 37 insertions(+), 26 deletions(-) delete mode 100644 wine-6.2.tar.xz delete mode 100644 wine-6.2.tar.xz.sign create mode 100644 wine-6.3.tar.xz create mode 100644 wine-6.3.tar.xz.sign delete mode 100644 wine-staging-6.2.tar.xz create mode 100644 wine-staging-6.3.tar.xz diff --git a/_service b/_service index 3abefaa..986c297 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v6.2 + refs/tags/v6.3 v*.* git diff --git a/wine-6.2.tar.xz b/wine-6.2.tar.xz deleted file mode 100644 index 4677b57..0000000 --- a/wine-6.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6609609a3abcc6ad927cdd65c740be01162b801523e0f7ba9fd6691800bbf19 -size 24270924 diff --git a/wine-6.2.tar.xz.sign b/wine-6.2.tar.xz.sign deleted file mode 100644 index 1c75860..0000000 --- a/wine-6.2.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmAm5u8ACgkQzvrI6q8X -UZ0YWQ//WjWegTBeNekrUyNyfk1X1G+iotpuEAGoU4f1p79plaEdi1ijvfl1iTOg -qKs2GpuMXkGE5u+UK0wTwZLy3YbXJ6q/NxhwPb/gn3u78jNmzMqemQePj9tiRRxg -QyvhtCdHahPh2ofqnTSBtvOZhjoSC/44HG1pLosZQoLwzZySHDBaJfzRbnZW0g4M -EEv8cwmPbSLlUiAMuB3PwWjeGFOiH1swvw4miif97RoIAgj6FoOdhp3K25dKAjU4 -kwo9o3mKYlzc49/9jQJdyt0KwNcH5Ecr/+piRcyEWK4TAv1pju9nHe/1j0qVddks -jbES+C6buzmFC+FpD1hCxVzKOLbBpvB5DSWa6+P9d0urzU0bFaPNa9eHUb0Q5CCn -tOTa2G2L4+k+cUjhA4YDo9Hkn2AGrJG/FiUIbjg7Wo0l5/HDr1y5EZpgLThoQmZ+ -Z6c7oDYHrEGPKXToqBdlzy06B6AXutxv51IwxHEFtXdp6kFKjzaxrO4GR5D74InO -axLHDRkTcxzhDg7N2LykeHt8FKTZgHVdfaPfqE6cCzt8Uyz4FLxywi5IXE0+jPMu -+BNnIpg+5DR/hcOG8jU2B2VO0nLwbxWMw70vOsbg81RUAyZrmO/AmpT/kWjYOr1l -Mkfqwa23IggTxWrnfSBM68UiSagy7C+Wn5zBATVPe30TotiLuA4= -=EAnX ------END PGP SIGNATURE----- diff --git a/wine-6.3.tar.xz b/wine-6.3.tar.xz new file mode 100644 index 0000000..1ff5a4a --- /dev/null +++ b/wine-6.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:682a77c1fd12f56347ca2080d85fe17def1b655d3241d94582f87591d9d0cc3b +size 24301496 diff --git a/wine-6.3.tar.xz.sign b/wine-6.3.tar.xz.sign new file mode 100644 index 0000000..b43a07d --- /dev/null +++ b/wine-6.3.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmA5XGMACgkQzvrI6q8X +UZ1GmA//dfdHQnWDYiQsft59XRdptGSOyKDre2hNBVak6AtoVAx0qmJphfwgsld9 +r3Ln8B9np0PYgEXYEadJnGE+BZORnqc69ROm4jDZ8oRb4Tqp30zXix6eRBlNNvba +jbxU5ZznGueTq742D/9orN6H+/xW89U9NHX8MGlNlrAVlcLdheO2VrE8Iwaszlri +GmMMWktcWYl8qbnu4Q9IqGWPmuqc/CLQEXezLAk18/W1Xd0tlKyyHW6S8sOs0noL +egz8OnCm6TW1+Ibq8EA59VT2sC7HOVV7U2RmGaJgJrBihafYiqX1LDC02IXADuXk +bo5nCD2nl9DDOdgzW49r3VGmlHBidJsjEVLUhpeoICegspHQZOy7SFc6Ewzq3bcV +f4KHYlTnA4mitWvpR6M0ifFhlvkey6Yq4iSvUUyIn1OVrbJOmAOR0R2jYARkci2w +ptaTGIP+i38jUE2jWaDUz0k7aLQZX+iiza5ofIqxPbhsWCEY3TRHlg2T7cdQcUZE +2RM1nVt8ZKyerSxYMDX2qVxP0Q/Sh9Me5RdL04opD44f+sGvL3e2/BQnRx7a/1oe +YLHfnjnEDFZy06aFuuUo59N/1uF2K7mUJklnfDLiVA3wO8n/cWuBqYUDxXYkm6gn +cmuoOVnYNTeaVZLQy9bWJL9Vhm66c7SujZVp1KAGOPoR/YS6Llg= +=15CW +-----END PGP SIGNATURE----- diff --git a/wine-staging-6.2.tar.xz b/wine-staging-6.2.tar.xz deleted file mode 100644 index 4e9afda..0000000 --- a/wine-staging-6.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f63dacccb2b72c5e067082a579f55b2488638e0ac5c6e8b3b45e59dfa141b16a -size 7390156 diff --git a/wine-staging-6.3.tar.xz b/wine-staging-6.3.tar.xz new file mode 100644 index 0000000..eb23307 --- /dev/null +++ b/wine-staging-6.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e45b7cb50397f6ca01a795c7917d49b6d985227ae9e0bfb764ddd5abb3f169ee +size 7376220 diff --git a/wine.changes b/wine.changes index bff9772..58468c0 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Feb 27 08:21:52 UTC 2021 - Marcus Meissner + +- Updated to 6.3 development release + - Better debugger support in the NT syscall interface. + - WineGStreamer library converted to PE. + - Still more WinRT support in WIDL. + - Optional support for build IDs. + - Various bug fixes. +- update staging to 6.3 release + ------------------------------------------------------------------- Sat Feb 13 07:27:45 UTC 2021 - Marcus Meissner diff --git a/wine.spec b/wine.spec index cc564bc..78d7d97 100644 --- a/wine.spec +++ b/wine.spec @@ -29,8 +29,8 @@ %endif # needs to be on top due to usage of %version macro below -%define realver 6.2 -Version: 6.2 +%define realver 6.3 +Version: 6.3 Release: 0 %if "%{flavor}" != "" @@ -158,7 +158,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64 %if %{staging} # upstream patch target version -%define staging_version 6.2 +%define staging_version 6.3 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel From e9a0caf766ad8a2e5b82a95c08943a9f13049c73b46687c3ed457fa2d73a4537 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 1 Mar 2021 06:02:59 +0000 Subject: [PATCH 2/3] Accepting request 875832 from home:geekositalia:branches:Emulators VERY IMPORTANT PATCH FOR 6.3 I have added this patch, which fixes a serious bug in wine version 6.3. According to: https://bugs.winehq.org/attachment.cgi?id=69488&action=diff The bug does not allow to load absolutely any kind of audio server for the vst bridge. It probably involves other version inusabilities OBS-URL: https://build.opensuse.org/request/show/875832 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=799 --- 6.3_fix.patch | 13 +++++++++++++ wine.spec | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 6.3_fix.patch diff --git a/6.3_fix.patch b/6.3_fix.patch new file mode 100644 index 0000000..ebc7108 --- /dev/null +++ b/6.3_fix.patch @@ -0,0 +1,13 @@ +diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c +index 644eee1e9d7c..c21c62c10b0d 100644 +--- a/dlls/ntdll/loader.c ++++ b/dlls/ntdll/loader.c +@@ -2325,7 +2325,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, + SECTION_IMAGE_INFORMATION image_info = { 0 }; + + image_info.u.s.WineBuiltin = 1; +- if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, pwm ))) ++ if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, &wm ))) + { + if (module) unix_funcs->unload_builtin_dll( module ); + return status; diff --git a/wine.spec b/wine.spec index 78d7d97..bec8009 100644 --- a/wine.spec +++ b/wine.spec @@ -139,7 +139,7 @@ Source7: baselibs.conf Source8: wine-rpmlintrc # SUSE specific patches # - currently none, but add them here -#Patch0: patch.txt +Patch0: 6.3_fix.patch Recommends: wine-gecko >= 2.47.2 Conflicts: wine-gecko < 2.47.2 Recommends: wine-mono >= 5.1.1 @@ -216,7 +216,7 @@ libraries. %prep %setup -q -n wine-%{realver} -#patch0 -p1 +%patch0 -p1 # cp %{S:3} . # From 1f933a1dc19f285c9eba1ec044105094f54e86bd730daf8c12c610116f06b0c7 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 1 Mar 2021 06:31:21 +0000 Subject: [PATCH 3/3] - 6.3_fix.patch: temporary fix for a 6.3 regression OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=800 --- wine.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wine.changes b/wine.changes index 58468c0..066eabc 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 1 06:31:02 UTC 2021 - Marcus Meissner + +- 6.3_fix.patch: temporary fix for a 6.3 regression + ------------------------------------------------------------------- Sat Feb 27 08:21:52 UTC 2021 - Marcus Meissner