From b1c938d074ab59c6968e01e929500c4eef5627b7 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 10 Jun 2025 15:20:46 +0300 Subject: [PATCH] gnome-* ver. bump --- desktop/gnome/apps/gnome-maps/pspec.xml | 9 +++- ...8a8f97df39055bc5e8d631847f5499a821a0.patch | 50 +++++++++++++++++++ ...e6ae05ddf099d62e956c32b07ade7321b9b5.patch | 32 ++++++++++++ ...e3a50427bd0ffdd86d0a565371d992027438.patch | 48 ++++++++++++++++++ desktop/gnome/base/mutter/pspec.xml | 8 ++- .../lookandfeel/icon-theme-adwaita/pspec.xml | 11 +++- desktop/toolkit/gtk/pango/pspec.xml | 9 +++- 7 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 desktop/gnome/base/mutter/files/02068a8f97df39055bc5e8d631847f5499a821a0.patch create mode 100644 desktop/gnome/base/mutter/files/5a78e6ae05ddf099d62e956c32b07ade7321b9b5.patch create mode 100644 desktop/gnome/base/mutter/files/a38fe3a50427bd0ffdd86d0a565371d992027438.patch diff --git a/desktop/gnome/apps/gnome-maps/pspec.xml b/desktop/gnome/apps/gnome-maps/pspec.xml index c5df003ce4..e838692670 100644 --- a/desktop/gnome/apps/gnome-maps/pspec.xml +++ b/desktop/gnome/apps/gnome-maps/pspec.xml @@ -13,7 +13,7 @@ app:gui GNOME Maps application Maps is a map application for GNOME. - https://download.gnome.org/sources/gnome-maps/48/gnome-maps-48.3.tar.xz + https://download.gnome.org/sources/gnome-maps/48/gnome-maps-48.4.tar.xz libchamplain-devel meson @@ -68,6 +68,13 @@ + + 2025-06-10 + 48.4 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-05-26 48.3 diff --git a/desktop/gnome/base/mutter/files/02068a8f97df39055bc5e8d631847f5499a821a0.patch b/desktop/gnome/base/mutter/files/02068a8f97df39055bc5e8d631847f5499a821a0.patch new file mode 100644 index 0000000000..26575bebea --- /dev/null +++ b/desktop/gnome/base/mutter/files/02068a8f97df39055bc5e8d631847f5499a821a0.patch @@ -0,0 +1,50 @@ +From 02068a8f97df39055bc5e8d631847f5499a821a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Bernon?= +Date: Tue, 18 Feb 2025 15:42:58 +0100 +Subject: [PATCH] frames/window-tracker: Handle override-redirect attribute + change. + +If a client creates windows with override-redirect attribute, but later +changes it to allow its windows to be managed, the window tracker will +still not be tracking _MUTTER_NEEDS_FRAME property changes and any +decoration change will be broken. + +This reproduces with Wine, if a window is first created as a popup, to +later change to a framed window. Wine always creates its windows with +override-redirect, and only later decides to let them be managed. + +Part-of: +(cherry picked from commit 4d194b8e1da555c14e1dc092879e9580f25b6986) +--- + src/frames/meta-window-tracker.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/frames/meta-window-tracker.c b/src/frames/meta-window-tracker.c +index 490e52c7cf..cfd62b6a58 100644 +--- a/src/frames/meta-window-tracker.c ++++ b/src/frames/meta-window-tracker.c +@@ -263,6 +263,21 @@ on_xevent (GdkDisplay *display, + xwindow = xevent->xcreatewindow.window; + listen_set_up_frame (window_tracker, xwindow); + } ++ else if (xevent->type == ConfigureNotify && ++ xevent->xconfigure.event == xroot) ++ { ++ gboolean has_frame; ++ ++ xwindow = xevent->xconfigure.window; ++ has_frame = ++ g_hash_table_contains (window_tracker->frames, ++ GUINT_TO_POINTER (xwindow)); ++ ++ if (!xevent->xconfigure.override_redirect && !has_frame) ++ listen_set_up_frame (window_tracker, xwindow); ++ else if (xevent->xconfigure.override_redirect && has_frame) ++ remove_frame (window_tracker, xwindow); ++ } + else if (xevent->type == DestroyNotify) + { + xwindow = xevent->xdestroywindow.window; +-- +GitLab + diff --git a/desktop/gnome/base/mutter/files/5a78e6ae05ddf099d62e956c32b07ade7321b9b5.patch b/desktop/gnome/base/mutter/files/5a78e6ae05ddf099d62e956c32b07ade7321b9b5.patch new file mode 100644 index 0000000000..07ccd253c3 --- /dev/null +++ b/desktop/gnome/base/mutter/files/5a78e6ae05ddf099d62e956c32b07ade7321b9b5.patch @@ -0,0 +1,32 @@ +From 5a78e6ae05ddf099d62e956c32b07ade7321b9b5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Bernon?= +Date: Thu, 29 May 2025 10:44:32 +0200 +Subject: [PATCH] frames/window-tracker: Remove unnecessary frame existence + check + +It's already checked inside remove_frame. + +Part-of: +(cherry picked from commit dbd29639cb4a3192b5c0a895a2203d1f9498c4df) +--- + src/frames/meta-window-tracker.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/frames/meta-window-tracker.c b/src/frames/meta-window-tracker.c +index cfd62b6a58..247248d108 100644 +--- a/src/frames/meta-window-tracker.c ++++ b/src/frames/meta-window-tracker.c +@@ -291,9 +291,7 @@ on_xevent (GdkDisplay *display, + !g_hash_table_contains (window_tracker->client_windows, + GUINT_TO_POINTER (xwindow))) + set_up_frame (window_tracker, xwindow); +- else if (xevent->xproperty.state == PropertyDelete && +- g_hash_table_contains (window_tracker->client_windows, +- GUINT_TO_POINTER (xwindow))) ++ else if (xevent->xproperty.state == PropertyDelete) + remove_frame (window_tracker, xwindow); + } + else if (xevent->type == PropertyNotify) +-- +GitLab + diff --git a/desktop/gnome/base/mutter/files/a38fe3a50427bd0ffdd86d0a565371d992027438.patch b/desktop/gnome/base/mutter/files/a38fe3a50427bd0ffdd86d0a565371d992027438.patch new file mode 100644 index 0000000000..7c3844ede4 --- /dev/null +++ b/desktop/gnome/base/mutter/files/a38fe3a50427bd0ffdd86d0a565371d992027438.patch @@ -0,0 +1,48 @@ +From a38fe3a50427bd0ffdd86d0a565371d992027438 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Bernon?= +Date: Thu, 29 May 2025 10:44:33 +0200 +Subject: [PATCH] frames/window-tracker: Move frame existence check inside of + set_up_frame + +Avoiding creating frames multiple times when listen_set_up_frame is +called from a ConfigureNotify event after the frame has already been +created. + +Fixes: 4d194b8e1 ("frames/window-tracker: Handle override-redirect attribute change.") +Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/4138 +Part-of: +(cherry picked from commit a1d6e5771bbd704c65c8079310102637a5aab071) +--- + src/frames/meta-window-tracker.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/frames/meta-window-tracker.c b/src/frames/meta-window-tracker.c +index 247248d108..18801f5c3f 100644 +--- a/src/frames/meta-window-tracker.c ++++ b/src/frames/meta-window-tracker.c +@@ -125,6 +125,11 @@ set_up_frame (MetaWindowTracker *window_tracker, + unsigned long data[1]; + GtkWidget *frame; + ++ frame = g_hash_table_lookup (window_tracker->client_windows, ++ GUINT_TO_POINTER (xwindow)); ++ if (frame) ++ return; ++ + /* Double check it's not a request for a frame of our own. */ + if (g_hash_table_contains (window_tracker->frames, + GUINT_TO_POINTER (xwindow))) +@@ -287,9 +292,7 @@ on_xevent (GdkDisplay *display, + xevent->xproperty.atom == + gdk_x11_get_xatom_by_name_for_display (display, "_MUTTER_NEEDS_FRAME")) + { +- if (xevent->xproperty.state == PropertyNewValue && +- !g_hash_table_contains (window_tracker->client_windows, +- GUINT_TO_POINTER (xwindow))) ++ if (xevent->xproperty.state == PropertyNewValue) + set_up_frame (window_tracker, xwindow); + else if (xevent->xproperty.state == PropertyDelete) + remove_frame (window_tracker, xwindow); +-- +GitLab + diff --git a/desktop/gnome/base/mutter/pspec.xml b/desktop/gnome/base/mutter/pspec.xml index 3d09dce39b..2dc1b9b86b 100644 --- a/desktop/gnome/base/mutter/pspec.xml +++ b/desktop/gnome/base/mutter/pspec.xml @@ -58,6 +58,10 @@ python3-argcomplete python3-docutils + + a38fe3a50427bd0ffdd86d0a565371d992027438.patch + 5a78e6ae05ddf099d62e956c32b07ade7321b9b5.patch + @@ -204,8 +208,8 @@ - - 2025-05-27 + + 2025-06-10 48.3 Version bump. Pisi Linux Community diff --git a/desktop/lookandfeel/icon-theme-adwaita/pspec.xml b/desktop/lookandfeel/icon-theme-adwaita/pspec.xml index 0877c2a89b..ca28a252a3 100644 --- a/desktop/lookandfeel/icon-theme-adwaita/pspec.xml +++ b/desktop/lookandfeel/icon-theme-adwaita/pspec.xml @@ -1,3 +1,5 @@ + + icon-theme-adwaita @@ -10,7 +12,7 @@ app:gui Adwaita icon theme Adwaita icon theme - https://download.gnome.org/sources/adwaita-icon-theme/47/adwaita-icon-theme-47.0.tar.xz + https://download.gnome.org/sources/adwaita-icon-theme/48/adwaita-icon-theme-48.0.tar.xz meson intltool @@ -48,6 +50,13 @@ + + 2025-06-10 + 48.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2024-09-16 47.0 diff --git a/desktop/toolkit/gtk/pango/pspec.xml b/desktop/toolkit/gtk/pango/pspec.xml index d8cfad105b..071ff4e231 100644 --- a/desktop/toolkit/gtk/pango/pspec.xml +++ b/desktop/toolkit/gtk/pango/pspec.xml @@ -13,7 +13,7 @@ library Text rendering and layout library Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x. - mirrors://gnome/pango/1.56/pango-1.56.0.tar.xz + mirrors://gnome/pango/1.56/pango-1.56.3.tar.xz libX11-devel freetype-devel @@ -139,6 +139,13 @@ + + 2025-05-20 + 1.56.3 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-01-11 1.56.0