packages/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 46.3

Browse Source
This commit is contained in:
Florian Müllner
2024-06-29 23:59:09 +02:00
parent 644ecca570
commit 8257e45aa4
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -221,3 +221,4 @@ mutter-2.31.5.tar.bz2
/mutter-46.0.tar.xz /mutter-46.0.tar.xz
/mutter-46.1.tar.xz /mutter-46.1.tar.xz
/mutter-46.2.tar.xz /mutter-46.2.tar.xz
/mutter-46.3.tar.xz

28
0001-Revert-x11-Use-input-region-from-frame-window-for-de.patch
View File

@@ -1,4 +1,4 @@
From e2689988a40966f1ac17d2e7faf900ce4e85ee6e Mon Sep 17 00:00:00 2001 From caca4ecbc4657998b4f9f3192afbd234f336402c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sun, 26 May 2024 00:43:37 +0200 Date: Sun, 26 May 2024 00:43:37 +0200
Subject: [PATCH 1/3] Revert "x11/window: Compare input shape to client rect Subject: [PATCH 1/3] Revert "x11/window: Compare input shape to client rect
@@ -62,10 +62,10 @@ index df5f955877..925c7549b7 100644
* outside of the frame. The X SHAPE Extension requires that * outside of the frame. The X SHAPE Extension requires that
* the overall shape the client provides never exceeds the * the overall shape the client provides never exceeds the
-- --
2.45.1 2.45.2
From dd0580024d559570a272413f3a4d14a22402667a Mon Sep 17 00:00:00 2001 From 2b7161220cb95a1d531ef0cf8a8af911039cf194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sun, 21 Apr 2024 16:54:52 +0200 Date: Sun, 21 Apr 2024 16:54:52 +0200
Subject: [PATCH 2/3] Revert "x11/window: Update comment and variable name to Subject: [PATCH 2/3] Revert "x11/window: Update comment and variable name to
@@ -110,10 +110,10 @@ index 925c7549b7..7f2c0a3fd2 100644
meta_window_set_input_region (window, region); meta_window_set_input_region (window, region);
-- --
2.45.1 2.45.2
From 562087309a2c8f08e9d5436cf652ba4fd7400a82 Mon Sep 17 00:00:00 2001 From 256a879b7e230e8e9826be6e0df69feb31cbdd52 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com> From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 5 Oct 2023 13:09:46 -0700 Date: Thu, 5 Oct 2023 13:09:46 -0700
Subject: [PATCH 3/3] Revert "x11: Use input region from frame window for Subject: [PATCH 3/3] Revert "x11: Use input region from frame window for
@@ -130,28 +130,28 @@ Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3068
2 files changed, 10 insertions(+), 26 deletions(-) 2 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/src/core/frame.c b/src/core/frame.c diff --git a/src/core/frame.c b/src/core/frame.c
index c74a2e04ec..5feb854805 100644 index 7a09f89f14..df489e441c 100644
--- a/src/core/frame.c --- a/src/core/frame.c
+++ b/src/core/frame.c +++ b/src/core/frame.c
@@ -35,7 +35,6 @@ @@ -36,7 +36,6 @@
#include "x11/window-props.h"
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xlib.h>
-#include <X11/extensions/shape.h> -#include <X11/extensions/shape.h>
#define EVENT_MASK (SubstructureRedirectMask | \ #define EVENT_MASK (SubstructureRedirectMask | \
StructureNotifyMask | SubstructureNotifyMask | \ StructureNotifyMask | SubstructureNotifyMask | \
@@ -109,9 +108,6 @@ meta_window_x11_set_frame_xwindow (MetaWindow *window, @@ -118,9 +117,6 @@ meta_window_x11_set_frame_xwindow (MetaWindow *window,
XChangeWindowAttributes (x11_display->xdisplay, XChangeWindowAttributes (x11_display->xdisplay,
frame->xwindow, CWEventMask, &attrs); frame->xwindow, CWEventMask, &attrs);
- if (META_X11_DISPLAY_HAS_SHAPE (x11_display)) - if (META_X11_DISPLAY_HAS_SHAPE (x11_display))
- XShapeSelectInput (x11_display->xdisplay, frame->xwindow, ShapeNotifyMask); - XShapeSelectInput (x11_display->xdisplay, frame->xwindow, ShapeNotifyMask);
- -
meta_x11_display_register_x_window (x11_display, &frame->xwindow, window); if (mtk_x11_error_trap_pop_with_return (x11_display->xdisplay))
{
if (window->mapped) meta_topic (META_DEBUG_WINDOW_STATE,
@@ -220,9 +216,6 @@ meta_window_destroy_frame (MetaWindow *window) @@ -254,9 +250,6 @@ meta_window_destroy_frame (MetaWindow *window)
window->reparents_pending += 1; window->reparents_pending += 1;
} }
@@ -226,5 +226,5 @@ index 7f2c0a3fd2..ace1f8f5bc 100644
/* The shape we get back from the client may have coordinates /* The shape we get back from the client may have coordinates
* outside of the frame. The X SHAPE Extension requires that * outside of the frame. The X SHAPE Extension requires that
-- --
2.45.1 2.45.2

2
mutter.spec
View File

@@ -13,7 +13,7 @@
%global tarball_version %%(echo %{version} | tr '~' '.') %global tarball_version %%(echo %{version} | tr '~' '.')
Name: mutter Name: mutter
Version: 46.2 Version: 46.3
Release: %autorelease Release: %autorelease
Summary: Window and compositing manager based on Clutter Summary: Window and compositing manager based on Clutter

2
sources
View File

@@ -1 +1 @@
SHA512 (mutter-46.2.tar.xz) = 7d8fd3ed38266e993691ee47d9a4e314e439e3269d6b0ed73fb192efa3c29d64edc2c45c178fa99c6807c8f31aca1a3524ccf3986b3a36c5e7cc66ad89b94e53 SHA512 (mutter-46.3.tar.xz) = 82e2e8455556e1a6e9dfd8b7d36f8d500fac69094907012754ee8d653f448397fe4a277e5a9b327051a319697205b56d0f7a9ea789d210e58ec685b589d2f150