update to version 44.6
This commit is contained in:
parent
f99c4130bd
commit
024463ca30
@ -1,26 +0,0 @@
|
|||||||
From 3899a01cd6cb00ca686946d3065d58f59f5c2099 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
||||||
Date: Tue, 17 Nov 2020 14:00:02 +0100
|
|
||||||
Subject: [PATCH] Revert "build: Do not provide built sources as libmutter_dep
|
|
||||||
sources"
|
|
||||||
|
|
||||||
This reverts commit 4e9a2e479969973bf3063c740ceff149036b3af4.
|
|
||||||
---
|
|
||||||
src/meson.build | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/meson.build b/src/meson.build
|
|
||||||
index e7c99caee..8fe484ec2 100644
|
|
||||||
--- a/src/meson.build
|
|
||||||
+++ b/src/meson.build
|
|
||||||
@@ -955,6 +955,7 @@ libmutter = shared_library(libmutter_name,
|
|
||||||
libmutter_dep = declare_dependency(
|
|
||||||
link_with: libmutter,
|
|
||||||
include_directories: mutter_includes,
|
|
||||||
+ sources: mutter_built_sources,
|
|
||||||
dependencies: [
|
|
||||||
libmutter_cogl_dep,
|
|
||||||
libmutter_clutter_dep,
|
|
||||||
--
|
|
||||||
2.28.0
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
mutter-44.6.tar.xz
Normal file
BIN
mutter-44.6.tar.xz
Normal file
Binary file not shown.
20
mutter.spec
20
mutter.spec
@ -1,4 +1,4 @@
|
|||||||
%global glib_version 2.69.0
|
%global glib_version 2.71.0
|
||||||
%global gtk3_version 3.19.8
|
%global gtk3_version 3.19.8
|
||||||
%global gsettings_desktop_schemas_version 40
|
%global gsettings_desktop_schemas_version 40
|
||||||
%global json_glib_version 0.12.0
|
%global json_glib_version 0.12.0
|
||||||
@ -6,20 +6,18 @@
|
|||||||
%global pipewire_version 0.3.33
|
%global pipewire_version 0.3.33
|
||||||
%global lcms2_version 2.6
|
%global lcms2_version 2.6
|
||||||
%global colord_version 1.4.5
|
%global colord_version 1.4.5
|
||||||
%global mutter_api_version 11
|
%global mutter_api_version 12
|
||||||
|
|
||||||
Name: mutter
|
Name: mutter
|
||||||
Version: 43.2
|
Version: 44.6
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Window and compositing manager based on Clutter
|
Summary: Window and compositing manager based on Clutter
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://www.gnome.org
|
URL: https://www.gnome.org
|
||||||
Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/%{name}/44/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
Patch0: 0001-window-actor-Special-case-shaped-Java-windows.patch
|
Patch0: 0001-window-actor-Special-case-shaped-Java-windows.patch
|
||||||
Patch1: 0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch
|
Patch1: mutter-42.alpha-disable-tegra.patch
|
||||||
Patch2: mutter-42.alpha-disable-tegra.patch
|
|
||||||
#Patch3: post-43.1-fixes.patch
|
|
||||||
|
|
||||||
BuildRequires: meson pam-devel zenity sysprof-devel gtk-doc gettext-devel git-core
|
BuildRequires: meson pam-devel zenity sysprof-devel gtk-doc gettext-devel git-core
|
||||||
BuildRequires: xorg-x11-server-Xorg xorg-x11-server-Xvfb desktop-file-utils
|
BuildRequires: xorg-x11-server-Xorg xorg-x11-server-Xvfb desktop-file-utils
|
||||||
@ -115,7 +113,6 @@ chrpath -d %{buildroot}%{_libdir}/lib*.so.*
|
|||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
|
|
||||||
|
|
||||||
mkdir -p %{buildroot}/etc/ld.so.conf.d
|
mkdir -p %{buildroot}/etc/ld.so.conf.d
|
||||||
%ifarch sw_64
|
%ifarch sw_64
|
||||||
@ -129,10 +126,10 @@ echo "/usr/lib64/mutter-11" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.con
|
|||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%{_bindir}/mutter
|
%{_bindir}/mutter
|
||||||
%{_datadir}/applications/*.desktop
|
|
||||||
%{_libdir}/lib*.so.*
|
%{_libdir}/lib*.so.*
|
||||||
%{_libdir}/mutter-%{mutter_api_version}/
|
%{_libdir}/mutter-%{mutter_api_version}/
|
||||||
%{_libexecdir}/mutter-restart-helper
|
%{_libexecdir}/mutter-restart-helper
|
||||||
|
%{_libexecdir}/mutter-x11-frames
|
||||||
%{_datadir}/GConf/gsettings/mutter-schemas.convert
|
%{_datadir}/GConf/gsettings/mutter-schemas.convert
|
||||||
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
|
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
|
||||||
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
|
%{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
|
||||||
@ -154,6 +151,9 @@ echo "/usr/lib64/mutter-11" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.con
|
|||||||
%{_mandir}/man1/*.1.gz
|
%{_mandir}/man1/*.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 22 2023 lwg <liweiganga@uniontech.com> - 44.6-1
|
||||||
|
- update to version 44.6
|
||||||
|
|
||||||
* Mon Mar 13 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-2
|
* Mon Mar 13 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-2
|
||||||
- remove rpath
|
- remove rpath
|
||||||
|
|
||||||
|
|||||||
@ -1,111 +0,0 @@
|
|||||||
From 926567d5533a56ec4b609d814c0bbaf234901ba3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
||||||
Date: Thu, 17 Nov 2022 10:13:45 +0100
|
|
||||||
Subject: [PATCH 1/2] Revert "clutter/actor: Avoid some stage view updates"
|
|
||||||
|
|
||||||
This reverts commit 7e7a639cc5132cf3355e861235f325540fe56548.
|
|
||||||
---
|
|
||||||
clutter/clutter/clutter-actor.c | 30 +++++++++++++++++++++++++++++-
|
|
||||||
1 file changed, 29 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
|
|
||||||
index 009488a069..4d1856ef77 100644
|
|
||||||
--- a/clutter/clutter/clutter-actor.c
|
|
||||||
+++ b/clutter/clutter/clutter-actor.c
|
|
||||||
@@ -1484,6 +1484,22 @@ clutter_actor_update_map_state (ClutterActor *self,
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void
|
|
||||||
+queue_update_stage_views (ClutterActor *actor)
|
|
||||||
+{
|
|
||||||
+ while (actor && !actor->priv->needs_update_stage_views)
|
|
||||||
+ {
|
|
||||||
+ actor->priv->needs_update_stage_views = TRUE;
|
|
||||||
+
|
|
||||||
+ /* We don't really need to update the stage-views of the actors up the
|
|
||||||
+ * hierarchy, we set the flag anyway though so we can avoid traversing
|
|
||||||
+ * the whole scenegraph when looking for actors which need an update
|
|
||||||
+ * in clutter_actor_finish_layout().
|
|
||||||
+ */
|
|
||||||
+ actor = actor->priv->parent;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void queue_update_paint_volume (ClutterActor *actor);
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -1528,6 +1544,18 @@ clutter_actor_real_map (ClutterActor *self)
|
|
||||||
|
|
||||||
if (priv->unmapped_paint_branch_counter == 0)
|
|
||||||
{
|
|
||||||
+ /* We skip unmapped actors when updating the stage-views list, so if
|
|
||||||
+ * an actors list got invalidated while it was unmapped make sure to
|
|
||||||
+ * set priv->needs_update_stage_views to TRUE for all actors up the
|
|
||||||
+ * hierarchy now.
|
|
||||||
+ */
|
|
||||||
+ if (priv->needs_update_stage_views)
|
|
||||||
+ {
|
|
||||||
+ /* Avoid the early return in queue_update_stage_views() */
|
|
||||||
+ priv->needs_update_stage_views = FALSE;
|
|
||||||
+ queue_update_stage_views (self);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* Avoid the early return in clutter_actor_queue_relayout() */
|
|
||||||
priv->needs_width_request = FALSE;
|
|
||||||
priv->needs_height_request = FALSE;
|
|
||||||
@@ -2479,7 +2507,7 @@ clutter_actor_notify_if_geometry_changed (ClutterActor *self,
|
|
||||||
static void
|
|
||||||
absolute_geometry_changed (ClutterActor *actor)
|
|
||||||
{
|
|
||||||
- actor->priv->needs_update_stage_views = TRUE;
|
|
||||||
+ queue_update_stage_views (actor);
|
|
||||||
}
|
|
||||||
|
|
||||||
static ClutterActorTraverseVisitFlags
|
|
||||||
--
|
|
||||||
2.38.1
|
|
||||||
|
|
||||||
|
|
||||||
From c0f8a20fbd25d4efa1aae85505eb46ab987f9975 Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Wudrick <prochronism@gmail.com>
|
|
||||||
Date: Fri, 4 Nov 2022 02:35:12 +0000
|
|
||||||
Subject: [PATCH 2/2] window: Update ongoing edge resistance flags with input
|
|
||||||
|
|
||||||
Fix a recent regression where edge resistance flags where no
|
|
||||||
longer updated during the move/resize operation.
|
|
||||||
|
|
||||||
Fixes: bd6b14a843 (window: Throttle window move grab updates)
|
|
||||||
|
|
||||||
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2492
|
|
||||||
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2687>
|
|
||||||
|
|
||||||
|
|
||||||
(cherry picked from commit d889aad7cf76f786208c446ce195d4e26f9c0a8d)
|
|
||||||
---
|
|
||||||
src/core/window.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/core/window.c b/src/core/window.c
|
|
||||||
index d376017166..3b35ee021e 100644
|
|
||||||
--- a/src/core/window.c
|
|
||||||
+++ b/src/core/window.c
|
|
||||||
@@ -6021,6 +6021,7 @@ queue_update_move (MetaWindow *window,
|
|
||||||
MetaCompositor *compositor;
|
|
||||||
MetaLaters *laters;
|
|
||||||
|
|
||||||
+ window->display->grab_last_edge_resistance_flags = flags;
|
|
||||||
window->display->grab_latest_motion_x = x;
|
|
||||||
window->display->grab_latest_motion_y = y;
|
|
||||||
|
|
||||||
@@ -6166,6 +6167,7 @@ queue_update_resize (MetaWindow *window,
|
|
||||||
MetaCompositor *compositor;
|
|
||||||
MetaLaters *laters;
|
|
||||||
|
|
||||||
+ window->display->grab_last_edge_resistance_flags = flags;
|
|
||||||
window->display->grab_latest_motion_x = x;
|
|
||||||
window->display->grab_latest_motion_y = y;
|
|
||||||
|
|
||||||
--
|
|
||||||
2.38.1
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user