Update nm applet and backend

conf/distro/openxt-main.conf

@@ -46,8 +46,8 @@ PREFERRED_VERSION_dojosdk-native_xenclient-syncui ?= "1.8.1"
 PREFERRED_PROVIDER_virtual/libx11 = "libx11"
 
 # Force specific package versions
-PREFERRED_VERSION_networkmanager = "1.18.4"
-PREFERRED_VERSION_network-manager-applet = "1.8.22"
+PREFERRED_VERSION_networkmanager = "1.22.%"
+PREFERRED_VERSION_network-manager-applet = "1.16.0"
 
 PREFERRED_PROVIDER_iasl = "acpica"
 PREFERRED_PROVIDER_iasl-native = "${PREFERRED_PROVIDER_iasl}-native"

recipes-connectivity/network-manager-applet/network-manager-applet-1.16.0/default-certs-dir.patch → recipes-connectivity/libnma/libnma-1.8.28/default-certs-dir.patch

@@ -1,5 +1,5 @@
---- a/src/libnma/nma-cert-chooser.c
-+++ b/src/libnma/nma-cert-chooser.c
+--- a/src/nma-cert-chooser.c
++++ b/src/nma-cert-chooser.c
 @@ -597,7 +597,9 @@ constructor (GType type, guint n_constru
  	NMACertChooserPrivate *priv;
  	int i;
@@ -10,7 +10,7 @@
  	object = G_OBJECT_CLASS (nma_cert_chooser_parent_class)->constructor (type,
  	                                                                      n_construct_properties,
  	                                                                      construct_properties);
-@@ -620,6 +622,8 @@ constructor (GType type, guint n_constru
+@@ -643,6 +643,8 @@ constructor (GType type, guint n_construct_properties, GObjectConstructParam *co
  	priv->vtable->init (cert_chooser);
  	priv->vtable->set_flags (cert_chooser, flags);
  	priv->vtable->set_title (cert_chooser, title);
@@ -19,8 +19,8 @@
 
  	return object;
  }
---- a/src/libnma/nma-file-cert-chooser.c
-+++ b/src/libnma/nma-file-cert-chooser.c
+--- a/src/nma-file-cert-chooser.c
++++ b/src/nma-file-cert-chooser.c
 @@ -238,6 +238,15 @@ show_toggled_cb (GtkCheckButton *button,
  }
 
@@ -36,18 +36,44 @@
 +static void
  set_title (NMACertChooser *cert_chooser, const gchar *title)
  {
- 	NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
-@@ -389,6 +398,7 @@ const NMACertChooserVtable nma_cert_choo
+	NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
+@@ -430,6 +441,7 @@ const NMACertChooserVtable nma_cert_chooser_vtable_file = {
+ 	.init = init,
 
  	.set_title = set_title,
- 	.set_flags = set_flags,
 +	.set_folder = set_folder,
+ 	.set_flags = set_flags,
+
+ 	.set_cert_uri = set_cert_uri,
+--- a/src/nma-pkcs11-cert-chooser.c
++++ b/src/nma-pkcs11-cert-chooser.c
+@@ -354,6 +354,15 @@ show_toggled_cb (GtkCheckButton *button, gpointer user_data)
+ 		gtk_entry_set_visibility (GTK_ENTRY (priv->key_password), active);
+ }
+
++static void
++set_folder (NMACertChooser *cert_chooser, const gchar *folder)
++{
++	NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
++
++	if (folder)
++		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (priv->cert_button), folder);
++}
++
+ static void
+ set_title (NMACertChooser *cert_chooser, const gchar *title)
+ {
+@@ -536,6 +553,7 @@ const NMACertChooserVtable nma_cert_chooser_vtable_pkcs11 = {
+ 	.init = init,
 
+ 	.set_title = set_title,
++	.set_folder = set_folder,
+ 	.set_flags = set_flags,
  	.set_cert_uri = set_cert_uri,
  	.get_cert_uri = get_cert_uri,
 --- a/shared/nm-default.h
 +++ b/shared/nm-default.h
-@@ -53,6 +53,9 @@
+@@ -52,6 +52,9 @@
 
  #include <gtk/gtk.h>
 
@@ -57,8 +83,8 @@
  /*****************************************************************************/
 
  #if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY)
---- a/src/libnma/nma-cert-chooser-private.h
-+++ b/src/libnma/nma-cert-chooser-private.h
+--- a/src/nma-cert-chooser-private.h
++++ b/src/nma-cert-chooser-private.h
 @@ -99,6 +99,7 @@ struct _NMACertChooserClass {
   *   password if one is present.
   * @set_title: Setup the title property

recipes-connectivity/libnma/libnma_1.8.28.bb

@@ -0,0 +1,26 @@
+SUMMARY = "NetworkManager GUI library"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "glib-2.0 gtk+3 networkmanager"
+
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase gobject-introspection gtk-doc gettext vala features_check
+
+REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5"
+SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726"
+
+PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
+PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
+PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes"
+PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info"
+
+# go introspection is not supported for mipsn32/riscv32, but vapi needs it
+#
+EXTRA_OEMESON_mipsarchn32_append = " -Dvapi=false"
+EXTRA_OEMESON_riscv32_append = " -Dvapi=false"
+
+GTKDOC_MESON_OPTION = "gtk_doc"

recipes-connectivity/libnma/libnma_1.8.28.bbappend

@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${PV}:"
+
+SRC_URI += " \
+    file://default-certs-dir.patch \
+"

recipes-connectivity/network-manager-applet/network-manager-applet-1.16.0/always-use-psk-hash.patch

@@ -12,6 +12,28 @@
  dnl
  dnl API documentation
  dnl
+--- a/meson.build
++++ b/meson.build
+@@ -108,6 +108,7 @@ gio_dep = dependency('gio-2.0', version: '>= 2.38')
+ gmodule_export_dep = dependency('gmodule-export-2.0')
+ libsecret_dep = dependency('libsecret-1', version: '>= 0.18')
+ libnma_dep = dependency('libnma', version: '>= 1.8.27')
++openssl_dep = dependency('openssl', version: '>= 1.0.0')
+
+ m_dep = cc.find_library('m')
+
+--- a/src/wireless-security/meson.build
++++ b/src/wireless-security/meson.build
+@@ -49,7 +49,8 @@ deps = [
+   gtk_dep,
+   libnm_dep,
+   libnma_dep,
+-  libutils_libnm_dep
++  libutils_libnm_dep,
++  openssl_dep
+ ]
+
+ libwireless_security_libnm = static_library(
 --- a/src/wireless-security/ws-wpa-psk.c
 +++ b/src/wireless-security/ws-wpa-psk.c
 @@ -29,6 +29,7 @@
@@ -61,10 +83,10 @@
  	/* Save PSK_FLAGS to the connection */
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -298,12 +298,14 @@ src_wireless_security_libwireless_securi
- 	"-I$(srcdir)/src/libnma" \
- 	-Isrc/libnma \
+@@ -262,12 +262,14 @@ src_wireless_security_libwireless_security_libnm_la_CPPFLAGS = \
+ 	"-I$(srcdir)/src/utils" \
  	$(GTK3_CFLAGS) \
+ 	$(LIBNMA_CFLAGS) \
 -	$(LIBNM_CFLAGS)
 +	$(LIBNM_CFLAGS) \
 +	$(OPENSSL_CFLAGS)
@@ -78,38 +100,4 @@
 
  $(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
 
-@@ -325,12 +327,14 @@ src_wireless_security_libwireless_securi
- 	"-I$(srcdir)/src/utils" \
- 	"-I$(srcdir)/src/libnma" \
- 	-Isrc/libnma \
--	$(LIBNM_GLIB_CFLAGS)
-+	$(LIBNM_GLIB_CFLAGS) \
-+	$(OPENSSL_CFLAGS)
-
- src_wireless_security_libwireless_security_libnm_glib_la_LIBADD = \
- 	src/utils/libutils-libnm-glib.la \
- 	$(GTK3_LIBS) \
--	$(LIBNM_GLIB_LIBS)
-+	$(LIBNM_GLIB_LIBS) \
-+	$(OPENSSL_LIBS)
-
- $(src_wireless_security_libwireless_security_libnm_glib_la_OBJECTS): $(wireless_security_h_gen)
-
-@@ -422,13 +426,15 @@ src_libnm_gtk_libnm_gtk_la_CFLAGS = \
- 	-Isrc/libnma \
- 	$(GTK3_CFLAGS) \
- 	$(LIBNM_GLIB_CFLAGS) \
--	$(GUDEV_CFLAGS)
-+	$(GUDEV_CFLAGS) \
-+	$(OPENSSL_CFLAGS)
-
- src_libnm_gtk_libnm_gtk_la_LIBADD = \
- 	src/wireless-security/libwireless-security-libnm-glib.la \
- 	$(GTK3_LIBS) \
- 	$(LIBNM_GLIB_LIBS) \
--	$(GUDEV_LIBS)
-+	$(GUDEV_LIBS) \
-+	$(OPENSSL_LIBS)
-
- EXTRA_src_libnm_gtk_libnm_gtk_la_DEPENDENCIES = src/libnm-gtk/libnm-gtk.ver
-
+

recipes-connectivity/network-manager-applet/network-manager-applet-1.16.0/openxt-menus.patch

@@ -471,3 +471,13 @@
  	src/applet-agent.c \
  	src/applet-agent.h \
  	src/applet-vpn-request.c \
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -9,6 +9,7 @@ sources = files(
+   'ap-menu-item.c',
+   'applet-agent.c',
+   'applet.c',
++  'popup-menu.c',
+   'applet-device-bt.c',
+   'applet-device-ethernet.c',
+   'applet-device-wifi.c',