gnome-shell: update to 42.3.

This commit is contained in:
oreo639 2022-03-25 14:25:25 -07:00 committed by Michal Vasilek
parent 4c9dfb5346
commit bae782cffd
3 changed files with 45 additions and 89 deletions

View File

@ -0,0 +1,37 @@
From aca79c027483f86e85043f403321a8d8016ca007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sun, 3 Jul 2022 16:44:39 +0200
Subject: [PATCH] keyboard: Fix updating suggestions visibility
Commit 237ba24dbeae added corresponding API to the keyboard actor,
but ended up calling it on the KeyboardManager.
Add the expected method to KeyboardManager that forwards the request
to the keyboard.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5630
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2359>
(cherry picked from commit eff23a87c36a6a96c9abab09ab27a4bb35ab1b1f)
---
js/ui/keyboard.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 9e5dbffbb1..e13652bdfe 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1273,6 +1273,10 @@ var KeyboardManager = class KeyBoardManager {
this._keyboard.resetSuggestions();
}
+ setSuggestionsVisible(visible) {
+ this._keyboard?.setSuggestionsVisible(visible);
+ }
+
maybeHandleEvent(event) {
if (!this._keyboard)
return false;
--
GitLab

View File

@ -1,82 +0,0 @@
From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 23 Dec 2021 17:18:16 +0100
Subject: [PATCH] build: Drop incorrect positional arg
Unlike other targets that take a name, i18n.merge_file() does not.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
---
data/meson.build | 2 +-
src/calendar-server/meson.build | 2 +-
subprojects/extensions-app/data/meson.build | 2 +-
subprojects/extensions-app/data/metainfo/meson.build | 2 +-
subprojects/extensions-tool/src/templates/meson.build | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index f924fdf806..76ae45c93a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
foreach desktop_file : desktop_files
- i18n.merge_file('desktop',
+ i18n.merge_file(
input: configure_file(
input: desktop_file + '.in.in',
output: desktop_file + '.in',
diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
index 7363282a59..8b4ef411c8 100644
--- a/src/calendar-server/meson.build
+++ b/src/calendar-server/meson.build
@@ -27,7 +27,7 @@ configure_file(
install_dir: servicedir
)
-i18n.merge_file('evolution-calendar.desktop',
+i18n.merge_file(
input: 'evolution-calendar.desktop.in',
output: 'evolution-calendar.desktop',
po_dir: po_dir,
diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
index d7e7d4001c..4b601e8bd1 100644
--- a/subprojects/extensions-app/data/meson.build
+++ b/subprojects/extensions-app/data/meson.build
@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
desktopconf.set('app_id', app_id)
desktopconf.set('prgname', prgname)
-i18n.merge_file('desktop',
+i18n.merge_file(
input: configure_file(
input: base_id + '.desktop.in.in',
output: desktop_file + '.in',
diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
index c4962c0576..a19bfa80a4 100644
--- a/subprojects/extensions-app/data/metainfo/meson.build
+++ b/subprojects/extensions-app/data/metainfo/meson.build
@@ -1,5 +1,5 @@
metainfo = app_id + '.metainfo.xml'
-i18n.merge_file(metainfo,
+i18n.merge_file(
input: base_id + '.metainfo.xml.in',
output: metainfo,
po_dir: po_dir,
diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
index 670e2bf448..d693bfaddb 100644
--- a/subprojects/extensions-tool/src/templates/meson.build
+++ b/subprojects/extensions-tool/src/templates/meson.build
@@ -4,7 +4,7 @@ template_metas = [
]
template_deps = []
foreach template : template_metas
- template_deps += i18n.merge_file(template,
+ template_deps += i18n.merge_file(
input: template + '.in',
output: template,
po_dir: po_dir,
--
GitLab

View File

@ -1,26 +1,27 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
version=41.5
revision=2
version=42.3
revision=1
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false -Dtests=false"
hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
asciidoc perl glib-devel gettext gjs-devel"
asciidoc perl glib-devel gettext gjs-devel gtk-update-icon-cache"
makedepends="gnome-control-center-devel at-spi2-atk-devel
evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
gnome-bluetooth1-devel pipewire-devel gstreamer1-devel"
depends="elogind gnome-control-center gsettings-desktop-schemas upower"
gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
depends="elogind gnome-control-center gsettings-desktop-schemas upower
gstreamer1-pipewire gst-plugins-good1"
checkdepends="xvfb-run mesa-dri $depends"
short_desc="GNOME core user interface"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeShell"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5
checksum=964f520c28d7f412254298676f9cceed6adf81ff489ff1ded69c42987d4c1888
do_check() {
mkdir /tmp/gnome-shell-xdg