Sync to gnome-46

* Remove mr3729 as it has been merged in gnome-46. Signed-off-by: Mingi Sung <sungmg@saltyming.net>
author: Mingi Sung 2024-06-30 12:33:56 +0900
committer: Mingi Sung 2024-06-30 12:36:11 +0900
commit: 13116378d87dda89347d3ceefd53cf17c4b322c6 (patch)
tree: cf3c29a1e67b4cfdc7eca79dfe785777b222a455
parent: faa1d8d9507f18ab1e4111cee19da9f5495c1605 (diff)
download: aur-13116378d87dda89347d3ceefd53cf17c4b322c6.tar.gz
4 files changed, 41 insertions, 162 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cb75750fdfb9..8d130d8b86ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mutter-performance
 	pkgdesc = A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync
-	pkgver = 46.2+r17+gec5444f541
+	pkgver = 46.3
 	pkgrel = 1
 	epoch = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
@@ -73,21 +73,18 @@ pkgbase = mutter-performance
 	depends = systemd-libs
 	depends = wayland
 	depends = xorg-xwayland
-	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=ec5444f541a5126de253e0462b68e8805ed09033
+	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=3998f8a422e89c6a64a79e2ce23f9389c0feb7f9
 	source = mr1441.patch
 	source = mr3373.patch
 	source = mr3751.patch
-	source = mr3729.patch
-	sha256sums = e2985058fea0cf20a4e3ceea3c0ef4a53487f093fe70e6ed1fa06c48e267d5d8
+	sha256sums = c6497a3045eed064eac55f0780b6a91f919b92450d083d81eaee3c65b13cdb9f
 	sha256sums = 649dac49f7655f4bd21deb244bb47f2b5a211caa29364d1155454eb155076dbb
 	sha256sums = 3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f
-	sha256sums = 7eec91f857cf1d8183c32199f33cc86a1a8a95017282e602738a90fe219c8b33
-	sha256sums = 9d2ca68355dd4f07bae433ce91fda09fdb8d7fccf1462340e8295cee3cacb932
-	b2sums = 6b402c0ab86ed5432de52bb1dd381da775977633fb13c113834bb1c041bb68b6a4847e8b734f4c59d3a12f4f722669f198e7ec7c3639bf8fbd99f57e53b79b1c
+	sha256sums = 9d925b810629074285388b5a1a9a88514a6cb45463a98ada6f66c2cba2ad9d2f
+	b2sums = b228db453c22a94783ceed71eb9489117e0576293f6daa37b7f20b6992b80ee4e67ebeee3b1cf474d306d2341e8d0e26b16820cec9d6c53132ddc7ffd4157634
 	b2sums = 8f5f7c4caae32f46d35f2cd73a0d00ddfde38c0b53e13d60c8a977362b8bfd6fc41f3af1a88353b6f2778d7d6d01881f14198b40532bcda53caf43aba7287804
 	b2sums = 71f10db4ebe04a787940c7048131eac67cffd3ec8e415cfc961b8041b881f272650581e9df273e2a8da23a50ec9151c790dc2d5ecc0309ab2847a22f8c922c9c
-	b2sums = a79155ce4f11d8ccc674b08baccb18ac3bf254a0e41d9830a0ca964027633317bbd157f33b1f12f21bb378bfeedd4ebd111d993cdfd39b98ff3ce0f34850f6b1
-	b2sums = 4a950db6a8225cc364082ea65f545a86ce6eee21b622656397d9fa515eabc471137e4bfd754510927f59963ccbdad84cdcdb5875d8a371042111263bf8ccc935
+	b2sums = f720718049c1f9d0f338c203a5ae4520b5e7079b57e692ec95d8183705d7b7627ccd7d3d350d0010d0b225226641afccd699b65a81bd044fd32c441d413a0779
 
 pkgname = mutter-performance
 	groups = gnome
diff --git a/PKGBUILD b/PKGBUILD
index b869a5672b91..dc5db4829db8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
 
 ### PACKAGE OPTIONS
 ## MERGE REQUESTS SELECTION
-# Merge Requests List: ('579' '1441' '3373' '3751' '3729')
-_merge_requests_to_use=('1441' '3751' '3729')
+# Merge Requests List: ('579' '1441' '3373' '3751')
+_merge_requests_to_use=('1441' '3751')
 
 ## Disable building the DOCS package (Enabled if not set)
 # Remember to unset this variable when producing .SRCINFO
@@ -32,7 +32,7 @@ else
   pkgname=(mutter-performance mutter-performance-docs)
 fi
 epoch=1
-pkgver=46.2+r17+gec5444f541
+pkgver=46.3
 pkgrel=1
 pkgdesc="A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync"
 url="https://gitlab.gnome.org/GNOME/mutter"
@@ -112,22 +112,19 @@ makedepends=(
 if [ -n "$_enable_check" ]; then
   checkdepends=(gnome-session xorg-server-xvfb pipewire-session-manager python-dbusmock zenity)
 fi
-_commit=ec5444f541a5126de253e0462b68e8805ed09033  # tags/46.2^17
+_commit=3998f8a422e89c6a64a79e2ce23f9389c0feb7f9  # tags/46.3^0
 source=("git+$url.git#commit=$_commit"
         'mr1441.patch'
         'mr3373.patch'
-        'mr3751.patch'
-	'mr3729.patch')
-sha256sums=('e2985058fea0cf20a4e3ceea3c0ef4a53487f093fe70e6ed1fa06c48e267d5d8'
+        'mr3751.patch')
+sha256sums=('c6497a3045eed064eac55f0780b6a91f919b92450d083d81eaee3c65b13cdb9f'
             '649dac49f7655f4bd21deb244bb47f2b5a211caa29364d1155454eb155076dbb'
             '3e1f07b696ad37b1c639a524c092cd9259444bc6156542901ccaec936bea240f'
-            '7eec91f857cf1d8183c32199f33cc86a1a8a95017282e602738a90fe219c8b33'
-            '9d2ca68355dd4f07bae433ce91fda09fdb8d7fccf1462340e8295cee3cacb932')
-b2sums=('6b402c0ab86ed5432de52bb1dd381da775977633fb13c113834bb1c041bb68b6a4847e8b734f4c59d3a12f4f722669f198e7ec7c3639bf8fbd99f57e53b79b1c'
+            '9d925b810629074285388b5a1a9a88514a6cb45463a98ada6f66c2cba2ad9d2f')
+b2sums=('b228db453c22a94783ceed71eb9489117e0576293f6daa37b7f20b6992b80ee4e67ebeee3b1cf474d306d2341e8d0e26b16820cec9d6c53132ddc7ffd4157634'
         '8f5f7c4caae32f46d35f2cd73a0d00ddfde38c0b53e13d60c8a977362b8bfd6fc41f3af1a88353b6f2778d7d6d01881f14198b40532bcda53caf43aba7287804'
         '71f10db4ebe04a787940c7048131eac67cffd3ec8e415cfc961b8041b881f272650581e9df273e2a8da23a50ec9151c790dc2d5ecc0309ab2847a22f8c922c9c'
-        'a79155ce4f11d8ccc674b08baccb18ac3bf254a0e41d9830a0ca964027633317bbd157f33b1f12f21bb378bfeedd4ebd111d993cdfd39b98ff3ce0f34850f6b1'
-        '4a950db6a8225cc364082ea65f545a86ce6eee21b622656397d9fa515eabc471137e4bfd754510927f59963ccbdad84cdcdb5875d8a371042111263bf8ccc935')
+        'f720718049c1f9d0f338c203a5ae4520b5e7079b57e692ec95d8183705d7b7627ccd7d3d350d0010d0b225226641afccd699b65a81bd044fd32c441d413a0779')
 
 pkgver() {
   cd $_pkgname
diff --git a/mr3729.patch b/mr3729.patch
deleted file mode 100644
index 9b110267e098..000000000000
--- a/mr3729.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c
-index 819672c4a..d20ed5523 100644
---- a/src/compositor/meta-surface-actor-wayland.c
-+++ b/src/compositor/meta-surface-actor-wayland.c
-@@ -260,6 +260,18 @@ out:
-   parent_class->apply_transform (actor, matrix);
- }
- 
-+static void
-+on_surface_disposed (gpointer user_data,
-+                     GObject *destroyed_object)
-+{
-+  MetaSurfaceActorWayland *self = user_data;
-+
-+  g_assert (destroyed_object == (GObject *) self->surface);
-+
-+  clutter_actor_set_reactive (CLUTTER_ACTOR (self), FALSE);
-+  self->surface = NULL;
-+}
-+
- static void
- meta_surface_actor_wayland_dispose (GObject *object)
- {
-@@ -272,8 +284,9 @@ meta_surface_actor_wayland_dispose (GObject *object)
- 
-   if (self->surface)
-     {
--      g_object_remove_weak_pointer (G_OBJECT (self->surface),
--                                    (gpointer *) &self->surface);
-+      g_object_weak_unref (G_OBJECT (self->surface),
-+                           on_surface_disposed,
-+                           self);
-       self->surface = NULL;
-     }
- 
-@@ -308,8 +321,9 @@ meta_surface_actor_wayland_new (MetaWaylandSurface *surface)
-   g_assert (meta_is_wayland_compositor ());
- 
-   self->surface = surface;
--  g_object_add_weak_pointer (G_OBJECT (self->surface),
--                             (gpointer *) &self->surface);
-+  g_object_weak_ref (G_OBJECT (self->surface),
-+                     on_surface_disposed,
-+                     self);
- 
-   return META_SURFACE_ACTOR (self);
- }
-diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
-index 88b27f84d..cf6008064 100644
---- a/src/wayland/meta-wayland-pointer.c
-+++ b/src/wayland/meta-wayland-pointer.c
-@@ -600,10 +600,13 @@ repick_for_event (MetaWaylandPointer *pointer,
-     {
-       MetaSurfaceActorWayland *actor_wayland =
-         META_SURFACE_ACTOR_WAYLAND (actor);
-+      MetaWindow *window = NULL;
- 
-       surface = meta_surface_actor_wayland_get_surface (actor_wayland);
-+      if (surface)
-+        window = meta_wayland_surface_get_window (surface);
- 
--      if (surface && meta_window_has_modals (meta_wayland_surface_get_window (surface)))
-+      if (window && meta_window_has_modals (window))
-         surface = NULL;
-     }
-   else
-diff --git a/src/wayland/meta-wayland-subsurface.c b/src/wayland/meta-wayland-subsurface.c
-index 8d40eb088..ba8946df7 100644
---- a/src/wayland/meta-wayland-subsurface.c
-+++ b/src/wayland/meta-wayland-subsurface.c
-@@ -412,6 +412,7 @@ permanently_unmap_subsurface (MetaWaylandSurface *surface)
- {
-   MetaWaylandSubsurfacePlacementOp *op;
-   MetaWaylandTransaction *transaction;
-+  MetaSurfaceActor *surface_actor;
- 
-   op = get_subsurface_placement_op (surface, NULL,
-                                     META_WAYLAND_SUBSURFACE_PLACEMENT_BELOW);
-@@ -422,6 +423,8 @@ permanently_unmap_subsurface (MetaWaylandSurface *surface)
-   meta_wayland_transaction_add_subsurface_position (transaction, surface, 0, 0);
-   meta_wayland_transaction_commit (transaction);
- 
-+  surface_actor = meta_wayland_surface_get_actor (surface);
-+  clutter_actor_set_reactive (CLUTTER_ACTOR (surface_actor), FALSE);
-   surface->committed_state.parent = NULL;
- }
- 
diff --git a/mr3751.patch b/mr3751.patch
index 5b4706a90ffa..65c09db32451 100644
--- a/mr3751.patch
+++ b/mr3751.patch
@@ -1,36 +1,7 @@
-From e12da9d8a8f747a7eeebfc9e399cd6f664d6abf3 Mon Sep 17 00:00:00 2001
-From: Alynx Zhou <alynx.zhou@gmail.com>
-Date: Wed, 15 May 2024 00:05:55 +0800
-Subject: [PATCH 1/2] wayland/text-input: Remove unused repeated code
-
-Maybe they are generated by copy during refactor.
----
- src/wayland/meta-wayland-text-input.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/wayland/meta-wayland-text-input.c b/src/wayland/meta-wayland-text-input.c
-index 04ee51dbaa5..6ae226131c4 100644
---- a/src/wayland/meta-wayland-text-input.c
-+++ b/src/wayland/meta-wayland-text-input.c
-@@ -302,9 +302,6 @@ meta_wayland_text_input_focus_set_preedit_text (ClutterInputFocus *focus,
- 
-   text_input = META_WAYLAND_TEXT_INPUT_FOCUS (focus)->text_input;
- 
--  if (text)
--    pos = g_utf8_offset_to_pointer (text, cursor) - text;
--
-   g_clear_pointer (&text_input->preedit.string, g_free);
-   text_input->preedit.string = g_strdup (text);
- 
--- 
-GitLab
-
-
-From 6b9bbebbdc3a8b35f898a269227f36a36590359e Mon Sep 17 00:00:00 2001
+From 033b1b83a8484247519bc98eee70add380d1e3fc Mon Sep 17 00:00:00 2001
 From: Alynx Zhou <alynx.zhou@gmail.com>
 Date: Wed, 15 May 2024 00:07:41 +0800
-Subject: [PATCH 2/2] wayland/text-input-v1: Implement basic text-input-v1
- support
+Subject: [PATCH] wayland/text-input-v1: Implement basic text-input-v1 support
 
 This commit makes input methods work in text-input-v1 only clients
 (mostly Chromium/Electron based apps with Ozone Wayland), which is
@@ -38,6 +9,8 @@ needed by users who needs IME to input their languages, like Chinese,
 Japanese or Korean.
 
 Closes <https://gitlab.gnome.org/GNOME/mutter/-/issues/3200>.
+
+Signed-off-by: Mingi Sung <sungmg@saltyming.net>
 ---
  clutter/clutter/clutter-enums.h          |   3 +
  src/core/events.c                        |  11 +-
@@ -54,7 +27,7 @@ Closes <https://gitlab.gnome.org/GNOME/mutter/-/issues/3200>.
  create mode 100644 src/wayland/meta-wayland-text-input-v1.h
 
 diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h
-index 45956bf57b2..8198e73516f 100644
+index 45956bf57..8198e7351 100644
 --- a/clutter/clutter/clutter-enums.h
 +++ b/clutter/clutter/clutter-enums.h
 @@ -1183,6 +1183,9 @@ typedef enum
@@ -68,7 +41,7 @@ index 45956bf57b2..8198e73516f 100644
  
  typedef enum
 diff --git a/src/core/events.c b/src/core/events.c
-index 4261bfb98a8..35b94e18768 100644
+index 1f36d2feb..a1874d673 100644
 --- a/src/core/events.c
 +++ b/src/core/events.c
 @@ -238,6 +238,7 @@ meta_display_handle_event (MetaDisplay        *display,
@@ -88,15 +61,14 @@ index 4261bfb98a8..35b94e18768 100644
      }
  #endif
  
-@@ -287,10 +290,12 @@ meta_display_handle_event (MetaDisplay        *display,
+@@ -287,9 +290,11 @@ meta_display_handle_event (MetaDisplay        *display,
      }
  
  #ifdef HAVE_WAYLAND
 -  if (wayland_text_input &&
--      !has_grab &&
-+  if (!has_grab &&
-       !meta_compositor_get_current_window_drag (compositor) &&
+-      !meta_compositor_get_current_window_drag (compositor) &&
 -      meta_wayland_text_input_update (wayland_text_input, event))
++  if (!meta_compositor_get_current_window_drag (compositor) &&
 +      ((wayland_text_input &&
 +        meta_wayland_text_input_update (wayland_text_input, event)) ||
 +       (wayland_text_input_v1 &&
@@ -105,10 +77,10 @@ index 4261bfb98a8..35b94e18768 100644
  
    if (wayland_compositor)
 diff --git a/src/meson.build b/src/meson.build
-index 3060b28802b..12a249c540e 100644
+index 05df3bfd2..fad08706a 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -687,6 +687,8 @@ if have_wayland
+@@ -688,6 +688,8 @@ if have_wayland
      'wayland/meta-wayland-tablet-tool.h',
      'wayland/meta-wayland-text-input.c',
      'wayland/meta-wayland-text-input.h',
@@ -117,7 +89,7 @@ index 3060b28802b..12a249c540e 100644
      'wayland/meta-wayland-touch.c',
      'wayland/meta-wayland-touch.h',
      'wayland/meta-wayland-transaction.c',
-@@ -1075,6 +1077,7 @@ if have_wayland
+@@ -1076,6 +1078,7 @@ if have_wayland
      ['single-pixel-buffer', 'staging', 'v1', ],
      ['tablet', 'unstable', 'v2', ],
      ['text-input', 'unstable', 'v3', ],
@@ -126,18 +98,18 @@ index 3060b28802b..12a249c540e 100644
      ['xdg-activation', 'staging', 'v1', ],
      ['xdg-foreign', 'unstable', 'v1', ],
 diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
-index f8d58a61252..fca0b346db7 100644
+index 2301e0068..d0f888084 100644
 --- a/src/wayland/meta-wayland-seat.c
 +++ b/src/wayland/meta-wayland-seat.c
-@@ -228,6 +228,7 @@ default_focus (MetaWaylandEventHandler *handler,
-       meta_wayland_data_device_primary_sync_focus (&seat->primary_data_device);
+@@ -229,6 +229,7 @@ default_focus (MetaWaylandEventHandler *handler,
+                                                   surface);
        meta_wayland_tablet_seat_set_pad_focus (seat->tablet_seat, surface);
        meta_wayland_text_input_set_focus (seat->text_input, surface);
 +      /* text-input-v1 will set focused surface on activate. */
      }
  
    if (caps & CLUTTER_INPUT_CAPABILITY_TABLET_TOOL)
-@@ -289,6 +290,8 @@ meta_wayland_seat_new (MetaWaylandCompositor *compositor,
+@@ -290,6 +291,8 @@ meta_wayland_seat_new (MetaWaylandCompositor *compositor,
                                NULL);
  
    seat->text_input = meta_wayland_text_input_new (seat);
@@ -146,7 +118,7 @@ index f8d58a61252..fca0b346db7 100644
  
    meta_wayland_data_device_init (&seat->data_device, seat);
    meta_wayland_data_device_primary_init (&seat->primary_data_device, seat);
-@@ -337,6 +340,7 @@ meta_wayland_seat_free (MetaWaylandSeat *seat)
+@@ -338,6 +341,7 @@ meta_wayland_seat_free (MetaWaylandSeat *seat)
    g_object_unref (seat->touch);
  
    meta_wayland_text_input_destroy (seat->text_input);
@@ -154,7 +126,7 @@ index f8d58a61252..fca0b346db7 100644
  
    g_free (seat);
  }
-@@ -477,7 +481,10 @@ meta_wayland_seat_handle_event_internal (MetaWaylandSeat    *seat,
+@@ -478,7 +482,10 @@ meta_wayland_seat_handle_event_internal (MetaWaylandSeat    *seat,
    if (event_type == CLUTTER_BUTTON_PRESS ||
        event_type == CLUTTER_TOUCH_BEGIN)
      {
@@ -166,7 +138,7 @@ index f8d58a61252..fca0b346db7 100644
      }
  
    switch (event_type)
-@@ -509,7 +516,8 @@ meta_wayland_seat_handle_event_internal (MetaWaylandSeat    *seat,
+@@ -510,7 +517,8 @@ meta_wayland_seat_handle_event_internal (MetaWaylandSeat    *seat,
      case CLUTTER_IM_COMMIT:
      case CLUTTER_IM_DELETE:
      case CLUTTER_IM_PREEDIT:
@@ -177,7 +149,7 @@ index f8d58a61252..fca0b346db7 100644
  
        break;
 diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
-index 169a92e4e17..10633b02947 100644
+index 83fd7de1e..37704cf5a 100644
 --- a/src/wayland/meta-wayland-seat.h
 +++ b/src/wayland/meta-wayland-seat.h
 @@ -30,6 +30,7 @@
@@ -198,7 +170,7 @@ index 169a92e4e17..10633b02947 100644
    MetaWaylandEventHandler *default_handler;
 diff --git a/src/wayland/meta-wayland-text-input-v1.c b/src/wayland/meta-wayland-text-input-v1.c
 new file mode 100644
-index 00000000000..1826a4ff43e
+index 000000000..1826a4ff4
 --- /dev/null
 +++ b/src/wayland/meta-wayland-text-input-v1.c
 @@ -0,0 +1,859 @@
@@ -1063,7 +1035,7 @@ index 00000000000..1826a4ff43e
 +}
 diff --git a/src/wayland/meta-wayland-text-input-v1.h b/src/wayland/meta-wayland-text-input-v1.h
 new file mode 100644
-index 00000000000..79b1c0a5413
+index 000000000..79b1c0a54
 --- /dev/null
 +++ b/src/wayland/meta-wayland-text-input-v1.h
 @@ -0,0 +1,38 @@
@@ -1106,7 +1078,7 @@ index 00000000000..79b1c0a5413
 +gboolean meta_wayland_text_input_v1_handle_event (MetaWaylandTextInputV1 *text_input,
 +                                                  const ClutterEvent     *event);
 diff --git a/src/wayland/meta-wayland-versions.h b/src/wayland/meta-wayland-versions.h
-index 900f30d7888..a77b81461b7 100644
+index 900f30d78..a77b81461 100644
 --- a/src/wayland/meta-wayland-versions.h
 +++ b/src/wayland/meta-wayland-versions.h
 @@ -49,6 +49,7 @@
@@ -1118,7 +1090,7 @@ index 900f30d7888..a77b81461b7 100644
  #define META_ZWP_PRIMARY_SELECTION_V1_VERSION 1
  #define META_WP_PRESENTATION_VERSION        1
 diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
-index 501b69a91c0..0114823c145 100644
+index 501b69a91..0114823c1 100644
 --- a/src/wayland/meta-wayland.c
 +++ b/src/wayland/meta-wayland.c
 @@ -865,6 +865,7 @@ meta_wayland_compositor_new (MetaContext *context)
@@ -1143,7 +1115,7 @@ index 501b69a91c0..0114823c145 100644
  meta_wayland_compositor_update_focus (MetaWaylandCompositor *compositor,
                                        MetaWindow            *window)
 diff --git a/src/wayland/meta-wayland.h b/src/wayland/meta-wayland.h
-index 0a0476eba0b..c23e82cdcae 100644
+index 0a0476eba..c23e82cdc 100644
 --- a/src/wayland/meta-wayland.h
 +++ b/src/wayland/meta-wayland.h
 @@ -26,6 +26,7 @@
@@ -1163,5 +1135,5 @@ index 0a0476eba0b..c23e82cdcae 100644
  #ifdef HAVE_XWAYLAND
  void                    meta_wayland_compositor_notify_surface_id (MetaWaylandCompositor *compositor,
 -- 
-GitLab
+2.45.2
author	Mingi Sung	2024-06-30 12:33:56 +0900
committer	Mingi Sung	2024-06-30 12:36:11 +0900
commit	13116378d87dda89347d3ceefd53cf17c4b322c6 (patch)
tree	cf3c29a1e67b4cfdc7eca79dfe785777b222a455
parent	faa1d8d9507f18ab1e4111cee19da9f5495c1605 (diff)
download	aur-13116378d87dda89347d3ceefd53cf17c4b322c6.tar.gz