From 3815bf4f042e2b212b7ba9114ae4f3f74564a8a8523d54a9cef81a5f153d4ec6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 4 Dec 2023 12:26:26 +0000 Subject: [PATCH 1/2] Accepting request 1130515 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/1130515 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=478 --- _service | 2 +- mutter-45.1.obscpio | 3 --- mutter-45.2.obscpio | 3 +++ mutter.changes | 11 +++++++++++ mutter.obsinfo | 6 +++--- mutter.spec | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 mutter-45.1.obscpio create mode 100644 mutter-45.2.obscpio diff --git a/_service b/_service index 7bccf71..d662945 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://gitlab.gnome.org/GNOME/mutter.git - refs/tags/45.1 + refs/tags/45.2 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/mutter-45.1.obscpio b/mutter-45.1.obscpio deleted file mode 100644 index 7cfb860..0000000 --- a/mutter-45.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:772ef9b4a0cff0b6bafa63e992620eb7e7d64e27cbdfd038960f544334c6c878 -size 26457101 diff --git a/mutter-45.2.obscpio b/mutter-45.2.obscpio new file mode 100644 index 0000000..4e2f567 --- /dev/null +++ b/mutter-45.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:901316ab64132f091a858d1bc5996d75bc97db09589d78f9480cf324a918e444 +size 26472973 diff --git a/mutter.changes b/mutter.changes index 5019071..77f8b0b 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Dec 2 19:59:45 UTC 2023 - Bjørn Lie + +- Update to version 45.2: + + Disable HW cursor when inhibited by backend + + Fix disabling check-alive timeout + + Propagate focus appearance to all ancestors + + Fix tablets on X11 having the wrong device + + Fixed crash + + Updated translations. + ------------------------------------------------------------------- Tue Nov 28 11:57:17 UTC 2023 - Dominique Leuenberger diff --git a/mutter.obsinfo b/mutter.obsinfo index 7c11ca5..711d600 100644 --- a/mutter.obsinfo +++ b/mutter.obsinfo @@ -1,4 +1,4 @@ name: mutter -version: 45.1 -mtime: 1698777300 -commit: c71a119de06d8937930e4d1adf06ff0c2b259653 +version: 45.2 +mtime: 1701445351 +commit: 08de409d40a92f8bf74ee8005b382aa194d76a45 diff --git a/mutter.spec b/mutter.spec index cdbb0f1..6f07483 100644 --- a/mutter.spec +++ b/mutter.spec @@ -22,7 +22,7 @@ %define api_minor 0 %define libmutter libmutter-%{api_major}-%{api_minor} Name: mutter -Version: 45.1 +Version: 45.2 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0-or-later From 2038ecdf9ae7620135dcb8563080e3fcfb761ed2df71f2f34ef3beb3cee07cd7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 4 Dec 2023 12:26:40 +0000 Subject: [PATCH 2/2] Accepting request 1130598 from home:yfjiang:branches:GNOME:Factory - Rebase mutter-SLE-bsc984738-grab-display.patch. OBS-URL: https://build.opensuse.org/request/show/1130598 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=479 --- _service | 2 +- mutter-45.1.obscpio | 3 + mutter-45.2.obscpio | 3 - mutter-SLE-bsc984738-grab-display.patch | 91 ++++++++++++++++++------- mutter.changes | 10 +-- mutter.obsinfo | 6 +- mutter.spec | 2 +- 7 files changed, 75 insertions(+), 42 deletions(-) create mode 100644 mutter-45.1.obscpio delete mode 100644 mutter-45.2.obscpio diff --git a/_service b/_service index d662945..7bccf71 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://gitlab.gnome.org/GNOME/mutter.git - refs/tags/45.2 + refs/tags/45.1 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/mutter-45.1.obscpio b/mutter-45.1.obscpio new file mode 100644 index 0000000..7cfb860 --- /dev/null +++ b/mutter-45.1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:772ef9b4a0cff0b6bafa63e992620eb7e7d64e27cbdfd038960f544334c6c878 +size 26457101 diff --git a/mutter-45.2.obscpio b/mutter-45.2.obscpio deleted file mode 100644 index 4e2f567..0000000 --- a/mutter-45.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:901316ab64132f091a858d1bc5996d75bc97db09589d78f9480cf324a918e444 -size 26472973 diff --git a/mutter-SLE-bsc984738-grab-display.patch b/mutter-SLE-bsc984738-grab-display.patch index 81b48ad..5f027b0 100644 --- a/mutter-SLE-bsc984738-grab-display.patch +++ b/mutter-SLE-bsc984738-grab-display.patch @@ -1,17 +1,17 @@ -Index: mutter-44.3/src/core/display.c +Index: mutter-45.1/src/core/display.c =================================================================== ---- mutter-44.3.orig/src/core/display.c -+++ mutter-44.3/src/core/display.c -@@ -880,6 +880,8 @@ meta_display_new (MetaContext *context, +--- mutter-45.1.orig/src/core/display.c ++++ mutter-45.1/src/core/display.c +@@ -956,6 +956,8 @@ meta_display_new (MetaContext *context, display->check_fullscreen_later = 0; display->work_area_later = 0; + display->server_grab_count = 0; + display->mouse_mode = TRUE; /* Only relevant for mouse or sloppy focus */ - display->allow_terminal_deactivation = TRUE; /* Only relevant for when a - terminal has the focus */ -@@ -1208,6 +1210,50 @@ meta_grab_op_is_moving (MetaGrabOp op) + + display->current_time = META_CURRENT_TIME; +@@ -1308,6 +1310,50 @@ meta_grab_op_is_moving (MetaGrabOp op) return !meta_grab_op_is_resizing (op); } @@ -62,11 +62,11 @@ Index: mutter-44.3/src/core/display.c /** * meta_display_windows_are_interactable: * @op: A #MetaGrabOp -Index: mutter-44.3/src/core/display-private.h +Index: mutter-45.1/src/core/display-private.h =================================================================== ---- mutter-44.3.orig/src/core/display-private.h -+++ mutter-44.3/src/core/display-private.h -@@ -105,6 +105,8 @@ struct _MetaDisplay +--- mutter-45.1.orig/src/core/display-private.h ++++ mutter-45.1/src/core/display-private.h +@@ -95,6 +95,8 @@ struct _MetaDisplay GHashTable *stamps; GHashTable *wayland_windows; @@ -75,19 +75,19 @@ Index: mutter-44.3/src/core/display-private.h guint32 current_time; /* We maintain a sequence counter, incremented for each #MetaWindow -@@ -189,6 +191,8 @@ struct _MetaDisplayClass - +@@ -179,6 +181,8 @@ struct _MetaDisplayClass MetaDisplay * meta_display_new (MetaContext *context, GError **error); + +void meta_display_grab (MetaDisplay *display); +void meta_display_ungrab (MetaDisplay *display); - + #ifdef HAVE_X11_CLIENT void meta_display_manage_all_xwindows (MetaDisplay *display); - void meta_display_unmanage_windows (MetaDisplay *display, -Index: mutter-44.3/src/core/keybindings.c + #endif +Index: mutter-45.1/src/core/keybindings.c =================================================================== ---- mutter-44.3.orig/src/core/keybindings.c -+++ mutter-44.3/src/core/keybindings.c +--- mutter-45.1.orig/src/core/keybindings.c ++++ mutter-45.1/src/core/keybindings.c @@ -1257,6 +1257,9 @@ meta_display_grab_window_buttons (MetaDi { MetaKeyBindingManager *keys = &display->key_binding_manager; @@ -148,11 +148,11 @@ Index: mutter-44.3/src/core/keybindings.c if (window->grab_on_frame && window->frame != NULL) change_window_keygrabs (keys, window->frame->xwindow, FALSE); -Index: mutter-44.3/src/x11/meta-x11-display.c +Index: mutter-45.1/src/x11/meta-x11-display.c =================================================================== ---- mutter-44.3.orig/src/x11/meta-x11-display.c -+++ mutter-44.3/src/x11/meta-x11-display.c -@@ -2013,7 +2013,7 @@ meta_x11_display_set_input_focus_interna +--- mutter-45.1.orig/src/x11/meta-x11-display.c ++++ mutter-45.1/src/x11/meta-x11-display.c +@@ -1990,7 +1990,7 @@ meta_x11_display_set_input_focus_interna * we know which is which by making two requests that the server will * process at the same time. */ @@ -161,7 +161,7 @@ Index: mutter-44.3/src/x11/meta-x11-display.c XSetInputFocus (x11_display->xdisplay, xwindow, -@@ -2025,8 +2025,7 @@ meta_x11_display_set_input_focus_interna +@@ -2002,8 +2002,7 @@ meta_x11_display_set_input_focus_interna x11_display->atom__MUTTER_FOCUS_SET, XA_STRING, 8, PropModeAppend, NULL, 0); @@ -171,10 +171,10 @@ Index: mutter-44.3/src/x11/meta-x11-display.c meta_x11_error_trap_pop (x11_display); } -Index: mutter-44.3/src/x11/window-x11.c +Index: mutter-45.1/src/x11/window-x11.c =================================================================== ---- mutter-44.3.orig/src/x11/window-x11.c -+++ mutter-44.3/src/x11/window-x11.c +--- mutter-45.1.orig/src/x11/window-x11.c ++++ mutter-45.1/src/x11/window-x11.c @@ -548,6 +548,8 @@ meta_window_x11_manage (MetaWindow *wind meta_sync_counter_init (&priv->sync_counter, window, window->xwindow); meta_icon_cache_init (&priv->icon_cache); @@ -184,6 +184,20 @@ Index: mutter-44.3/src/x11/window-x11.c meta_x11_display_register_x_window (display->x11_display, &window->xwindow, window); +@@ -565,11 +567,11 @@ meta_window_x11_manage (MetaWindow *wind + if (window->decorated) + meta_window_ensure_frame (window); + else +- meta_window_x11_initialize_state (window); ++ meta_window_x11_initialize_state (window, display); + } + + void +-meta_window_x11_initialize_state (MetaWindow *window) ++meta_window_x11_initialize_state (MetaWindow *window, MetaDisplay *display) + { + MetaWindowX11 *window_x11 = META_WINDOW_X11 (window); + MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11); @@ -620,6 +622,13 @@ meta_window_x11_initialize_state (MetaWi meta_window_x11_update_shape_region (window); @@ -198,3 +212,28 @@ Index: mutter-44.3/src/x11/window-x11.c } static void +Index: mutter-45.1/src/x11/events.c +=================================================================== +--- mutter-45.1.orig/src/x11/events.c ++++ mutter-45.1/src/x11/events.c +@@ -1485,7 +1485,7 @@ handle_other_xevent (MetaX11Display *x11 + { + meta_window_set_frame_xwindow (window, + event->xmaprequest.window); +- meta_window_x11_initialize_state (window); ++ meta_window_x11_initialize_state (window, display); + meta_window_update_visibility (window); + } + +Index: mutter-45.1/src/x11/window-x11-private.h +=================================================================== +--- mutter-45.1.orig/src/x11/window-x11-private.h ++++ mutter-45.1/src/x11/window-x11-private.h +@@ -94,6 +94,6 @@ void meta_window_x11_set_bypass_composit + + void meta_window_x11_queue_update_icon (MetaWindowX11 *window_x11); + +-void meta_window_x11_initialize_state (MetaWindow *window); ++void meta_window_x11_initialize_state (MetaWindow *window, MetaDisplay *display); + + G_END_DECLS diff --git a/mutter.changes b/mutter.changes index 77f8b0b..d8f2324 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,13 +1,7 @@ ------------------------------------------------------------------- -Sat Dec 2 19:59:45 UTC 2023 - Bjørn Lie +Sun Dec 3 15:54:07 UTC 2023 - Yifan Jiang -- Update to version 45.2: - + Disable HW cursor when inhibited by backend - + Fix disabling check-alive timeout - + Propagate focus appearance to all ancestors - + Fix tablets on X11 having the wrong device - + Fixed crash - + Updated translations. +- Rebase mutter-SLE-bsc984738-grab-display.patch. ------------------------------------------------------------------- Tue Nov 28 11:57:17 UTC 2023 - Dominique Leuenberger diff --git a/mutter.obsinfo b/mutter.obsinfo index 711d600..7c11ca5 100644 --- a/mutter.obsinfo +++ b/mutter.obsinfo @@ -1,4 +1,4 @@ name: mutter -version: 45.2 -mtime: 1701445351 -commit: 08de409d40a92f8bf74ee8005b382aa194d76a45 +version: 45.1 +mtime: 1698777300 +commit: c71a119de06d8937930e4d1adf06ff0c2b259653 diff --git a/mutter.spec b/mutter.spec index 6f07483..cdbb0f1 100644 --- a/mutter.spec +++ b/mutter.spec @@ -22,7 +22,7 @@ %define api_minor 0 %define libmutter libmutter-%{api_major}-%{api_minor} Name: mutter -Version: 45.2 +Version: 45.1 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0-or-later