rpms
/
gnome-shell
7
0
Fork 0
Code Issues Pull Requests Releases Activity

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#91236bb2a501f2f8ffcbb89bcf887d246f7caa79
This commit is contained in:
DistroBaker 2021-03-13 10:55:31 +00:00
parent 17d018a607
commit 13d8dd4ce4
5 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -188,3 +188,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-40.alpha.1.1-94-g9ce666ac1.tar.xz
/gnome-shell-40.alpha.1.1-228-g829a096ba.tar.xz
/gnome-shell-40.beta.tar.xz
/gnome-shell-40.beta-79-g7a57528bd.tar.xz

25
0001-build-Lower-mutter-requirement.patch Normal file
View File

@ -0,0 +1,25 @@
From 7649d0c93dddfa6969e432c2510379aa5cf70420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 4 Mar 2021 16:36:05 +0100
Subject: [PATCH] build: Lower mutter requirement
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 66c0fc073..5654a8838 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,7 @@ gio_req = '>= 2.56.0'
gi_req = '>= 1.49.1'
gjs_req = '>= 1.65.1'
gtk_req = '>= 3.15.0'
-mutter_req = '>= 40.rc'
+mutter_req = '>= 40.beta'
polkit_req = '>= 0.100'
schemas_req = '>= 3.33.1'
startup_req = '>= 0.11'
--
2.30.1

14
gnome-shell-favourite-apps-firefox.patch
View File

@ -1,4 +1,4 @@
From ecbdc8596190dd0b2686cbe75790ed01708bd2a2 Mon Sep 17 00:00:00 2001
From a2e62e671260576d23f18c22c10a48ac4a8504af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 17 Sep 2014 07:11:12 +0200
Subject: [PATCH] Replace Web with Firefox in default favorites
@ -9,23 +9,23 @@ Subject: [PATCH] Replace Web with Firefox in default favorites
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
index 49d38d766..1433292e4 100644
index cd6a2356d..b8a13a9cc 100644
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -50,7 +50,7 @@
</description>
</key>
<key name="favorite-apps" type="as">
- <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
+ <default>[ 'firefox.desktop', 'org.gnome.Calendar.desktop', 'rhythmbox.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
- <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
+ <default>[ 'firefox.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
<summary>List of desktop file IDs for favorite applications</summary>
<description>
The applications corresponding to these identifiers
diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js
index 3308dd6b3..87c008704 100644
index a876727ed..24ce16f81 100644
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -50,6 +50,7 @@ const RENAMED_DESKTOP_IDS = {
@@ -52,6 +52,7 @@ const RENAMED_DESKTOP_IDS = {
'gnotski.desktop': 'org.gnome.Klotski.desktop',
'gtali.desktop': 'org.gnome.Tali.desktop',
'iagno.desktop': 'org.gnome.Reversi.desktop',
@ -34,5 +34,5 @@ index 3308dd6b3..87c008704 100644
'org.gnome.gnome-2048.desktop': 'org.gnome.TwentyFortyEight.desktop',
'org.gnome.taquin.desktop': 'org.gnome.Taquin.desktop',
--
2.24.1
2.30.1

11
gnome-shell.spec
View File

@ -1,14 +1,16 @@
Name: gnome-shell
Version: 40.0~beta
Release: 1%{?dist}
Release: 2.20210304git7a57528bd%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+
URL: https://wiki.gnome.org/Projects/GnomeShell
Source0: http://download.gnome.org/sources/gnome-shell/40/%{name}-40.beta.tar.xz
Source0: http://download.gnome.org/sources/gnome-shell/40/%{name}-40.beta-79-g7a57528bd.tar.xz
# Replace Epiphany with Firefox in the default favourite apps list
Patch1: gnome-shell-favourite-apps-firefox.patch
# Undo post-release version bump for snapshot
Patch2: 0001-build-Lower-mutter-requirement.patch
%define eds_version 3.33.1
%define gnome_desktop_version 3.35.91
@ -147,7 +149,7 @@ innovative user interface concepts to provide a visually attractive and
easy to use experience.
%prep
%autosetup -S git -n %{name}-40.beta
%autosetup -S git -n %{name}-40.rc
%build
%meson -Dextensions_app=false
@ -223,6 +225,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
%{_mandir}/man1/gnome-shell.1*
%changelog
* Thu Mar 04 2021 Florian Müllner <fmuellner@redhat.com> - 40.0~beta-2.20210304git40.7a57528bd
- Build snapshot of current upstream
* Tue Feb 23 2021 Florian Müllner <fmuellner@redhat.com> - 40.0~beta-1
- Update to 40.beta

2
sources
View File

@ -1 +1 @@
SHA512 (gnome-shell-40.beta.tar.xz) = 6f673c429d0b1b26979de72f945ab5cb47023a28d63b55fbc30d807aeace7389212dc0100aed4ff95300853598d08fda7a82c9da14ae8190619c04dd9ad95c50
SHA512 (gnome-shell-40.beta-79-g7a57528bd.tar.xz) = 2886a18bf75fec069be00170f1f646ac0d06c8aeb0cc7f03b221c1c77490877cb2914391c0f2297a6b8b496e4fda292e89eaf65d8c660bcbe12f961d36adccb6