pool/mutter
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1073812 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1073812
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=197
This commit is contained in:
Dominique Leuenberger 2023-03-24 14:18:26 +00:00 committed by Git OBS Bridge
commit 2590e1bd90
12 changed files with 161 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_service
View File

@ -3,12 +3,11 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
<param name="revision">gnome-43</param>
<param name="revision">bc9cad51</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
<!-- <param name="changesgenerate">enable</param>
-->
<param name="changesgenerate">enable</param>
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
<param name="changesrevision">bc9cad512451d3f5d63c1892668d1c7aec370227</param></service></servicedata>

3
mutter-43.3+2.obscpio
View File

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

3
mutter-44.0+8.obscpio Normal file
View File

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

8
mutter-Lower-HIDPI_LIMIT-to-144.patch
View File

@ -7,11 +7,11 @@ Subject: [PATCH] monitor: Lower HIDPI_LIMIT to 144
src/backends/meta-monitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mutter-41.2/src/backends/meta-monitor.c
Index: mutter-44.beta/src/backends/meta-monitor.c
===================================================================
--- mutter-41.2.orig/src/backends/meta-monitor.c
+++ mutter-41.2/src/backends/meta-monitor.c
@@ -1658,7 +1658,7 @@ meta_monitor_calculate_crtc_pos (MetaMon
--- mutter-44.beta.orig/src/backends/meta-monitor.c
+++ mutter-44.beta/src/backends/meta-monitor.c
@@ -1805,7 +1805,7 @@ meta_monitor_calculate_crtc_pos (MetaMon
}
/* The minimum resolution at which we turn on a window-scale of 2 */

16
mutter-crash-meta_context_terminate.patch
View File

@ -1,8 +1,8 @@
Index: mutter-42.1/src/x11/session.c
Index: mutter-44.beta/src/x11/session.c
===================================================================
--- mutter-42.1.orig/src/x11/session.c
+++ mutter-42.1/src/x11/session.c
@@ -113,7 +113,8 @@ process_ice_messages (GIOChannel *chan
--- mutter-44.beta.orig/src/x11/session.c
+++ mutter-44.beta/src/x11/session.c
@@ -150,7 +150,8 @@ process_ice_messages (GIOChannel *chan
* being cleaned up, since it is owned by libSM.
*/
disconnect ();
@ -12,11 +12,11 @@ Index: mutter-42.1/src/x11/session.c
return FALSE;
}
Index: mutter-42.1/src/tests/meson.build
Index: mutter-44.beta/src/tests/meson.build
===================================================================
--- mutter-42.1.orig/src/tests/meson.build
+++ mutter-42.1/src/tests/meson.build
@@ -35,6 +35,7 @@ tests_deps = [
--- mutter-44.beta.orig/src/tests/meson.build
+++ mutter-44.beta/src/tests/meson.build
@@ -43,6 +43,7 @@ tests_deps = [
]
libmutter_test = shared_library(libmutter_test_name,

16
mutter-disable-cvt-s390x.patch
View File

@ -1,8 +1,8 @@
Index: mutter-42.rc/src/meson.build
Index: mutter-44.rc/src/meson.build
===================================================================
--- mutter-42.rc.orig/src/meson.build
+++ mutter-42.rc/src/meson.build
@@ -861,6 +861,7 @@ if have_profiler
--- mutter-44.rc.orig/src/meson.build
+++ mutter-44.rc/src/meson.build
@@ -912,6 +912,7 @@ if have_profiler
endif
if have_native_backend
@ -10,7 +10,7 @@ Index: mutter-42.rc/src/meson.build
cvt = find_program('cvt')
gen_default_modes = find_program('backends/native/gen-default-modes.py')
@@ -868,6 +869,9 @@ if have_native_backend
@@ -919,6 +920,9 @@ if have_native_backend
output: 'meta-default-modes.h',
command: [gen_default_modes, '@OUTPUT@']
)
@ -19,11 +19,11 @@ Index: mutter-42.rc/src/meson.build
+ endif
mutter_built_sources += default_modes_h
dbus_login1_built_sources = gnome.gdbus_codegen('meta-dbus-login1',
Index: mutter-42.rc/src/backends/native/meta-default-modes.h
dbus_interfaces += [
Index: mutter-44.rc/src/backends/native/meta-default-modes.h
===================================================================
--- /dev/null
+++ mutter-42.rc/src/backends/native/meta-default-modes.h
+++ mutter-44.rc/src/backends/native/meta-default-modes.h
@@ -0,0 +1,57 @@
+/* Generated by gen-default-modes.py */
+

125
mutter-prevent-newly-focused-windows-to-steal-focus-from-shell.patch
View File

@ -1,125 +0,0 @@
diff --unified --recursive --text --new-file --color mutter-43.3+4.old/src/core/events.c mutter-43.3+4.new/src/core/events.c
--- mutter-43.3+4.old/src/core/events.c 2023-03-13 16:20:18.953566837 +0800
+++ mutter-43.3+4.new/src/core/events.c 2023-03-13 16:21:25.375564893 +0800
@@ -34,7 +34,6 @@
#include "core/display-private.h"
#include "core/window-private.h"
#include "meta/meta-backend.h"
-#include "x11/meta-x11-display-private.h"
#ifdef HAVE_NATIVE_BACKEND
#include "backends/native/meta-backend-native.h"
@@ -261,9 +260,6 @@
display->grabbed_in_clutter = FALSE;
meta_compositor_grab_end (compositor);
}
-
- if (display->x11_display)
- meta_x11_display_sync_input_focus (display->x11_display);
}
device = clutter_event_get_device (event);
diff --unified --recursive --text --new-file --color mutter-43.3+4.old/src/core/window.c mutter-43.3+4.new/src/core/window.c
--- mutter-43.3+4.old/src/core/window.c 2023-03-13 16:20:18.956900099 +0800
+++ mutter-43.3+4.new/src/core/window.c 2023-03-13 16:21:25.382231433 +0800
@@ -1988,6 +1988,15 @@
return;
}
+ /* Do not focus window on map if input is already taken by the
+ * compositor.
+ */
+ if (!meta_display_windows_are_interactable (window->display))
+ {
+ *takes_focus = FALSE;
+ return;
+ }
+
/* Terminal usage may be different; some users intend to launch
* many apps in quick succession or to just view things in the new
* window while still interacting with the terminal. In that case,
diff --unified --recursive --text --new-file --color mutter-43.3+4.old/src/x11/events.c mutter-43.3+4.new/src/x11/events.c
--- mutter-43.3+4.old/src/x11/events.c 2023-03-13 16:20:18.990232717 +0800
+++ mutter-43.3+4.new/src/x11/events.c 2023-03-13 16:21:25.382231433 +0800
@@ -1009,9 +1009,6 @@
break;
case XI_FocusIn:
case XI_FocusOut:
- if (clutter_stage_get_grab_actor (stage) != NULL)
- break;
-
if (handle_window_focus_event (x11_display, window, enter_event, serial) &&
enter_event->event == enter_event->root)
{
@@ -1933,8 +1930,7 @@
event->xany.serial > x11_display->focus_serial &&
display->focus_window &&
display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
- !window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
- meta_display_windows_are_interactable (display))
+ !window_has_xwindow (display->focus_window, x11_display->server_focus_window))
{
meta_topic (META_DEBUG_FOCUS, "Earlier attempt to focus %s failed",
display->focus_window->desc);
diff --unified --recursive --text --new-file --color mutter-43.3+4.old/src/x11/meta-x11-display.c mutter-43.3+4.new/src/x11/meta-x11-display.c
--- mutter-43.3+4.old/src/x11/meta-x11-display.c 2023-03-13 16:20:18.990232717 +0800
+++ mutter-43.3+4.new/src/x11/meta-x11-display.c 2023-03-13 16:21:25.375564893 +0800
@@ -1944,10 +1944,6 @@
Window xwindow,
uint32_t timestamp)
{
- if (xwindow != None &&
- !meta_display_windows_are_interactable (x11_display->display))
- return;
-
meta_x11_error_trap_push (x11_display);
/* In order for mutter to know that the focus request succeeded, we track
@@ -2020,22 +2016,6 @@
x11_display->display->last_focus_time = timestamp;
}
-void
-meta_x11_display_sync_input_focus (MetaX11Display *x11_display)
-{
- guint timestamp;
-
- if (!meta_display_windows_are_interactable (x11_display->display))
- return;
-
- meta_x11_error_trap_push (x11_display);
- timestamp = meta_display_get_current_time (x11_display->display);
- meta_x11_display_set_input_focus_internal (x11_display,
- x11_display->focus_xwindow,
- timestamp);
- meta_x11_error_trap_pop (x11_display);
-}
-
static MetaX11DisplayLogicalMonitorData *
get_x11_display_logical_monitor_data (MetaLogicalMonitor *logical_monitor)
{
diff --unified --recursive --text --new-file --color mutter-43.3+4.old/src/x11/meta-x11-display-private.h mutter-43.3+4.new/src/x11/meta-x11-display-private.h
--- mutter-43.3+4.old/src/x11/meta-x11-display-private.h 2023-03-13 16:20:18.990232717 +0800
+++ mutter-43.3+4.new/src/x11/meta-x11-display-private.h 2023-03-13 16:21:25.375564893 +0800
@@ -258,8 +258,6 @@
gboolean focus_frame,
uint32_t timestamp);
-void meta_x11_display_sync_input_focus (MetaX11Display *x11_display);
-
MetaDisplay * meta_x11_display_get_display (MetaX11Display *x11_display);
#endif /* META_X11_DISPLAY_PRIVATE_H */
diff --unified --recursive --text --new-file --color mutter-43.3+4.old/src/x11/window-x11.c mutter-43.3+4.new/src/x11/window-x11.c
--- mutter-43.3+4.old/src/x11/window-x11.c 2023-03-13 16:20:18.993565979 +0800
+++ mutter-43.3+4.new/src/x11/window-x11.c 2023-03-13 16:21:25.382231433 +0800
@@ -3382,7 +3382,8 @@
event->xclient.data.l[4]); /* height */
}
else if (event->xclient.message_type ==
- x11_display->atom__NET_ACTIVE_WINDOW)
+ x11_display->atom__NET_ACTIVE_WINDOW &&
+ meta_display_windows_are_interactable (window->display))
{
MetaClientType source_indication;
guint32 timestamp;

8
mutter-window-actor-Special-case-shaped-Java-windows.patch
View File

@ -11,11 +11,11 @@ by special-casing shaped Java windows.
src/compositor/meta-window-actor-x11.c | 8 ++++++++
1 file changed, 8 insertions(+)
Index: mutter-41.2/src/compositor/meta-window-actor-x11.c
Index: mutter-44.beta/src/compositor/meta-window-actor-x11.c
===================================================================
--- mutter-41.2.orig/src/compositor/meta-window-actor-x11.c
+++ mutter-41.2/src/compositor/meta-window-actor-x11.c
@@ -589,6 +589,14 @@ has_shadow (MetaWindowActorX11 *actor_x1
--- mutter-44.beta.orig/src/compositor/meta-window-actor-x11.c
+++ mutter-44.beta/src/compositor/meta-window-actor-x11.c
@@ -428,6 +428,14 @@ has_shadow (MetaWindowActorX11 *actor_x1
*/
if (window->has_custom_frame_extents)
return FALSE;

117
mutter.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Tue Mar 21 18:42:11 UTC 2023 - bjorn.lie@gmail.com
- Update to version 44.0+8:
+ clutter: Safely transform paths to strings and vice versa
+ Export meta_window_has_pointer ()
+ compositor/window-drag: Fix keyboard resize
+ backends: Fall back to the default and not the unknown color
space
+ wayland/buffer: Avoid spamming the log when a buffer is not
scanoutable
+ kms/device: Avoid leaking some fields
+ kms/impl-device: Fix result listener list leak
+ kms/impl-device/simple: Avoid destroying a NULL hash table
-------------------------------------------------------------------
Sun Mar 19 12:39:52 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 44.0:
+ Fix state confusion and delay on startup.
+ Fix night light regression.
+ Fix fullscreen regression with many SDL apps.
+ Fixed crashes.
+ Updated translations.
-------------------------------------------------------------------
Wed Mar 15 08:53:24 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Drop patch needed for mutter-43.x, not needed in GNOME:Next where
we have mutter-44.rc:
+ mutter-prevent-newly-focused-windows-to-steal-focus-from-shell.patch
-------------------------------------------------------------------
Mon Mar 13 08:25:25 UTC 2023 - Alynx Zhou <alynx.zhou@suse.com>
@ -5,6 +37,91 @@ Mon Mar 13 08:25:25 UTC 2023 - Alynx Zhou <alynx.zhou@suse.com>
Revert wrong commit and try a third approach to fix focus
(bsc#1208494).
-------------------------------------------------------------------
Mon Mar 6 18:46:06 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 44.rc:
+ Do not overwrite previously set offsets on attach
+ Fix Xwayland focus regressions
+ Stop parsing unused EDID parameters
+ Fix partial updates on offscreen rotated screens
+ Improve Xwayland RandR emulation compatibility
+ Fix touch window dragging on rotated monitors
+ Remove legacy OpenGL driver support
+ Improve default scale factor selection
+ Handle all X11 window title fallbacks
+ Fix handling of keyboard-driven window resize
+ Fix recording windows on non-active workspaces
+ Manage KMS updates more asynchronously
+ Fix headless startup
+ Remove support for window shading
+ Move away from GTK3
+ Restore zero-copy fast path for Xwayland fullscreen windows
+ Prevent clients from locking the compositor with cursor updates
+ Add experimental development tool for HDR modes
+ Account for linear sampling when calculating actor damage
+ wayland: Implement fractional_scale protocol
+ Fixed crashes
+ Memory handling fixes
+ Misc. bug fixes and cleanups
+ Updated translations.
- Disable mutter-Lower-HIDPI_LIMIT-to-144.patch: Needs rebase.
- Rebase mutter-disable-cvt-s390x.patch with quilt.
- Replace pkgconfig(gnome-desktop-3.0) with
pkgconfig(gnome-desktop-4) BuildRequires, following upstream
changes.
-------------------------------------------------------------------
Fri Feb 24 09:33:08 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 44.beta:
+ Don't disable KMS modifiers on newer i915 systems
+ Set LOD bias for sharper mipmaps
+ Fix edge resistance and window snapping regression
+ Avoid high-level udev queries for input caps and properties
+ Implement wl_output v3 and v4
+ Fix recalculating viewport after window resize
+ Fix opaque cursors and LoDPI cursor on HiDPI screens
+ Process device removing events immediately
+ Handle stage view updates without allocation more gracefully
+ Fix window screenshots being cut off at the bottom right
+ wayland/subsurface: Avoid using buffers with unfinished client
work
+ Move X11 window decorations to a separate client
+ Fix cursor position in window screencasts
+ Skip resize effects for tiled windows during user grabs
+ Fix pointer constrains with subsurfaces
+ Disable direct scanout during drag-n-drop operations
+ Ignore unmapped subsurfaces in direct scanout check
+ Fix cursor disappearing over windows during grabs
+ Make wl_output mode independent of the orientation
+ Improve focus handling on workspace switches
+ Fix initialization of keyboard accessibility
+ Refactor API to use well-defined ownership instead of
singletons
+ Add support for xdg-foreign-v2
+ Add higher bit depth offscreen framebuffers support
+ Overhaul dynamic max render time calculation
+ Do not require a physical device to update pointer visibility
+ Allow building without xwayland support
+ Add Xwayland byte-swapped clients support
+ Fix freeze when crossing monitors under some conditions
+ Don't allow window activation to break global grabs
+ Integrate window grab operations with new ClutterGrab API
+ Support selecting an acceleration profile for touchpad devices
+ Enforce compliant surface buffer sizes
+ Keep proportional position when moving window between rects
+ Introduce implicit grabbing in Clutter
+ Fix unexpected window focus changes after global grabs
+ Fix sloppy/mouse focus mode on wayland
+ Add service channel Wayland clients
+ Fixed crashes
+ Plugged leaks
+ Misc. bug fixes and cleanups
+ Updated translations.
- Rebase patches with quilt.
- Bump api_major define to 12 following upstream changes.
-------------------------------------------------------------------
Mon Feb 20 14:38:43 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

6
mutter.obsinfo
View File

@ -1,4 +1,4 @@
name: mutter
version: 43.3+2
mtime: 1676538182
commit: 12ce58dba4f96f6a948c1d166646d263253e3ee0
version: 44.0+8
mtime: 1679406471
commit: bc9cad512451d3f5d63c1892668d1c7aec370227

17
mutter.spec
View File

@ -18,11 +18,11 @@
%bcond_without profiler
%define api_major 11
%define api_major 12
%define api_minor 0
%define libmutter libmutter-%{api_major}-%{api_minor}
Name: mutter
Version: 43.3+2
Version: 44.0+8
Release: 0
Summary: Window and compositing manager based on Clutter
License: GPL-2.0-or-later
@ -32,7 +32,7 @@ URL: https://www.gnome.org
#Source0: https://download.gnome.org/sources/mutter/42/%%{name}-%%{version}.tar.xz
Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu@suse.com -- Lower HIDPI_LIMIT to 144
# PATCH-NEEDS-REBASE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu@suse.com -- Lower HIDPI_LIMIT to 144 WAS PATCH-FIX-OPENSUSE
Patch0: mutter-Lower-HIDPI_LIMIT-to-144.patch
# PATCH-FIX-UPSTREAM mutter-disable-cvt-s390x.patch bsc#1158128 fcrozat@suse.com -- Do not search for cvt on s390x, it doesn't exist there
Patch1: mutter-disable-cvt-s390x.patch
@ -40,8 +40,6 @@ Patch1: mutter-disable-cvt-s390x.patch
Patch2: mutter-window-actor-Special-case-shaped-Java-windows.patch
# PATCH-FIX-UPSTREAM mutter-crash-meta_context_terminate.patch bsc#1199382 glgo#GNOME/mutter#2267 xwang@suse.com -- Fix SIGSEGV in meta_context_terminate
Patch3: mutter-crash-meta_context_terminate.patch
# PATCH-FIX-UPSTREAM mutter-prevent-newly-focused-windows-to-steal-focus-from-shell.patch bsc#1208494, glgo#GNOME/mutter!2878 alynx.zhou@suse.com -- Fix broken window focus
Patch4: mutter-prevent-newly-focused-windows-to-steal-focus-from-shell.patch
## SLE-only patches start at 1000
# PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box.
@ -68,12 +66,14 @@ BuildRequires: pkgconfig(gbm) >= 17.3
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.69.0
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(glib-2.0) >= 2.69.0
BuildRequires: pkgconfig(gnome-desktop-3.0)
#BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gnome-desktop-4)
BuildRequires: pkgconfig(gnome-settings-daemon)
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5
BuildRequires: pkgconfig(graphene-gobject-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.37.2
BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.8
BuildRequires: pkgconfig(gtk4)
BuildRequires: pkgconfig(gudev-1.0) >= 232
BuildRequires: pkgconfig(json-glib-1.0) >= 0.12.0
BuildRequires: pkgconfig(lcms2) >= 2.6
@ -146,11 +146,10 @@ applications that want to make use of the mutter library.
%prep
%setup -q
%patch0 -p1
#patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# SLE-only patches and translations.
%if 0%{?sle_version}
@ -192,7 +191,7 @@ applications that want to make use of the mutter library.
%{_mandir}/man1/mutter.1%{?ext_man}
%{_bindir}/mutter
%{_libexecdir}/mutter-restart-helper
%{_datadir}/applications/mutter.desktop
%{_libexecdir}/mutter-x11-frames
%{_udevrulesdir}/61-mutter.rules
# These so files are not split out since they are private to mutter