diff --git a/6.3_fix.patch b/6.3_fix.patch deleted file mode 100644 index ebc7108..0000000 --- a/6.3_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/_service b/_service index 986c297..61c88fe 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v6.3 + refs/tags/v6.4 v*.* git diff --git a/wine-6.3.tar.xz b/wine-6.3.tar.xz deleted file mode 100644 index 1ff5a4a..0000000 --- a/wine-6.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index b43a07d..0000000 --- a/wine-6.3.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------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-6.4.tar.xz b/wine-6.4.tar.xz new file mode 100644 index 0000000..5d24df7 --- /dev/null +++ b/wine-6.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b2d2b453d90d6c2d7124e47faeae50e5c54c25f69bee1d06531843261024c8f +size 24340220 diff --git a/wine-6.4.tar.xz.sign b/wine-6.4.tar.xz.sign new file mode 100644 index 0000000..164ce1d --- /dev/null +++ b/wine-6.4.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmBL0KIACgkQzvrI6q8X +UZ0f1A/7BatwjZid836Fsg7iFvudMdSkHdjOeaCV1SWXl9PaHQtEfdGPGM8ZjpU8 +2TLbEhn4xY0ESds1SEVLuxDY/YUDJ7Q2KIAqkxQWr5uZ/mpGP1lG1CBEONZq+yMg +Dbe/Whurs7Eu6T6L1q+P+MDX/tLXcg2RprAXDeW+TK4diVtfFsA3Q1h0lnRnALWI +CXNKXmSvAIoCklvLDM72AKpayItQdFQb6MXj1u55+oe4CsJH7eaaHqPPZuU9zEe+ +PXvLh+fWZL0TPUKFHl60fL1/URld+3FNtwlTNIprUtqty9aTw2s9kZRATF/PFysb +VzcvCIa5AfcrH9RZWHFK9rl38A/SxjdIZNbVV807NvbjaMcPDm+kxyYjMj5LUQ3M +kIgtgER/i1rEdrdY809kVRQd5ldyyXFhB/xsdlNpBOPdWYAiTS0QuGL4BYQINF/C +2zgL9+QcW2B2Xc+hzPXzBAP3AMXCGvpWUb8m872KBmGST4cDtOZ4VEMQN/qr6vNz +eyfNKLwBmZ8yYwA5ztLaXW7InPj5yGrIhy/TW+8q+bDgcBrOz6IAFkvXN12mGuCa +UEYPxAM0JxzvrSYXNyfu5hkNTC682v9MRMAMSGpuoQKj9T0EeVe7fC878XgR3Oby +3Vvl9WGhbqaKrBA4VpkCPSRp3UoqQ4pGvyrgZMlx6UEe243gTLc= +=FKnv +-----END PGP SIGNATURE----- diff --git a/wine-staging-6.3.tar.xz b/wine-staging-6.3.tar.xz deleted file mode 100644 index eb23307..0000000 --- a/wine-staging-6.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e45b7cb50397f6ca01a795c7917d49b6d985227ae9e0bfb764ddd5abb3f169ee -size 7376220 diff --git a/wine-staging-6.4.tar.xz b/wine-staging-6.4.tar.xz new file mode 100644 index 0000000..5e58be5 --- /dev/null +++ b/wine-staging-6.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b91e079280eb20ced0bca62240b0da6fdb71aead6a5d6bbdb3d69901ad0a57b8 +size 7409112 diff --git a/wine.changes b/wine.changes index 066eabc..2e444eb 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Mar 13 06:38:29 UTC 2021 - Marcus Meissner + +- updated to 6.4 development release + - Support for the DTLS protocol. + - Fontset support in DirectWrite. + - Dialog for editing Access Control entries. + - Theming support for a few more common controls. + - Support for Korean Wansung encoding. + - Various bug fixes. +- update staging to 6.4 release +- removed 6.3_fix.patch: upstream + ------------------------------------------------------------------- Mon Mar 1 06:31:02 UTC 2021 - Marcus Meissner diff --git a/wine.spec b/wine.spec index bec8009..020de53 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.3 -Version: 6.3 +%define realver 6.4 +Version: 6.4 Release: 0 %if "%{flavor}" != "" @@ -139,7 +139,7 @@ Source7: baselibs.conf Source8: wine-rpmlintrc # SUSE specific patches # - currently none, but add them here -Patch0: 6.3_fix.patch +#Patch0: susefixes.patch Recommends: wine-gecko >= 2.47.2 Conflicts: wine-gecko < 2.47.2 Recommends: wine-mono >= 5.1.1 @@ -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.3 +%define staging_version 6.4 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel @@ -216,7 +216,7 @@ libraries. %prep %setup -q -n wine-%{realver} -%patch0 -p1 +#patch0 -p1 # cp %{S:3} . #