From 061f1ba833bf173ec0e3e205d659433f9e54f80a77feaad13a21588b3b0bc721 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 16 Dec 2023 07:26:13 +0000 Subject: [PATCH 1/3] - Updated to 9.0-rc2 release - Bug fixes only, we are in code freeze. - update staging to 9.0-rc2 release - updated C library bundled provides OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1062 --- _service | 2 +- wine-9.0-rc1.tar.xz | 3 --- wine-9.0-rc1.tar.xz.sign | 16 ---------------- wine-9.0-rc2.tar.xz | 3 +++ wine-9.0-rc2.tar.xz.sign | 16 ++++++++++++++++ wine-staging-9.0-rc1.tar.xz | 3 --- wine.changes | 8 ++++++++ wine.spec | 28 +++++++++++++++------------- 8 files changed, 43 insertions(+), 36 deletions(-) delete mode 100644 wine-9.0-rc1.tar.xz delete mode 100644 wine-9.0-rc1.tar.xz.sign create mode 100644 wine-9.0-rc2.tar.xz create mode 100644 wine-9.0-rc2.tar.xz.sign delete mode 100644 wine-staging-9.0-rc1.tar.xz diff --git a/_service b/_service index efd3c35..1b50faa 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v9.0-rc1 + refs/tags/v9.0-rc2 v*.* git diff --git a/wine-9.0-rc1.tar.xz b/wine-9.0-rc1.tar.xz deleted file mode 100644 index 259c105..0000000 --- a/wine-9.0-rc1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18377757be1f7f1786ce8a56a844f66572881ffcf745c0b4ca34f09a60e2f330 -size 29982304 diff --git a/wine-9.0-rc1.tar.xz.sign b/wine-9.0-rc1.tar.xz.sign deleted file mode 100644 index 6f82f50..0000000 --- a/wine-9.0-rc1.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmVzjIkACgkQzvrI6q8X -UZ1mtQ/+JBgLSnyabuGf9Yl2ar7qVGJSrILrqDaJwzTbsE3qmJDw58u8dvLtroCv -yYjFFrFEB+lvebsMFdPWITTwhqIFn9Wj7RwoRybYgPq+pTGM1ySJvIaK4wBweAAN -veKi6AjvpCDlkxhL3c/bbJBW3mb2pFVdVqfJKlplEq+J5Cf/JrFg6D9xrwHiwS+d -EmT5TUNReXDRMEPHk3fgsHNRHqL/7YgTSZQFXvYfkcIUwQFRIE3nCN5CVf/CYaXJ -tsWEtSTCuaGbShpoZYflc8T77zRU1n1qnv9wjsaHyvOkZzbbuWEj3G6m/aor2jc8 -2RBkhtUMwi6vfBOgh8M7PT/D0IKYO86gSlhgrPjuFcvlZbjbxVGKQ5eNf2nC6Ujt -KJWxCynBLJSJe4O+kBkjznohyzPYqhB7HT5FydYcNQ6kplSvREgpgrhZ31ynzLMj -rh5sGC2JzYJn/YULaNgo9pjqxAAxtvcVzQi0dWp1Oa5QWwZNana+UjwPBCcRTQDq -UHQW+xGCwqYKUh0mDStayucFXtZXr/0Pp3Uqh6CZIh7L6gvMqxPXQ7k8a6f6c0gt -+cNVTDn1Ad3zNuAfNTjKhGimyoWhyz3G2PLcEUHbDpUg+OtcUjcK7qiROFudVQRp -BaMDFbHTzBBI3VXJ8xv4D7f7AYO4ZZv8Re4iBuBNEkmu8x9NbV4= -=U8IG ------END PGP SIGNATURE----- diff --git a/wine-9.0-rc2.tar.xz b/wine-9.0-rc2.tar.xz new file mode 100644 index 0000000..8efb239 --- /dev/null +++ b/wine-9.0-rc2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9d7cc0bb4cabc28ae80e054e8743bceaa50dcfc6ac2fd9bf419deadfa43066f +size 29989604 diff --git a/wine-9.0-rc2.tar.xz.sign b/wine-9.0-rc2.tar.xz.sign new file mode 100644 index 0000000..ef6cc28 --- /dev/null +++ b/wine-9.0-rc2.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmV8wSwACgkQzvrI6q8X +UZ1y+hAArTT14MIMca3o1HzReaqzAOAlp5V44IMt5NVyzG7umauNj5b1WNCKQ33v +lHn7SiRYhsREZR7eNi7q3Z+bS7mC/LrwvfXBNueSYVaw2hkjIc4uzfNGcZEK2eIJ +CTlG0KFJMSqm0YQAAOzhK0h7XigzKs99OLtRS7MSGUP4YEUTy9fMksAhs2MP4rER +A7jZvZl5f4ba+fqEpV4Kmfac73PA7d2C8obMcg0aB63xQEG+jteNSeMn2VHp2+o7 +yNE66M/7MFudreHQQsKfQI7yYX0BAhSQh3impOcpHF91hnWGeH/4MMNEbCtBNp7U +OHY/uDQyo1v84JgbgPcGONGpeW07cxcq7VErWUBdI+MFTkxvGlT1raaCKoFz6Il7 +HRhEMeMcw4NsL6uBBWl/v2MmFFEYvX/nt+ZjxzkWpEFkI7xc2CVRxQJX3YnPAT7o +zK5S9OSu834st4m6MNdF3eqE1y4PsY2hisr+TV+Y+BHCThX0k5ObOr1e82dR8KI9 +j2nB8eoSHkE5t9bzx5CFa6RIjmjgPXM9MpvkkuWM7M2O1xbAar4DmqRKrxfyjyT1 +FJwidTRHhcA263kwSIEQYx6qoanFtVDsWzn3nmRG5o0nWpVCQJp9mx+CMSKM44/5 +OdwwzVyow+hgFWeBAd7jsfyBKjahtlXWYj3T96NLoBYubLId+AE= +=813Q +-----END PGP SIGNATURE----- diff --git a/wine-staging-9.0-rc1.tar.xz b/wine-staging-9.0-rc1.tar.xz deleted file mode 100644 index 6bec2e5..0000000 --- a/wine-staging-9.0-rc1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:870b567d7bac6c1184eef29d6a84920fb7fa16e8e0b282e7e196ca767d3b8c29 -size 7245584 diff --git a/wine.changes b/wine.changes index 862c445..6864117 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 16 07:24:54 UTC 2023 - Marcus Meissner + +- Updated to 9.0-rc2 release + - Bug fixes only, we are in code freeze. +- update staging to 9.0-rc2 release +- updated C library bundled provides + ------------------------------------------------------------------- Sat Dec 9 13:25:34 UTC 2023 - Marcus Meissner diff --git a/wine.spec b/wine.spec index 12f5bf1..c4723eb 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 9.0-rc1 -Version: 9.0~rc1 +%define realver 9.0-rc2 +Version: 9.0~rc2 Release: 0 %if "%{flavor}" != "" @@ -172,7 +172,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64 %if %{staging} # upstream patch target version -%define staging_version 9.0-rc1 +%define staging_version 9.0-rc2 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel @@ -190,19 +190,21 @@ Source110: wine-d3d9-patches-%{nine_version}.tar.xz %endif # wine bundles multiple unix libraries to be able to build PE files without dependencies # current versions are from 7.22 (update this if you update the versions below): -Provides: bundled(FAudio) = 22.11.0 +Provides: bundled(FAudio) = 23.12.0 +Provides: bundled(fluidsynth) = 2.3.3 Provides: bundled(jpeg) = 9e Provides: bundled(libgsm) = 1.10.19 Provides: bundled(libjxr) = 1.1 -Provides: bundled(liblcms2) = 2.14 -Provides: bundled(libpng) = 1.6.38 -Provides: bundled(libxml2) = 2.10.3 -Provides: bundled(libxslt) = 1.1.37 -Provides: bundled(mpg123) = 1.30.2 -Provides: bundled(openldap2) = 2.5.13 -Provides: bundled(tiff) = 4.4.0 -Provides: bundled(vkd3d) = 1.5 -Provides: bundled(zlib) = 1.2.13 +Provides: bundled(liblcms2) = 2.15 +Provides: bundled(libpng) = 1.6.40 +Provides: bundled(libxml2) = 2.11.5 +Provides: bundled(libxslt) = 1.1.38 +Provides: bundled(mpg123) = 1.32.2 +Provides: bundled(musl) = 1.2.3 +Provides: bundled(openldap2) = 2.5.16 +Provides: bundled(tiff) = 4.6.0 +Provides: bundled(vkd3d) = 1.10 +Provides: bundled(zlib) = 1.3 %description Wine is a compatibility layer capable of running Windows From 3f132acdfb7d25f93de7e546278fed672dcc9d2cf0095fce4957bc8d232123ec Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 16 Dec 2023 17:39:29 +0000 Subject: [PATCH 2/3] Accepting request 1133602 from home:llyyr:branches:Emulators - Add libxkbcommon and libxkbregistry as build requirements to enable building the Wayland driver OBS-URL: https://build.opensuse.org/request/show/1133602 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1063 --- wine.changes | 6 ++++++ wine.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/wine.changes b/wine.changes index 6864117..c577580 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 16 15:27:29 UTC 2023 - llyyr + +- Add libxkbcommon and libxkbregistry as build requirements to + enable building the Wayland driver + ------------------------------------------------------------------- Sat Dec 16 07:24:54 UTC 2023 - Marcus Meissner diff --git a/wine.spec b/wine.spec index c4723eb..ee0ebfa 100644 --- a/wine.spec +++ b/wine.spec @@ -121,6 +121,8 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(osmesa) BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbregistry) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) From e3b5b990d56e1cdec5b90b22dcbffcbcc71118efe95814a575915ea01389aff6 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 16 Dec 2023 17:47:56 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1064 --- wine-staging-9.0-rc2.tar.xz | 3 +++ wine.spec | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 wine-staging-9.0-rc2.tar.xz diff --git a/wine-staging-9.0-rc2.tar.xz b/wine-staging-9.0-rc2.tar.xz new file mode 100644 index 0000000..03e3cf5 --- /dev/null +++ b/wine-staging-9.0-rc2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df1de66815ea7efb5313bab43d424784ee7c9c1566892217bd14496debac247e +size 7266612 diff --git a/wine.spec b/wine.spec index ee0ebfa..3b25691 100644 --- a/wine.spec +++ b/wine.spec @@ -121,8 +121,6 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(osmesa) BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(xkbcommon) -BuildRequires: pkgconfig(xkbregistry) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) @@ -136,6 +134,8 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbregistry) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xxf86vm)