SHA256
1
0
forked from pool/wine

Accepting request 1195842 from Emulators

- Updated to 9.16 release
  - Initial Driver Store implementation.
  - Pbuffer support in the Wayland driver.
  - More prototype objects in MSHTML.
  - Various bug fixes.
- update staging to 9.16 release
- 6256.patch: upstream

OBS-URL: https://build.opensuse.org/request/show/1195842
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=448
This commit is contained in:
Ana Guerrero 2024-08-25 10:10:43 +00:00 committed by Git OBS Bridge
commit 86f55daece
10 changed files with 38 additions and 63 deletions

View File

@ -1,34 +0,0 @@
From 720648159bb3f7cabb4be206d15555eb6950452a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 12 Aug 2024 11:19:36 +0200
Subject: [PATCH] win32u: Don't request a host window surface for child
windows.
Fixes: b9879d5adc1cd98a6ceb7d087c4533fdd487bedb
---
dlls/win32u/window.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 8e1ec0370ed..ce30b8b870e 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -1844,6 +1844,7 @@ static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags,
RECT *visible_rect, RECT *surface_rect )
{
BOOL shaped, needs_surface, create_opaque, is_layered;
+ HWND parent = NtUserGetAncestor( hwnd, GA_PARENT );
struct window_surface *new_surface;
RECT dummy;
HRGN shape;
@@ -1853,6 +1854,7 @@ static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags,
*visible_rect = *window_rect;
if (!user_driver->pWindowPosChanging( hwnd, swp_flags, shaped, window_rect, client_rect, visible_rect )) needs_surface = FALSE;
+ else if (parent && parent != NtUserGetDesktopWindow()) needs_surface = FALSE;
else if (swp_flags & SWP_HIDEWINDOW) needs_surface = FALSE;
else if (swp_flags & SWP_SHOWWINDOW) needs_surface = TRUE;
else needs_surface = !!(NtUserGetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE);
--
GitLab

View File

@ -3,7 +3,7 @@
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="url">https://github.com/wine-staging/wine-staging.git</param>
<param name="revision">refs/tags/v9.15</param>
<param name="revision">refs/tags/v9.16</param>
<param name="match-tag">v*.*</param>
<param name="scm">git</param>
</service>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79adef436dd68ddbd70178670a3c23aa98e8afd5540ac0f42345894c458b78dd
size 30580680

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAma3e+IACgkQzvrI6q8X
UZ26fw/+Jf0EsFaRSiEJwWIxgWrTFGRARpKFC1UsnFULATT7gvCdl/3rJ/dc6Qna
Wh7UjvFpJILLsZMUk24gm0Eq0lBoxfM5x7EI6oqhaCdapFQ9qqFEhm93oeuuZ8HA
wBOHqLzlJsQ+L8LRFrChZi/6SMHjqxxtLnmIvDagSUxZmpWAuqSfbrlCu1iS3j3g
7n4O+GViFeR4SFsY5UksjT/4tAE5cxJVfiBU6e9rm04m3TBFcprCd5ujAH20CAQ3
NGx8DNCfNctkAaBcMGJMDoXe+zgUBbyMsGwE9yD3DGLow6EOvDCBi/TZbEBCkZ0K
cSQiyRXqruEvVp8dbFtZmSNNnsuCCXYB03Oog41Tc0k+1PupheW603wPCwoCjSTM
RtjOpRnTgZK1cAq+UY0MLocI3ZNAqO9MkDVV11Dmv4uRuqFLMJaGwAuDnbc7pOKE
epNiAJNP/6UufCcDR2P6/K9HOEzrELjC4gLg0jGgHhAlwFBjZM7QA8mMzAP5+tdb
Uo2QrNKJn7HG0xeh4e7bLfbfXkrrf0vAFuCf3/YWUzTaCQ2/j9PBm6ZORfiZ4lkN
n3Sw71S93RrVdbILBp8iFExfNY8HOK0VKtQuVh3S2s3u+iX/xqTCaLuzt/72+JKh
3IHJ1jcx2euueUNbl3s4MZIUv0z3HKZeQN75/Z6hpT1p6jERn6o=
=dL+m
-----END PGP SIGNATURE-----

3
wine-9.16.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:89042ae8c80b2333f8a7d18877fc4179c07d6357ab7f28ccbda6d06f3c330c50
size 30638928

16
wine-9.16.tar.xz.sign Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmbI8LQACgkQzvrI6q8X
UZ0mXw//aY19aJv3pmRNrfjjwZ0JUzzOHQWluooS6VAr8ksypzzgBq1bgYL3Ybtg
rOi8wQVZQbTUmf4NbsssM7wM5f6rOR7SNd/JU631p1gsI5waVLZAKQ1Cohufx6lq
YS4vyz9UcGUwE/kWaMFnTKBo9O7tdELSMY+paLKCzzFysI/b88HJx13Mx53xYJd1
BILYzxzZz9PNCX+ePghSOqD5JTdomkT8HCnOGIetvZuNdlTON9RlKlh+qgLJUavw
XGrFNqPYVD3DYu5EHqnG5kmhGZQ0R2D1CI5YUnV6LymSk1DEMx5qiXOy2jp6Kc+O
xWl8ntdlDDxczA40kNF9U5IWJ6orfQyRfdCNlvQTcMgojDXx/jhuSptaGwyyjO+t
7lTxjij5uQvTD5hgsnUZhb1BMgqt8MsdKUDqqQwtzrN64mkIpJiMpKubPeh7zzq+
aXQ7WtDFk5CyhjlEMjdCTWLVGbUVbs34QVgUeIEvB9PCOAQZcghVFntd6PA3s4Ep
Jp8CpRaps1bD8/ddekfJCrppgMUe9Syq3FBROosf7fAkJ6qiE34FZlNa4+1wM290
OC7X6iMH7vCZQ9sZE9M5/ShOmQswF89tG+ycsdyVSNWfCaHm2JRKDDCsj5+b+jPJ
soN5Iea87nUyfyakmg7IneMVo7o5OXnyp9GDPXqIJQkVtQqBc7M=
=gloa
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2da8040660dc2d31d99f0467e39160dd0e1923fe69f04643e2ff3f1ff6a8344
size 7245100

3
wine-staging-9.16.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5616264f01b99fa1811563407d91206deeee30968492184322bded8b73b12ad
size 7240692

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Aug 24 11:39:25 UTC 2024 - Marcus Meissner <meissner@suse.com>
- Updated to 9.16 release
- Initial Driver Store implementation.
- Pbuffer support in the Wayland driver.
- More prototype objects in MSHTML.
- Various bug fixes.
- update staging to 9.16 release
- 6256.patch: upstream
-------------------------------------------------------------------
Wed Aug 21 09:16:21 UTC 2024 - llyyr <llyyr@yukari.in>

View File

@ -1,5 +1,5 @@
#
# spec file for package wine
# spec file
#
# Copyright (c) 2024 SUSE LLC
#
@ -41,8 +41,8 @@
%endif
# needs to be on top due to usage of %version macro below
%define realver 9.15
Version: 9.15
%define realver 9.16
Version: 9.16
Release: 0
%if "%{flavor}" != ""
@ -176,8 +176,6 @@ Source7: baselibs.conf
Source8: wine-rpmlintrc
# SUSE specific patches
# - currently none, but add them here
#Patch0: 0001-mf-tests-Remove-static-specifier-on-variables-refere.patch
Patch0: https://gitlab.winehq.org/wine/wine/-/merge_requests/6256.patch
Recommends: wine-gecko >= 2.47.4
Conflicts: wine-gecko < 2.47.4
Recommends: wine-mono >= 9.2.0
@ -198,7 +196,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64
%if %{staging}
# upstream patch target version
%define staging_version 9.15
%define staging_version 9.16
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel