Skip to content

Commit fff2d60

Browse files
shahs-aisshahs-ais
committed
Update nm applet and backend
Uprev to network-manager v1.16.0 and network-manager-applet v1.22.10 and revising associated patches
1 parent d900429 commit fff2d60

42 files changed

Lines changed: 183 additions & 3832 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎conf/distro/openxt-main.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ PREFERRED_VERSION_dojosdk-native_xenclient-syncui ?= "1.8.1"
4646
PREFERRED_PROVIDER_virtual/libx11 = "libx11"
4747

4848
# Force specific package versions
49-
PREFERRED_VERSION_networkmanager = "1.18.4"
50-
PREFERRED_VERSION_network-manager-applet = "1.8.22"
49+
PREFERRED_VERSION_networkmanager = "1.22.10"
50+
PREFERRED_VERSION_network-manager-applet = "1.16.0"
5151

5252
PREFERRED_PROVIDER_iasl = "acpica"
5353
PREFERRED_PROVIDER_iasl-native = "${PREFERRED_PROVIDER_iasl}-native"

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

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- a/src/libnma/nma-cert-chooser.c
2-
+++ b/src/libnma/nma-cert-chooser.c
1+
--- a/src/nma-cert-chooser.c
2+
+++ b/src/nma-cert-chooser.c
33
@@ -597,7 +597,9 @@ constructor (GType type, guint n_constru
44
NMACertChooserPrivate *priv;
55
int i;
@@ -10,7 +10,7 @@
1010
object = G_OBJECT_CLASS (nma_cert_chooser_parent_class)->constructor (type,
1111
n_construct_properties,
1212
construct_properties);
13-
@@ -620,6 +622,8 @@ constructor (GType type, guint n_constru
13+
@@ -643,6 +643,8 @@ constructor (GType type, guint n_construct_properties, GObjectConstructParam *co
1414
priv->vtable->init (cert_chooser);
1515
priv->vtable->set_flags (cert_chooser, flags);
1616
priv->vtable->set_title (cert_chooser, title);
@@ -19,8 +19,8 @@
1919

2020
return object;
2121
}
22-
--- a/src/libnma/nma-file-cert-chooser.c
23-
+++ b/src/libnma/nma-file-cert-chooser.c
22+
--- a/src/nma-file-cert-chooser.c
23+
+++ b/src/nma-file-cert-chooser.c
2424
@@ -238,6 +238,15 @@ show_toggled_cb (GtkCheckButton *button,
2525
}
2626

@@ -36,18 +36,44 @@
3636
+static void
3737
set_title (NMACertChooser *cert_chooser, const gchar *title)
3838
{
39-
NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
40-
@@ -389,6 +398,7 @@ const NMACertChooserVtable nma_cert_choo
39+
NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
40+
@@ -430,6 +441,7 @@ const NMACertChooserVtable nma_cert_chooser_vtable_file = {
41+
.init = init,
4142

4243
.set_title = set_title,
43-
.set_flags = set_flags,
4444
+ .set_folder = set_folder,
45+
.set_flags = set_flags,
46+
47+
.set_cert_uri = set_cert_uri,
48+
--- a/src/nma-pkcs11-cert-chooser.c
49+
+++ b/src/nma-pkcs11-cert-chooser.c
50+
@@ -354,6 +354,15 @@ show_toggled_cb (GtkCheckButton *button, gpointer user_data)
51+
gtk_entry_set_visibility (GTK_ENTRY (priv->key_password), active);
52+
}
53+
54+
+static void
55+
+set_folder (NMACertChooser *cert_chooser, const gchar *folder)
56+
+{
57+
+ NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
58+
+
59+
+ if (folder)
60+
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (priv->cert_button), folder);
61+
+}
62+
+
63+
static void
64+
set_title (NMACertChooser *cert_chooser, const gchar *title)
65+
{
66+
@@ -536,6 +553,7 @@ const NMACertChooserVtable nma_cert_chooser_vtable_pkcs11 = {
67+
.init = init,
4568

69+
.set_title = set_title,
70+
+ .set_folder = set_folder,
71+
.set_flags = set_flags,
4672
.set_cert_uri = set_cert_uri,
4773
.get_cert_uri = get_cert_uri,
4874
--- a/shared/nm-default.h
4975
+++ b/shared/nm-default.h
50-
@@ -53,6 +53,9 @@
76+
@@ -52,6 +52,9 @@
5177

5278
#include <gtk/gtk.h>
5379

@@ -57,8 +83,8 @@
5783
/*****************************************************************************/
5884

5985
#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY)
60-
--- a/src/libnma/nma-cert-chooser-private.h
61-
+++ b/src/libnma/nma-cert-chooser-private.h
86+
--- a/src/nma-cert-chooser-private.h
87+
+++ b/src/nma-cert-chooser-private.h
6288
@@ -99,6 +99,7 @@ struct _NMACertChooserClass {
6389
* password if one is present.
6490
* @set_title: Setup the title property

‎recipes-connectivity/libnma/libnma_1.8.28.bb‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
SUMMARY = "NetworkManager GUI library"
2+
LICENSE = "GPLv2"
3+
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
4+
5+
DEPENDS = "glib-2.0 gtk+3 networkmanager"
6+
7+
GNOMEBASEBUILDCLASS = "meson"
8+
inherit gnomebase gobject-introspection gtk-doc gettext vala features_check
9+
10+
REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}"
11+
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
12+
13+
SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5"
14+
SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726"
15+
16+
PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
17+
PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
18+
PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes"
19+
PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info"
20+
21+
# go introspection is not supported for mipsn32/riscv32, but vapi needs it
22+
#
23+
EXTRA_OEMESON_mipsarchn32_append = " -Dvapi=false"
24+
EXTRA_OEMESON_riscv32_append = " -Dvapi=false"
25+
26+
GTKDOC_MESON_OPTION = "gtk_doc"

‎recipes-connectivity/libnma/libnma_1.8.28.bbappend‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${PV}:"
2+
3+
SRC_URI += " \
4+
file://default-certs-dir.patch \
5+
"

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

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,28 @@
1212
dnl
1313
dnl API documentation
1414
dnl
15+
--- a/meson.build
16+
+++ b/meson.build
17+
@@ -108,6 +108,7 @@ gio_dep = dependency('gio-2.0', version: '>= 2.38')
18+
gmodule_export_dep = dependency('gmodule-export-2.0')
19+
libsecret_dep = dependency('libsecret-1', version: '>= 0.18')
20+
libnma_dep = dependency('libnma', version: '>= 1.8.27')
21+
+openssl_dep = dependency('openssl', version: '>= 1.0.0')
22+
23+
m_dep = cc.find_library('m')
24+
25+
--- a/src/wireless-security/meson.build
26+
+++ b/src/wireless-security/meson.build
27+
@@ -49,7 +49,8 @@ deps = [
28+
gtk_dep,
29+
libnm_dep,
30+
libnma_dep,
31+
- libutils_libnm_dep
32+
+ libutils_libnm_dep,
33+
+ openssl_dep
34+
]
35+
36+
libwireless_security_libnm = static_library(
1537
--- a/src/wireless-security/ws-wpa-psk.c
1638
+++ b/src/wireless-security/ws-wpa-psk.c
1739
@@ -29,6 +29,7 @@
@@ -61,10 +83,10 @@
6183
/* Save PSK_FLAGS to the connection */
6284
--- a/Makefile.am
6385
+++ b/Makefile.am
64-
@@ -298,12 +298,14 @@ src_wireless_security_libwireless_securi
65-
"-I$(srcdir)/src/libnma" \
66-
-Isrc/libnma \
86+
@@ -262,12 +262,14 @@ src_wireless_security_libwireless_security_libnm_la_CPPFLAGS = \
87+
"-I$(srcdir)/src/utils" \
6788
$(GTK3_CFLAGS) \
89+
$(LIBNMA_CFLAGS) \
6890
- $(LIBNM_CFLAGS)
6991
+ $(LIBNM_CFLAGS) \
7092
+ $(OPENSSL_CFLAGS)
@@ -78,38 +100,4 @@
78100

79101
$(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
80102

81-
@@ -325,12 +327,14 @@ src_wireless_security_libwireless_securi
82-
"-I$(srcdir)/src/utils" \
83-
"-I$(srcdir)/src/libnma" \
84-
-Isrc/libnma \
85-
- $(LIBNM_GLIB_CFLAGS)
86-
+ $(LIBNM_GLIB_CFLAGS) \
87-
+ $(OPENSSL_CFLAGS)
88-
89-
src_wireless_security_libwireless_security_libnm_glib_la_LIBADD = \
90-
src/utils/libutils-libnm-glib.la \
91-
$(GTK3_LIBS) \
92-
- $(LIBNM_GLIB_LIBS)
93-
+ $(LIBNM_GLIB_LIBS) \
94-
+ $(OPENSSL_LIBS)
95-
96-
$(src_wireless_security_libwireless_security_libnm_glib_la_OBJECTS): $(wireless_security_h_gen)
97-
98-
@@ -422,13 +426,15 @@ src_libnm_gtk_libnm_gtk_la_CFLAGS = \
99-
-Isrc/libnma \
100-
$(GTK3_CFLAGS) \
101-
$(LIBNM_GLIB_CFLAGS) \
102-
- $(GUDEV_CFLAGS)
103-
+ $(GUDEV_CFLAGS) \
104-
+ $(OPENSSL_CFLAGS)
105-
106-
src_libnm_gtk_libnm_gtk_la_LIBADD = \
107-
src/wireless-security/libwireless-security-libnm-glib.la \
108-
$(GTK3_LIBS) \
109-
$(LIBNM_GLIB_LIBS) \
110-
- $(GUDEV_LIBS)
111-
+ $(GUDEV_LIBS) \
112-
+ $(OPENSSL_LIBS)
113-
114-
EXTRA_src_libnm_gtk_libnm_gtk_la_DEPENDENCIES = src/libnm-gtk/libnm-gtk.ver
115-
103+

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,3 +471,13 @@
471471
src/applet-agent.c \
472472
src/applet-agent.h \
473473
src/applet-vpn-request.c \
474+
--- a/src/meson.build
475+
+++ b/src/meson.build
476+
@@ -9,6 +9,7 @@ sources = files(
477+
'ap-menu-item.c',
478+
'applet-agent.c',
479+
'applet.c',
480+
+ 'popup-menu.c',
481+
'applet-device-bt.c',
482+
'applet-device-ethernet.c',
483+
'applet-device-wifi.c',

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

Lines changed: 0 additions & 115 deletions
This file was deleted.

0 commit comments

Comments
 (0)