Skip to content

Commit 4f973ed

Browse files
committed
Add libnma package
libnma is no longer checked in with network-manager-applet, so adding package separately and patching the necessary file here
1 parent 5d57657 commit 4f973ed

File tree

5 files changed

+68
-90
lines changed

5 files changed

+68
-90
lines changed

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
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"
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.8.22/default-certs-dir.patch

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

recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bbappend

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ SRC_URI += " \
66
file://always-use-psk-hash.patch \
77
file://disable-show-password.patch \
88
file://disable-auto-ethernet.patch \
9-
file://default-certs-dir.patch \
109
file://org.openxt.nmapplet.xml \
1110
"
1211

0 commit comments

Comments
 (0)