From 37baaf773dee2bb4883d9547a54b0c6964f1da2984e4ffdd4fba7640d614a7a0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 23 Jun 2024 11:24:04 +0000 Subject: [PATCH 1/2] - 0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch: fixed wayland OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1117 --- ...d-crashing-when-the-dummy-window-sur.patch | 33 +++++++++++++++++++ wine.changes | 6 ++++ wine.spec | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch diff --git a/0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch b/0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch new file mode 100644 index 0000000..41d39a4 --- /dev/null +++ b/0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch @@ -0,0 +1,33 @@ +From 1e701a6b3798ecfd688ad1ff405dbb62b3d214c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Bernon?= +Date: Sat, 15 Jun 2024 18:36:50 +0200 +Subject: [PATCH] winewayland: Avoid crashing when the dummy window surface is + used. + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56840 +Signed-off-by: Marcus Meissner +--- + dlls/winewayland.drv/window_surface.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c +index fb3b8750001..888fa74c085 100644 +--- a/dlls/winewayland.drv/window_surface.c ++++ b/dlls/winewayland.drv/window_surface.c +@@ -489,8 +489,12 @@ failed: + void wayland_window_surface_update_wayland_surface(struct window_surface *window_surface, + struct wayland_surface *wayland_surface) + { +- struct wayland_window_surface *wws = wayland_window_surface_cast(window_surface); ++ struct wayland_window_surface *wws; ++ ++ /* ignore calls with the dummy surface */ ++ if (window_surface->funcs != &wayland_window_surface_funcs) return; + ++ wws = wayland_window_surface_cast(window_surface); + window_surface_lock(window_surface); + + TRACE("surface=%p hwnd=%p wayland_surface=%p\n", wws, window_surface->hwnd, wayland_surface); +-- +2.45.2 + diff --git a/wine.changes b/wine.changes index e5e66b4..6d89f7a 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 23 11:23:40 UTC 2024 - Marcus Meissner + +- 0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch: + fixed wayland + ------------------------------------------------------------------- Sat Jun 15 14:49:37 UTC 2024 - Marcus Meissner diff --git a/wine.spec b/wine.spec index 35e4126..bdc7141 100644 --- a/wine.spec +++ b/wine.spec @@ -177,6 +177,8 @@ Source8: wine-rpmlintrc # SUSE specific patches # - currently none, but add them here Patch0: 0001-mf-tests-help-older-compilers-by-using-defines.patch +# 1e701a6b3798ecfd688ad1ff405dbb62b3d214c6 fixing wayland +Patch1: 0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch Recommends: wine-gecko >= 2.47.4 Conflicts: wine-gecko < 2.47.4 Recommends: wine-mono >= 9.0.0 From f39ab84fcdf18fc1091856e35b4df14fcee981b2ca43f7edb71d0cd77980d173 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 26 Jun 2024 11:33:59 +0000 Subject: [PATCH 2/2] - Updated to 9.11 release - C++ exception handling on ARM platforms. - More DPI Awareness support improvements. - Various bug fixes. - update staging to 9.11 release OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=1118 --- wine.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wine.changes b/wine.changes index 6d89f7a..124933f 100644 --- a/wine.changes +++ b/wine.changes @@ -13,6 +13,15 @@ Sat Jun 15 14:49:37 UTC 2024 - Marcus Meissner - Various bug fixes. - update staging to 9.11 release +------------------------------------------------------------------- +Sat Jun 15 14:49:37 UTC 2024 - Marcus Meissner + +- Updated to 9.11 release + - C++ exception handling on ARM platforms. + - More DPI Awareness support improvements. + - Various bug fixes. +- update staging to 9.11 release + ------------------------------------------------------------------- Mon Jun 3 12:20:38 UTC 2024 - Marcus Meissner