diff options
| -rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch | 31 | ||||
| -rw-r--r-- | meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb (renamed from meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb) | 3 |
2 files changed, 1 insertions, 33 deletions
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch deleted file mode 100644 index 4a5cd5b81b..0000000000 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From ab27e6e6c839e1c65e4059a06982453a7aa1b6b3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Fri, 21 Jan 2022 22:34:09 +0100 | ||
| 4 | Subject: [PATCH] meson.build: address meson 0.61 failures | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107] | ||
| 7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 8 | --- | ||
| 9 | meson.build | 2 -- | ||
| 10 | 1 file changed, 2 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/meson.build b/meson.build | ||
| 13 | index 7ab613c8..688a7311 100644 | ||
| 14 | --- a/meson.build | ||
| 15 | +++ b/meson.build | ||
| 16 | @@ -253,7 +253,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false) | ||
| 17 | |||
| 18 | foreach desktop: desktop_files | ||
| 19 | i18n.merge_file( | ||
| 20 | - desktop + '-desktop', | ||
| 21 | input: desktop + '.desktop.in', | ||
| 22 | output: desktop + '.desktop', | ||
| 23 | install: true, | ||
| 24 | @@ -274,7 +273,6 @@ endforeach | ||
| 25 | appdata = 'nm-connection-editor.appdata.xml' | ||
| 26 | |||
| 27 | i18n.merge_file( | ||
| 28 | - 'desktop', | ||
| 29 | input: appdata + '.in', | ||
| 30 | output: appdata, | ||
| 31 | install: true, | ||
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb index c0667b5bb1..8046b139c0 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb | |||
| @@ -9,8 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext | |||
| 9 | 9 | ||
| 10 | REQUIRED_DISTRO_FEATURES = "x11" | 10 | REQUIRED_DISTRO_FEATURES = "x11" |
| 11 | 11 | ||
| 12 | SRC_URI += " file://0001-meson.build-address-meson-0.61-failures.patch" | 12 | SRC_URI[archive.sha256sum] = "69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd" |
| 13 | SRC_URI[archive.sha256sum] = "b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58" | ||
| 14 | 13 | ||
| 15 | # We don't not have ubuntu's appindicator (yet?) | 14 | # We don't not have ubuntu's appindicator (yet?) |
| 16 | EXTRA_OEMESON = "-Dappindicator=no" | 15 | EXTRA_OEMESON = "-Dappindicator=no" |
