Skip to content

Commit ea7e98a

Browse files
committed
Revising nm applet/backend patches
Revising patches based on source code updates/refactoring and changes to build systems with new network-manager and network-manager-applet versions
1 parent 4f973ed commit ea7e98a

24 files changed

+451
-3996
lines changed

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.

recipes-connectivity/network-manager-applet/network-manager-applet-1.8.22/disable-auto-ethernet.patch

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

recipes-connectivity/network-manager-applet/network-manager-applet-1.8.22/disable-available-to-all-users-checkbox.patch

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

recipes-connectivity/network-manager-applet/network-manager-applet-1.8.22/disable-show-password.patch

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

0 commit comments

Comments
 (0)