From d11772347324c2fccd053404c297efaa3c6f7451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 12 Apr 2022 08:54:28 +0200 Subject: [PATCH] gnome-shell-extensions: upgrade 41.1 -> 42.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backported patch can go 42.0 ==== * Update Translators 42.rc ===== * Misc. bug fixes and cleanups [Florian; !215, !218] 42.beta ======= * workspace-indicator: Fix cancelling editing with Esc [Florian; !208] * window-list: Update window tracking to avoid missing icons [Florian; !207] * Use libadwaita for preferences [Florian; !209, !213] * Adapt to Clutter grab API changes [Florian; !212] * Misc. bug fixes and cleanups [Jan, Florian; !210, !214] Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...-unused-argument-for-i18n.merge_file.patch | 30 ------------------- ...41.1.bb => gnome-shell-extensions_42.0.bb} | 3 +- 2 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch rename meta-gnome/recipes-gnome/gnome-shell/{gnome-shell-extensions_41.1.bb => gnome-shell-extensions_42.0.bb} (82%) diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch deleted file mode 100644 index df8fe0e6e6..0000000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cdaa837d48894737ca0b4e7d2dfb365119e53759 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Tue, 25 Jan 2022 11:49:54 +0000 -Subject: [PATCH] meson: Drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:23:0: ERROR: Function does not take positional arguments. - -Part-of: - -Upstream-Status: Backport[https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759] ---- - data/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 27f4287..a4bcd5e 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,5 +1,5 @@ - session_desktop = 'gnome-classic.desktop' --i18n.merge_file('', -+i18n.merge_file( - input: session_desktop + '.in', - output: session_desktop, - po_dir: '../po', --- -2.34.1 - diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb similarity index 82% rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb index f51ca9f918..786341cc16 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb @@ -8,8 +8,7 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.sha256sum] = "d0e6f2273f08d52d925fc2bb66b47b28e5ef50d1b8a14020877c662423d507d3" -SRC_URI += "file://0001-meson-Drop-unused-argument-for-i18n.merge_file.patch" +SRC_URI[archive.sha256sum] = "3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f" DEPENDS += " \ sassc-native \