Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gnome-shell.git#d0bb9ca06647d1de41740fba6807e6504eaa4e88
This commit is contained in:
DistroBaker 2020-12-02 21:50:54 +00:00
parent 6747e8fcb4
commit 72cae12ed3
4 changed files with 10 additions and 43 deletions

1
.gitignore vendored
View File

@ -182,3 +182,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-3.37.92.tar.xz /gnome-shell-3.37.92.tar.xz
/gnome-shell-3.38.0.tar.xz /gnome-shell-3.38.0.tar.xz
/gnome-shell-3.38.1.tar.xz /gnome-shell-3.38.1.tar.xz
/gnome-shell-40.alpha.tar.xz

View File

@ -1,36 +0,0 @@
From 6ba3ca5f9548ba0a87a9e3ffa129716d0a062e1e Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 2 Oct 2020 16:33:31 +0800
Subject: [PATCH] windowManager: Avoid calling meta_window_actor_thaw when not
frozen
Because that tends to crash in:
```
g_error ("Error in freeze/thaw accounting");
```
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1431
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1453
---
js/ui/windowManager.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index ab86a2e6a3..91b764ea8d 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -1378,6 +1378,10 @@ var WindowManager = class {
onStopped: () => this._sizeChangeWindowDone(shellwm, actor),
});
+ // ease didn't animate and cleared the info, we are done
+ if (!actor.__animationInfo)
+ return;
+
// Now unfreeze actor updates, to get it to the new size.
// It's important that we don't wait until the animation is completed to
// do this, otherwise our scale will be applied to the old texture size.
--
2.28.0

View File

@ -1,16 +1,15 @@
Name: gnome-shell Name: gnome-shell
Version: 3.38.1 Version: 40.0~alpha
Release: 2%{?dist} Release: 1%{?dist}
Summary: Window management and application launching for GNOME Summary: Window management and application launching for GNOME
License: GPLv2+ License: GPLv2+
URL: https://wiki.gnome.org/Projects/GnomeShell URL: https://wiki.gnome.org/Projects/GnomeShell
#VCS: git:git://git.gnome.org/gnome-shell #VCS: git:git://git.gnome.org/gnome-shell
Source0: http://download.gnome.org/sources/gnome-shell/3.38/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/gnome-shell/40/%{name}-40.alpha.tar.xz
# Replace Epiphany with Firefox in the default favourite apps list # Replace Epiphany with Firefox in the default favourite apps list
Patch1: gnome-shell-favourite-apps-firefox.patch Patch1: gnome-shell-favourite-apps-firefox.patch
Patch2: 0001-windowManager-Avoid-calling-meta_window_actor_thaw-w.patch
%define eds_version 3.33.1 %define eds_version 3.33.1
%define gnome_desktop_version 3.35.91 %define gnome_desktop_version 3.35.91
@ -18,7 +17,7 @@ Patch2: 0001-windowManager-Avoid-calling-meta_window_actor_thaw-w.patch
%define gobject_introspection_version 1.49.1 %define gobject_introspection_version 1.49.1
%define gjs_version 1.57.3 %define gjs_version 1.57.3
%define gtk3_version 3.15.0 %define gtk3_version 3.15.0
%define mutter_version 3.38.0 %define mutter_version 40.0~alpha
%define polkit_version 0.100 %define polkit_version 0.100
%define gsettings_desktop_schemas_version 3.33.1 %define gsettings_desktop_schemas_version 3.33.1
%define ibus_version 1.5.2 %define ibus_version 1.5.2
@ -143,7 +142,7 @@ innovative user interface concepts to provide a visually attractive and
easy to use experience. easy to use experience.
%prep %prep
%autosetup -S git %autosetup -S git -n %{name}-40.alpha
%build %build
%meson -Dextensions_app=false %meson -Dextensions_app=false
@ -218,6 +217,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
%{_mandir}/man1/gnome-shell.1* %{_mandir}/man1/gnome-shell.1*
%changelog %changelog
* Wed Dec 02 2020 Florian Müllner <fmuellner@redhat.com> - 40.alpha-1
- Update to 40.alpha
* Tue Oct 13 2020 Florian Müllner <fmuellner@redhat.com> - 3.38.1-2 * Tue Oct 13 2020 Florian Müllner <fmuellner@redhat.com> - 3.38.1-2
- Fix crash on size change (non-)transitions - Fix crash on size change (non-)transitions

View File

@ -1 +1 @@
SHA512 (gnome-shell-3.38.1.tar.xz) = 7ab580f892c4b4dac2fc8625343dfab1bf7a11e148dc01e6e805a5b1ac1d4cb17943b9a3058ec69fc086c270d76ef8073dca494991a5da1dcfa52b42dcc03f01 SHA512 (gnome-shell-40.alpha.tar.xz) = b3e3fda51dcb4380cd4f0b91bbbcd9415cb0857a548ac0a757078baa319113a08f9596af4e605154ab4964b21e7c1cdc2772ebd90c5b6d6feb9060ded30417ce