From eab0d95d1c11299824aaace084a62ded70c7aed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 12 Apr 2022 08:54:32 +0200 Subject: [PATCH] network-manager-applet: upgrade 1.24.0 -> 1.24.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backported patch can go ======================================================= network-manager-applet-1.26.0 Overview of changes since network-manager-applet-1.24.0 ======================================================= * Improve error messages and error dialogs. * Improve Wi-Fi security combo error handling. * Stop providing WEP by default. * Replace the lock icon for WEP networks with an exclamation mark. * Fix meson 0.61 issues. * Make the tooltip of the status icon available for screen readers. * Fix OWE wireless security option not showed on "Connect to a Hidden Network" dialog. * Fix OWE wireless security option not being saved when chosen from nm-connection-editor. * Move 802.1 dialog margins for the inner vbox. * Align labels for Ethernet dialog. * Move all Wi-FI entries to a submenu. * Fix the VPN plugins dialog margins. * Add a scrolled window for the VPN page. * Internal improvements. * Update translations. Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...on.build-address-meson-0.61-failures.patch | 31 ------------------- ....0.bb => network-manager-applet_1.26.0.bb} | 3 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch rename meta-gnome/recipes-connectivity/network-manager-applet/{network-manager-applet_1.24.0.bb => network-manager-applet_1.26.0.bb} (84%) 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 @@ -From ab27e6e6c839e1c65e4059a06982453a7aa1b6b3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 21 Jan 2022 22:34:09 +0100 -Subject: [PATCH] meson.build: address meson 0.61 failures - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107] -Signed-off-by: Alexander Kanavin ---- - meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 7ab613c8..688a7311 100644 ---- a/meson.build -+++ b/meson.build -@@ -253,7 +253,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false) - - foreach desktop: desktop_files - i18n.merge_file( -- desktop + '-desktop', - input: desktop + '.desktop.in', - output: desktop + '.desktop', - install: true, -@@ -274,7 +273,6 @@ endforeach - appdata = 'nm-connection-editor.appdata.xml' - - i18n.merge_file( -- 'desktop', - input: appdata + '.in', - output: appdata, - 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 similarity index 84% rename from meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb rename to 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 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " file://0001-meson.build-address-meson-0.61-failures.patch" -SRC_URI[archive.sha256sum] = "b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58" +SRC_URI[archive.sha256sum] = "69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd" # We don't not have ubuntu's appindicator (yet?) EXTRA_OEMESON = "-Dappindicator=no"