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

Accepting request 1205483 from GNOME:Factory

Browse Source 
SCripted push of GNOME 47

OBS-URL: https://build.opensuse.org/request/show/1205483
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=237
This commit is contained in:
Ana Guerrero 2024-10-08 15:18:13 +00:00 committed by Git OBS Bridge
commit fd9588fb90
13 changed files with 207 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
0001-Revert-clutter-actor-Cache-stage-relative-instead-of.patch
View File

@ -9,11 +9,11 @@ This reverts commit 703bbe0e99dbb688352e0bff396e5cbf2c6af45b.
clutter/clutter/clutter-actor.c | 67 ++++++++++----------------------- clutter/clutter/clutter-actor.c | 67 ++++++++++-----------------------
1 file changed, 20 insertions(+), 47 deletions(-) 1 file changed, 20 insertions(+), 47 deletions(-)
Index: mutter-46.3/clutter/clutter/clutter-actor.c Index: mutter-47.beta/clutter/clutter/clutter-actor.c
=================================================================== ===================================================================
--- mutter-46.3.orig/clutter/clutter/clutter-actor.c --- mutter-47.beta.orig/clutter/clutter/clutter-actor.c
+++ mutter-46.3/clutter/clutter/clutter-actor.c +++ mutter-47.beta/clutter/clutter/clutter-actor.c
@@ -566,7 +566,7 @@ struct _ClutterActorPrivate @@ -567,7 +567,7 @@ struct _ClutterActorPrivate
/* the cached transformation matrix; see apply_transform() */ /* the cached transformation matrix; see apply_transform() */
graphene_matrix_t transform; graphene_matrix_t transform;
@ -22,7 +22,7 @@ Index: mutter-46.3/clutter/clutter/clutter-actor.c
float resource_scale; float resource_scale;
@@ -730,7 +730,7 @@ struct _ClutterActorPrivate @@ -731,7 +731,7 @@ struct _ClutterActorPrivate
guint clear_stage_views_needs_stage_views_changed : 1; guint clear_stage_views_needs_stage_views_changed : 1;
guint needs_redraw : 1; guint needs_redraw : 1;
guint needs_finish_layout : 1; guint needs_finish_layout : 1;
@ -31,7 +31,7 @@ Index: mutter-46.3/clutter/clutter/clutter-actor.c
}; };
enum enum
@@ -2309,7 +2309,7 @@ absolute_geometry_changed (ClutterActor @@ -2315,7 +2315,7 @@ absolute_geometry_changed (ClutterActor
{ {
actor->priv->needs_update_stage_views = TRUE; actor->priv->needs_update_stage_views = TRUE;
actor->priv->needs_visible_paint_volume_update = TRUE; actor->priv->needs_visible_paint_volume_update = TRUE;
@ -40,7 +40,7 @@ Index: mutter-46.3/clutter/clutter/clutter-actor.c
actor->priv->needs_finish_layout = TRUE; actor->priv->needs_finish_layout = TRUE;
/* needs_finish_layout is already TRUE on the whole parent tree thanks /* needs_finish_layout is already TRUE on the whole parent tree thanks
@@ -2931,9 +2931,8 @@ _clutter_actor_apply_relative_transforma @@ -2944,9 +2944,8 @@ _clutter_actor_apply_relative_transforma
graphene_matrix_t *matrix) graphene_matrix_t *matrix)
{ {
ClutterActorPrivate *priv = self->priv; ClutterActorPrivate *priv = self->priv;
@ -52,7 +52,7 @@ Index: mutter-46.3/clutter/clutter/clutter-actor.c
/* Note we terminate before ever calling stage->apply_transform() /* Note we terminate before ever calling stage->apply_transform()
* since that would conceptually be relative to the underlying * since that would conceptually be relative to the underlying
@@ -2942,63 +2941,37 @@ _clutter_actor_apply_relative_transforma @@ -2955,63 +2954,37 @@ _clutter_actor_apply_relative_transforma
if (self == ancestor) if (self == ancestor)
return; return;
@ -130,7 +130,7 @@ Index: mutter-46.3/clutter/clutter/clutter-actor.c
return; return;
} }
@@ -7362,7 +7335,7 @@ clutter_actor_init (ClutterActor *self) @@ -7398,7 +7371,7 @@ clutter_actor_init (ClutterActor *self)
priv->enable_model_view_transform = TRUE; priv->enable_model_view_transform = TRUE;
priv->transform_valid = FALSE; priv->transform_valid = FALSE;

14
_service
View File

@ -3,16 +3,24 @@
<service name="obs_scm" mode="manual"> <service name="obs_scm" mode="manual">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param> <param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
<param name="revision">46.5</param> <param name="revision">70c0eca6b08b7a5aed7a1951149f72f98331a6b4</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param> <param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param> <param name="versionrewrite-replacement">\1</param>
<!-- <param name="changesgenerate">enable</param> --> <param name="changesgenerate">enable</param>
</service>
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gvdb.git</param>
<param name="revision">b54bc5da25127ef416858a3ad92e57159ff565b3</param>
<param name="versionformat">0.gitmodule</param>
</service> </service>
<service name="tar" mode="buildtime"/> <service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime"> <service name="recompress" mode="buildtime">
<param name="file">*.tar</param> <param name="file">*.tar</param>
<param name="compression">zst</param> <param name="compression">zst</param>
</service> </service>
<service name="set_version" mode="manual" /> <service name="set_version" mode="manual">
<param name="basename">mutter</param>
</service>
</services> </services>

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">70c0eca6b08b7a5aed7a1951149f72f98331a6b4</param></service></servicedata>

BIN
gvdb-0.gitmodule.obscpio (Stored with Git LFS) Normal file
View File

Binary file not shown.

4
gvdb.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: gvdb
version: 0.gitmodule
mtime: 1725181085
commit: b54bc5da25127ef416858a3ad92e57159ff565b3

3
mutter-46.5.obscpio
View File

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

3
mutter-47.0+19.obscpio Normal file
View File

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

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

@ -1,7 +1,7 @@
Index: mutter-46.3/src/backends/native/meta-default-modes-s390x.h Index: mutter-47.beta/src/backends/native/meta-default-modes-s390x.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ mutter-46.3/src/backends/native/meta-default-modes-s390x.h +++ mutter-47.beta/src/backends/native/meta-default-modes-s390x.h
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
+/* Generated by gen-default-modes.py */ +/* Generated by gen-default-modes.py */
+ +
@ -60,11 +60,11 @@ Index: mutter-46.3/src/backends/native/meta-default-modes-s390x.h
+{ 813000, 2304, 2307, 2312, 2386, 0, 4096, 4440, 4888, 5680, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2304x4096_60.00" }, +{ 813000, 2304, 2307, 2312, 2386, 0, 4096, 4440, 4888, 5680, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2304x4096_60.00" },
+{ 1276500, 2880, 2883, 2888, 2982, 0, 5120, 5560, 6128, 7136, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2880x5120_60.00" }, +{ 1276500, 2880, 2883, 2888, 2982, 0, 5120, 5560, 6128, 7136, 0, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NVSYNC, DRM_MODE_TYPE_DEFAULT, "2880x5120_60.00" },
+}; +};
Index: mutter-46.3/src/meson.build Index: mutter-47.beta/src/meson.build
=================================================================== ===================================================================
--- mutter-46.3.orig/src/meson.build --- mutter-47.beta.orig/src/meson.build
+++ mutter-46.3/src/meson.build +++ mutter-47.beta/src/meson.build
@@ -968,6 +968,7 @@ if have_profiler @@ -985,6 +985,7 @@ if have_profiler
endif endif
if have_native_backend if have_native_backend
@ -72,7 +72,7 @@ Index: mutter-46.3/src/meson.build
cvt = find_program('cvt') cvt = find_program('cvt')
gen_default_modes = find_program('backends/native/gen-default-modes.py') gen_default_modes = find_program('backends/native/gen-default-modes.py')
@@ -975,6 +976,13 @@ if have_native_backend @@ -992,6 +993,13 @@ if have_native_backend
output: 'meta-default-modes.h', output: 'meta-default-modes.h',
command: [gen_default_modes, '@OUTPUT@'] command: [gen_default_modes, '@OUTPUT@']
) )

74
mutter-implement-text-input-v1.patch
View File

@ -25,11 +25,11 @@ Closes <https://gitlab.gnome.org/GNOME/mutter/-/issues/3200>.
create mode 100644 src/wayland/meta-wayland-text-input-v1.c create mode 100644 src/wayland/meta-wayland-text-input-v1.c
create mode 100644 src/wayland/meta-wayland-text-input-v1.h create mode 100644 src/wayland/meta-wayland-text-input-v1.h
Index: mutter-46.3/clutter/clutter/clutter-enums.h Index: mutter-47.beta/clutter/clutter/clutter-enums.h
=================================================================== ===================================================================
--- mutter-46.3.orig/clutter/clutter/clutter-enums.h --- mutter-47.beta.orig/clutter/clutter/clutter-enums.h
+++ mutter-46.3/clutter/clutter/clutter-enums.h +++ mutter-47.beta/clutter/clutter/clutter-enums.h
@@ -1183,6 +1183,9 @@ typedef enum @@ -1215,6 +1215,9 @@ typedef enum
CLUTTER_INPUT_CONTENT_HINT_SENSITIVE_DATA = 1 << 7, CLUTTER_INPUT_CONTENT_HINT_SENSITIVE_DATA = 1 << 7,
CLUTTER_INPUT_CONTENT_HINT_LATIN = 1 << 8, CLUTTER_INPUT_CONTENT_HINT_LATIN = 1 << 8,
CLUTTER_INPUT_CONTENT_HINT_MULTILINE = 1 << 9, CLUTTER_INPUT_CONTENT_HINT_MULTILINE = 1 << 9,
@ -39,11 +39,11 @@ Index: mutter-46.3/clutter/clutter/clutter-enums.h
} ClutterInputContentHintFlags; } ClutterInputContentHintFlags;
typedef enum typedef enum
Index: mutter-46.3/src/core/events.c Index: mutter-47.beta/src/core/events.c
=================================================================== ===================================================================
--- mutter-46.3.orig/src/core/events.c --- mutter-47.beta.orig/src/core/events.c
+++ mutter-46.3/src/core/events.c +++ mutter-47.beta/src/core/events.c
@@ -238,6 +238,7 @@ meta_display_handle_event (MetaDisplay @@ -239,6 +239,7 @@ meta_display_handle_event (MetaDisplay
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
MetaWaylandCompositor *wayland_compositor; MetaWaylandCompositor *wayland_compositor;
MetaWaylandTextInput *wayland_text_input = NULL; MetaWaylandTextInput *wayland_text_input = NULL;
@ -51,7 +51,7 @@ Index: mutter-46.3/src/core/events.c
#endif #endif
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
@@ -246,6 +247,8 @@ meta_display_handle_event (MetaDisplay @@ -247,6 +248,8 @@ meta_display_handle_event (MetaDisplay
{ {
wayland_text_input = wayland_text_input =
meta_wayland_compositor_get_text_input (wayland_compositor); meta_wayland_compositor_get_text_input (wayland_compositor);
@ -60,7 +60,7 @@ Index: mutter-46.3/src/core/events.c
} }
#endif #endif
@@ -287,9 +290,11 @@ meta_display_handle_event (MetaDisplay @@ -288,9 +291,11 @@ meta_display_handle_event (MetaDisplay
} }
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
@ -75,11 +75,11 @@ Index: mutter-46.3/src/core/events.c
return CLUTTER_EVENT_STOP; return CLUTTER_EVENT_STOP;
if (wayland_compositor) if (wayland_compositor)
Index: mutter-46.3/src/meson.build Index: mutter-47.beta/src/meson.build
=================================================================== ===================================================================
--- mutter-46.3.orig/src/meson.build --- mutter-47.beta.orig/src/meson.build
+++ mutter-46.3/src/meson.build +++ mutter-47.beta/src/meson.build
@@ -688,6 +688,8 @@ if have_wayland @@ -694,6 +694,8 @@ if have_wayland
'wayland/meta-wayland-tablet-tool.h', 'wayland/meta-wayland-tablet-tool.h',
'wayland/meta-wayland-text-input.c', 'wayland/meta-wayland-text-input.c',
'wayland/meta-wayland-text-input.h', 'wayland/meta-wayland-text-input.h',
@ -88,18 +88,18 @@ Index: mutter-46.3/src/meson.build
'wayland/meta-wayland-touch.c', 'wayland/meta-wayland-touch.c',
'wayland/meta-wayland-touch.h', 'wayland/meta-wayland-touch.h',
'wayland/meta-wayland-transaction.c', 'wayland/meta-wayland-transaction.c',
@@ -1084,6 +1086,7 @@ if have_wayland @@ -1102,6 +1104,7 @@ if have_wayland
['single-pixel-buffer', 'staging', 'v1', ], ['single-pixel-buffer', 'staging', 'v1', ],
['tablet', 'unstable', 'v2', ], ['tablet', 'unstable', 'v2', ],
['text-input', 'unstable', 'v3', ], ['text-input', 'unstable', 'v3', ],
+ ['text-input', 'unstable', 'v1', ], + ['text-input', 'unstable', 'v1', ],
['viewporter', 'stable', ], ['viewporter', 'stable', ],
['xdg-activation', 'staging', 'v1', ], ['xdg-activation', 'staging', 'v1', ],
['xdg-foreign', 'unstable', 'v1', ], ['xdg-dialog', 'staging', 'v1', ],
Index: mutter-46.3/src/wayland/meta-wayland-seat.c Index: mutter-47.beta/src/wayland/meta-wayland-seat.c
=================================================================== ===================================================================
--- mutter-46.3.orig/src/wayland/meta-wayland-seat.c --- mutter-47.beta.orig/src/wayland/meta-wayland-seat.c
+++ mutter-46.3/src/wayland/meta-wayland-seat.c +++ mutter-47.beta/src/wayland/meta-wayland-seat.c
@@ -229,6 +229,7 @@ default_focus (MetaWaylandEventHandler * @@ -229,6 +229,7 @@ default_focus (MetaWaylandEventHandler *
surface); surface);
meta_wayland_tablet_seat_set_pad_focus (seat->tablet_seat, surface); meta_wayland_tablet_seat_set_pad_focus (seat->tablet_seat, surface);
@ -147,10 +147,10 @@ Index: mutter-46.3/src/wayland/meta-wayland-seat.c
return TRUE; return TRUE;
break; break;
Index: mutter-46.3/src/wayland/meta-wayland-seat.h Index: mutter-47.beta/src/wayland/meta-wayland-seat.h
=================================================================== ===================================================================
--- mutter-46.3.orig/src/wayland/meta-wayland-seat.h --- mutter-47.beta.orig/src/wayland/meta-wayland-seat.h
+++ mutter-46.3/src/wayland/meta-wayland-seat.h +++ mutter-47.beta/src/wayland/meta-wayland-seat.h
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
#include "wayland/meta-wayland-pointer.h" #include "wayland/meta-wayland-pointer.h"
#include "wayland/meta-wayland-tablet-tool.h" #include "wayland/meta-wayland-tablet-tool.h"
@ -167,10 +167,10 @@ Index: mutter-46.3/src/wayland/meta-wayland-seat.h
MetaWaylandInput *input_handler; MetaWaylandInput *input_handler;
MetaWaylandEventHandler *default_handler; MetaWaylandEventHandler *default_handler;
Index: mutter-46.3/src/wayland/meta-wayland-text-input-v1.c Index: mutter-47.beta/src/wayland/meta-wayland-text-input-v1.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ mutter-46.3/src/wayland/meta-wayland-text-input-v1.c +++ mutter-47.beta/src/wayland/meta-wayland-text-input-v1.c
@@ -0,0 +1,859 @@ @@ -0,0 +1,859 @@
+/* +/*
+ * Copyright (C) 2024 SUSE LLC + * Copyright (C) 2024 SUSE LLC
@ -1031,10 +1031,10 @@ Index: mutter-46.3/src/wayland/meta-wayland-text-input-v1.c
+ +
+ return retval; + return retval;
+} +}
Index: mutter-46.3/src/wayland/meta-wayland-text-input-v1.h Index: mutter-47.beta/src/wayland/meta-wayland-text-input-v1.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ mutter-46.3/src/wayland/meta-wayland-text-input-v1.h +++ mutter-47.beta/src/wayland/meta-wayland-text-input-v1.h
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+/* +/*
+ * Copyright (C) 2024 SUSE LLC + * Copyright (C) 2024 SUSE LLC
@ -1074,10 +1074,10 @@ Index: mutter-46.3/src/wayland/meta-wayland-text-input-v1.h
+ +
+gboolean meta_wayland_text_input_v1_handle_event (MetaWaylandTextInputV1 *text_input, +gboolean meta_wayland_text_input_v1_handle_event (MetaWaylandTextInputV1 *text_input,
+ const ClutterEvent *event); + const ClutterEvent *event);
Index: mutter-46.3/src/wayland/meta-wayland-versions.h Index: mutter-47.beta/src/wayland/meta-wayland-versions.h
=================================================================== ===================================================================
--- mutter-46.3.orig/src/wayland/meta-wayland-versions.h --- mutter-47.beta.orig/src/wayland/meta-wayland-versions.h
+++ mutter-46.3/src/wayland/meta-wayland-versions.h +++ mutter-47.beta/src/wayland/meta-wayland-versions.h
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
#define META_ZXDG_OUTPUT_V1_VERSION 3 #define META_ZXDG_OUTPUT_V1_VERSION 3
#define META_ZWP_XWAYLAND_KEYBOARD_GRAB_V1_VERSION 1 #define META_ZWP_XWAYLAND_KEYBOARD_GRAB_V1_VERSION 1
@ -1086,11 +1086,11 @@ Index: mutter-46.3/src/wayland/meta-wayland-versions.h
#define META_WP_VIEWPORTER_VERSION 1 #define META_WP_VIEWPORTER_VERSION 1
#define META_ZWP_PRIMARY_SELECTION_V1_VERSION 1 #define META_ZWP_PRIMARY_SELECTION_V1_VERSION 1
#define META_WP_PRESENTATION_VERSION 1 #define META_WP_PRESENTATION_VERSION 1
Index: mutter-46.3/src/wayland/meta-wayland.c Index: mutter-47.beta/src/wayland/meta-wayland.c
=================================================================== ===================================================================
--- mutter-46.3.orig/src/wayland/meta-wayland.c --- mutter-47.beta.orig/src/wayland/meta-wayland.c
+++ mutter-46.3/src/wayland/meta-wayland.c +++ mutter-47.beta/src/wayland/meta-wayland.c
@@ -865,6 +865,7 @@ meta_wayland_compositor_new (MetaContext @@ -869,6 +869,7 @@ meta_wayland_compositor_new (MetaContext
meta_wayland_keyboard_shortcuts_inhibit_init (compositor); meta_wayland_keyboard_shortcuts_inhibit_init (compositor);
meta_wayland_surface_inhibit_shortcuts_dialog_init (); meta_wayland_surface_inhibit_shortcuts_dialog_init ();
meta_wayland_text_input_init (compositor); meta_wayland_text_input_init (compositor);
@ -1098,7 +1098,7 @@ Index: mutter-46.3/src/wayland/meta-wayland.c
meta_wayland_init_presentation_time (compositor); meta_wayland_init_presentation_time (compositor);
meta_wayland_activation_init (compositor); meta_wayland_activation_init (compositor);
meta_wayland_transaction_init (compositor); meta_wayland_transaction_init (compositor);
@@ -1124,6 +1125,12 @@ meta_wayland_compositor_get_text_input ( @@ -1133,6 +1134,12 @@ meta_wayland_compositor_get_text_input (
return compositor->seat->text_input; return compositor->seat->text_input;
} }
@ -1111,10 +1111,10 @@ Index: mutter-46.3/src/wayland/meta-wayland.c
static void static void
meta_wayland_compositor_update_focus (MetaWaylandCompositor *compositor, meta_wayland_compositor_update_focus (MetaWaylandCompositor *compositor,
MetaWindow *window) MetaWindow *window)
Index: mutter-46.3/src/wayland/meta-wayland.h Index: mutter-47.beta/src/wayland/meta-wayland.h
=================================================================== ===================================================================
--- mutter-46.3.orig/src/wayland/meta-wayland.h --- mutter-47.beta.orig/src/wayland/meta-wayland.h
+++ mutter-46.3/src/wayland/meta-wayland.h +++ mutter-47.beta/src/wayland/meta-wayland.h
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
#include "meta/types.h" #include "meta/types.h"
#include "meta/meta-wayland-compositor.h" #include "meta/meta-wayland-compositor.h"

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

@ -13,13 +13,13 @@ by special-casing shaped Java windows.
src/x11/window-x11.c | 9 +++++++++ src/x11/window-x11.c | 9 +++++++++
3 files changed, 19 insertions(+) 3 files changed, 19 insertions(+)
Index: mutter-46.3/src/compositor/meta-window-actor-x11.c Index: mutter-47.beta/src/compositor/meta-window-actor-x11.c
=================================================================== ===================================================================
--- mutter-46.3.orig/src/compositor/meta-window-actor-x11.c --- mutter-47.beta.orig/src/compositor/meta-window-actor-x11.c
+++ mutter-46.3/src/compositor/meta-window-actor-x11.c +++ mutter-47.beta/src/compositor/meta-window-actor-x11.c
@@ -424,6 +424,14 @@ has_shadow (MetaWindowActorX11 *actor_x1 @@ -423,6 +423,14 @@ has_shadow (MetaWindowActorX11 *actor_x1
*/ */
if (window->has_custom_frame_extents) if (!meta_window_actor_is_opaque (META_WINDOW_ACTOR (actor_x11)))
return FALSE; return FALSE;
+ +
+ /* + /*
@ -31,12 +31,12 @@ Index: mutter-46.3/src/compositor/meta-window-actor-x11.c
+ return FALSE; + return FALSE;
/* /*
* Generate shadows for all other windows. * If a window specifies that it has custom frame extents, that likely
Index: mutter-46.3/src/x11/window-x11-private.h Index: mutter-47.beta/src/x11/window-x11-private.h
=================================================================== ===================================================================
--- mutter-46.3.orig/src/x11/window-x11-private.h --- mutter-47.beta.orig/src/x11/window-x11-private.h
+++ mutter-46.3/src/x11/window-x11-private.h +++ mutter-47.beta/src/x11/window-x11-private.h
@@ -125,6 +125,8 @@ gboolean meta_window_x11_has_pointer (Me @@ -128,6 +128,8 @@ gboolean meta_window_x11_has_pointer (Me
gboolean meta_window_x11_same_application (MetaWindow *window, gboolean meta_window_x11_same_application (MetaWindow *window,
MetaWindow *other_window); MetaWindow *other_window);
@ -45,11 +45,11 @@ Index: mutter-46.3/src/x11/window-x11-private.h
void meta_window_x11_shutdown_group (MetaWindow *window); void meta_window_x11_shutdown_group (MetaWindow *window);
META_EXPORT META_EXPORT
Index: mutter-46.3/src/x11/window-x11.c Index: mutter-47.beta/src/x11/window-x11.c
=================================================================== ===================================================================
--- mutter-46.3.orig/src/x11/window-x11.c --- mutter-47.beta.orig/src/x11/window-x11.c
+++ mutter-46.3/src/x11/window-x11.c +++ mutter-47.beta/src/x11/window-x11.c
@@ -2582,6 +2582,15 @@ meta_window_x11_update_shape_region (Met @@ -2605,6 +2605,15 @@ meta_window_x11_update_shape_region (Met
meta_window_set_shape_region (window, region); meta_window_set_shape_region (window, region);
} }

93
mutter.changes
View File

@ -1,3 +1,96 @@
-------------------------------------------------------------------
Thu Sep 26 18:20:54 UTC 2024 - bjorn.lie@gmail.com
- Update to version 47.0+19:
* Revert "window/wayland: Use scale for configured rect in
configuration"
* cogl/gles: Don't initialize glGetStringi
* cogl/gl: Don't initialize potentially unused/unsupported
functions
* cogl: Don't _cogl_context_get_gl_extensions before
check_gl_version
* cogl/egl: Restore support for EGL 1.4
* wayland/tablet-tool: Fix grabbing tablet devices
* cogl/gles: Use unsized internal formats for RGB8, RGBA8 in GLES
2.0
* wayland/color-management: Fix SIGSEGV on dispose
* x11: Reduce chances XPending does recvmsg() syscall
* gwakeup: Reduce wake-ups to only first item in queue
* window/x11: Use g_autoslist (MetaStrut) in
meta_window_x11_update_struts
* Updated translations.
-------------------------------------------------------------------
Mon Sep 16 22:52:32 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 47.0:
+ Fix resizing of electron windows
+ Fix using modifiers on multi-GPU setups
+ Don't override externally set tablet calibration
+ Add experimental support for xdg-session-manager-v1 protocol
+ Fixed crashes
+ Misc. bug fixes and cleanups
+ Updated translations.
- Add gvdb submodule and add as source.
-------------------------------------------------------------------
Mon Sep 16 21:20:19 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 47.rc+40:
+ window/xwayland: Handle arithmetics close to the int limits.
-------------------------------------------------------------------
Mon Sep 16 20:19:12 UTC 2024 - Michael Gorse <mgorse@suse.com>
- Update version requirements to correspond with the source.
-------------------------------------------------------------------
Mon Sep 16 18:19:54 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 47.rc:
+ Add experimental color management protocol support
+ Merge Cally into Clutter
+ Fix drag and drop between X11 and wayland clients
+ Fix drag and drop from grabbing popups
+ Fix EGLDevice support
+ Improve cursor smoothness under load
+ Fix frozen cursor on some hybrid machines
+ Fix touch window dragging with pointer lock enabled
+ Store the layout mode in monitor config
+ Fix keys sometimes getting stuck after using global shortcut
+ Fix propagating tablet device removals to clients
+ Fix tablet input in maximized windows
+ Reduce damage on window movement
+ Install mutter tests
+ Use libadwaita for server-side decorations on GNOME
+ Fix frozen cursor after suspend
+ Let scaling-aware Xwayland clients scale themselves
+ Add initial PipeWire explicit sync support
+ Trace damage reason in sysprof
+ Expose new backlight API to gnome-settings-daemon
+ Fixed crashes
+ Plugged leaks
+ Misc. bug fixes and cleanups
+ Updated translations.
-------------------------------------------------------------------
Mon Sep 16 18:17:08 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 47.beta:
+ Fix visibility of Xwayland windows
+ Add plumbing for transforming color state
+ Build and publish GNOME OS systemd-sysext extensions
+ Implement support for tablet tool keybindings and actions
+ Add support for tablet tool pressure ranges
+ Improve sticky behavior with transient dialogs
+ Improve placement and focus logic with always-on-top windows
+ Expose Orientationmanager to introspection
+ Recover from secondary GPU update failures
+ Plugged leaks
+ Misc. bug fixes and cleanups.
- Rebase patches with quilt.
- Bump api_major to 15 following upstream changes.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 15 12:06:37 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com> Sun Sep 15 12:06:37 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>

6
mutter.obsinfo
View File

@ -1,4 +1,4 @@
name: mutter name: mutter
version: 46.5 version: 47.0+19
mtime: 1726343501 mtime: 1727134492
commit: f585134c114797aae27f1a82013c665a5c1b94ed commit: 70c0eca6b08b7a5aed7a1951149f72f98331a6b4

35
mutter.spec
View File

@ -18,17 +18,18 @@
%bcond_with profiler %bcond_with profiler
%define api_major 14 %define api_major 15
%define api_minor 0 %define api_minor 0
%define libmutter libmutter-%{api_major}-%{api_minor} %define libmutter libmutter-%{api_major}-%{api_minor}
Name: mutter Name: mutter
Version: 46.5 Version: 47.0+19
Release: 0 Release: 0
Summary: Window and compositing manager based on Clutter Summary: Window and compositing manager based on Clutter
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/GUI/GNOME Group: System/GUI/GNOME
URL: https://www.gnome.org URL: https://www.gnome.org
Source0: %{name}-%{version}.tar.zst Source0: %{name}-%{version}.tar.zst
Source1: gvdb-0.gitmodule.tar.zst
# 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 # 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 Patch1: mutter-disable-cvt-s390x.patch
@ -50,7 +51,7 @@ BuildRequires: fdupes
%ifnarch s390x %ifnarch s390x
BuildRequires: (libxcvt if xorg-x11-server > 21) BuildRequires: (libxcvt if xorg-x11-server > 21)
%endif %endif
BuildRequires: meson >= 0.53.0 BuildRequires: meson >= 1.3.0
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xorg-x11-server BuildRequires: xorg-x11-server
BuildRequires: xvfb-run BuildRequires: xvfb-run
@ -58,29 +59,29 @@ BuildRequires: pkgconfig(cairo) >= 1.10.0
BuildRequires: pkgconfig(colord) >= 1.4.5 BuildRequires: pkgconfig(colord) >= 1.4.5
BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(fribidi) >= 1.0.0 BuildRequires: pkgconfig(fribidi) >= 1.0.0
BuildRequires: pkgconfig(gbm) >= 17.3 BuildRequires: pkgconfig(gbm) >= 21.3
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.69.0 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.69.0
BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(glib-2.0) >= 2.69.0 BuildRequires: pkgconfig(glib-2.0) >= 2.81.1
BuildRequires: pkgconfig(gnome-desktop-4) BuildRequires: pkgconfig(gnome-desktop-4)
BuildRequires: pkgconfig(gnome-settings-daemon) BuildRequires: pkgconfig(gnome-settings-daemon)
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.5
BuildRequires: pkgconfig(graphene-gobject-1.0) BuildRequires: pkgconfig(graphene-gobject-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.37.2 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 47.beta
BuildRequires: pkgconfig(gtk4) BuildRequires: pkgconfig(gtk4)
BuildRequires: pkgconfig(gudev-1.0) >= 232 BuildRequires: pkgconfig(gudev-1.0) >= 232
BuildRequires: pkgconfig(lcms2) >= 2.6 BuildRequires: pkgconfig(lcms2) >= 2.6
BuildRequires: pkgconfig(libcanberra-gtk3) >= 0.26 BuildRequires: pkgconfig(libcanberra-gtk3) >= 0.26
BuildRequires: pkgconfig(libdisplay-info) BuildRequires: pkgconfig(libdisplay-info)
BuildRequires: pkgconfig(libdrm) >= 2.4.118 BuildRequires: pkgconfig(libdrm) >= 2.4.118
BuildRequires: pkgconfig(libeis-1.0) BuildRequires: pkgconfig(libeis-1.0) >= 1.0.901
BuildRequires: pkgconfig(libinput) >= 1.15.0 BuildRequires: pkgconfig(libinput) >= 1.26.0
BuildRequires: pkgconfig(libpipewire-0.3) >= 0.3.21 BuildRequires: pkgconfig(libpipewire-0.3) >= 1.2.0
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.7 BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.7
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libudev) >= 228
BuildRequires: pkgconfig(libwacom) >= 0.13 BuildRequires: pkgconfig(libwacom) >= 0.13
BuildRequires: pkgconfig(pango) >= 1.2.0 BuildRequires: pkgconfig(pango) >= 1.46.0
BuildRequires: pkgconfig(pixman-1) >= 0.42 BuildRequires: pkgconfig(pixman-1) >= 0.42
BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(sm)
%if %{with profiler} %if %{with profiler}
@ -90,8 +91,8 @@ BuildRequires: pkgconfig(sysprof-capture-4) >= 3.37.2
BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(upower-glib) >= 0.99.0 BuildRequires: pkgconfig(upower-glib) >= 0.99.0
BuildRequires: pkgconfig(wayland-eglstream) BuildRequires: pkgconfig(wayland-eglstream)
BuildRequires: pkgconfig(wayland-protocols) >= 1.33 BuildRequires: pkgconfig(wayland-protocols) >= 1.36
BuildRequires: pkgconfig(wayland-server) >= 1.22 BuildRequires: pkgconfig(wayland-server) >= 1.23
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xau) BuildRequires: pkgconfig(xau)
@ -142,6 +143,10 @@ applications that want to make use of the mutter library.
%prep %prep
%autosetup -N %autosetup -N
pushd subprojects
tar xf %{SOURCE1}
mv gvdb-0.gitmodule gvdb
popd
%if !0%{?sle_version} %if !0%{?sle_version}
%autopatch -p1 -M 999 %autopatch -p1 -M 999
%else %else
@ -162,7 +167,7 @@ applications that want to make use of the mutter library.
-Dwayland_eglstream=true \ -Dwayland_eglstream=true \
-Dcogl_tests=false \ -Dcogl_tests=false \
-Dclutter_tests=false \ -Dclutter_tests=false \
-Dtests=false \ -Dtests=disabled \
-Dinstalled_tests=false \ -Dinstalled_tests=false \
-Dxwayland_initfd=auto \ -Dxwayland_initfd=auto \
-Dlibdisplay_info=true \ -Dlibdisplay_info=true \
@ -198,7 +203,6 @@ applications that want to make use of the mutter library.
%{_libdir}/mutter-%{api_major}/plugins/libdefault.so %{_libdir}/mutter-%{api_major}/plugins/libdefault.so
# These typelibs are not split out since they are private to mutter # These typelibs are not split out since they are private to mutter
%{_libdir}/mutter-%{api_major}/Cally-%{api_major}.typelib
%{_libdir}/mutter-%{api_major}/Clutter-%{api_major}.typelib %{_libdir}/mutter-%{api_major}/Clutter-%{api_major}.typelib
%{_libdir}/mutter-%{api_major}/Cogl-%{api_major}.typelib %{_libdir}/mutter-%{api_major}/Cogl-%{api_major}.typelib
%{_libdir}/mutter-%{api_major}/CoglPango-%{api_major}.typelib %{_libdir}/mutter-%{api_major}/CoglPango-%{api_major}.typelib
@ -224,7 +228,6 @@ applications that want to make use of the mutter library.
%files devel %files devel
%{_includedir}/mutter-%{api_major}/ %{_includedir}/mutter-%{api_major}/
%{_libdir}/mutter-%{api_major}/Meta-%{api_major}.gir %{_libdir}/mutter-%{api_major}/Meta-%{api_major}.gir
%{_libdir}/mutter-%{api_major}/Cally-%{api_major}.gir
%{_libdir}/mutter-%{api_major}/Clutter-%{api_major}.gir %{_libdir}/mutter-%{api_major}/Clutter-%{api_major}.gir
%{_libdir}/mutter-%{api_major}/Cogl-%{api_major}.gir %{_libdir}/mutter-%{api_major}/Cogl-%{api_major}.gir
%{_libdir}/mutter-%{api_major}/CoglPango-%{api_major}.gir %{_libdir}/mutter-%{api_major}/CoglPango-%{api_major}.gir