diff --git a/cdaa837d48894737ca0b4e7d2dfb365119e53759.patch b/cdaa837d48894737ca0b4e7d2dfb365119e53759.patch new file mode 100644 index 0000000..952d8d9 --- /dev/null +++ b/cdaa837d48894737ca0b4e7d2dfb365119e53759.patch @@ -0,0 +1,10 @@ +diff -Nur orig-gnome-shell-extensions-41.1/data/meson.build gnome-shell-extensions-41.1/data/meson.build +--- orig-gnome-shell-extensions-41.1/data/meson.build 2022-02-08 19:00:20.879140911 +0100 ++++ gnome-shell-extensions-41.1/data/meson.build 2022-02-08 19:01:41.716276754 +0100 +@@ -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', diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index fdb70e6..a378fd7 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 3 05:51:27 UTC 2022 - Bjørn Lie + +- Add cdaa837d48894737ca0b4e7d2dfb365119e53759.patch: Fix build + with meson 0.61 and newer. Backported to apply on stable version. + ------------------------------------------------------------------- Mon Dec 13 16:10:45 UTC 2021 - Bjørn Lie diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 7a04c80..a33032f 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-shell-extensions # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -31,6 +31,8 @@ Source2: sle-classic.desktop Source5: sle-classic.json Source6: sle-classic@suse.com.tar.gz Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override +# PATCH-FIX-UPSTREAM cdaa837d48894737ca0b4e7d2dfb365119e53759.patch -- Fix build with meson 0.61 and newer +Patch0: cdaa837d48894737ca0b4e7d2dfb365119e53759.patch # PATCH-FEATURE-OPENSUSE gnome-shell-add-app-to-desktop.patch bnc#870580 dliang@suse.com -- allow adding app shortcut to desktop easily. Patch1: gnome-shell-add-app-to-desktop.patch @@ -100,6 +102,7 @@ to pick system installed themes or even themes installed in the user's home. %prep %setup -q +%patch0 -p1 %patch1 -p1 %patch1000 -p1