network-manager-applet: update to 1.8.14.
This commit is contained in:
parent
0219186dfc
commit
59beda6c66
2 changed files with 13 additions and 61 deletions
|
@ -1,47 +0,0 @@
|
||||||
--- shared/nm-utils/nm-compat.c
|
|
||||||
+++ shared/nm-utils/nm-compat.c
|
|
||||||
@@ -40,30 +40,37 @@
|
|
||||||
{
|
|
||||||
guint len;
|
|
||||||
const char **keys = NULL;
|
|
||||||
- gs_unref_ptrarray GPtrArray *a = NULL;
|
|
||||||
+ GPtrArray *a;
|
|
||||||
|
|
||||||
nm_assert (NM_IS_SETTING_VPN (setting));
|
|
||||||
|
|
||||||
- a = g_ptr_array_new ();
|
|
||||||
+ if (is_secrets)
|
|
||||||
+ len = nm_setting_vpn_get_num_secrets (setting);
|
|
||||||
+ else
|
|
||||||
+ len = nm_setting_vpn_get_num_data_items (setting);
|
|
||||||
+
|
|
||||||
+ a = g_ptr_array_sized_new (len + 1);
|
|
||||||
+
|
|
||||||
if (is_secrets)
|
|
||||||
nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
|
|
||||||
else
|
|
||||||
nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
|
|
||||||
- len = a->len;
|
|
||||||
|
|
||||||
- if (a->len) {
|
|
||||||
+ len = a->len;
|
|
||||||
+ if (len) {
|
|
||||||
g_ptr_array_sort (a, nm_strcmp_p);
|
|
||||||
g_ptr_array_add (a, NULL);
|
|
||||||
- keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
|
|
||||||
+ keys = g_memdup (a->pdata, a->len * sizeof (gpointer));
|
|
||||||
|
|
||||||
/* we need to cache the keys *somewhere*. */
|
|
||||||
g_object_set_qdata_full (G_OBJECT (setting),
|
|
||||||
is_secrets
|
|
||||||
? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
|
|
||||||
: NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
|
|
||||||
- keys,
|
|
||||||
+ g_ptr_array_free (a, FALSE),
|
|
||||||
(GDestroyNotify) g_strfreev);
|
|
||||||
- }
|
|
||||||
+ } else
|
|
||||||
+ g_ptr_array_free (a, TRUE);
|
|
||||||
|
|
||||||
NM_SET_OUT (out_length, len);
|
|
||||||
return keys;
|
|
|
@ -1,24 +1,23 @@
|
||||||
# Template file for 'network-manager-applet'
|
# Template file for 'network-manager-applet'
|
||||||
pkgname=network-manager-applet
|
pkgname=network-manager-applet
|
||||||
version=1.8.10
|
version=1.8.14
|
||||||
revision=2
|
revision=1
|
||||||
lib32disabled=yes
|
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
|
configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)"
|
||||||
hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel
|
hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config
|
||||||
$(vopt_if gir gobject-introspection)"
|
$(vopt_if gir 'gobject-introspection')"
|
||||||
makedepends="
|
makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel
|
||||||
dbus-glib-devel libgnome-keyring-devel libsecret-devel
|
libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel
|
||||||
NetworkManager-devel gtk+3-devel libnotify-devel
|
polkit-devel"
|
||||||
ModemManager-devel polkit-devel libgudev-devel iso-codes
|
depends="NetworkManager hicolor-icon-theme iso-codes"
|
||||||
jansson-devel"
|
|
||||||
depends="iso-codes NetworkManager>=1.0 hicolor-icon-theme"
|
|
||||||
short_desc="NetworkManager panel applet for GNOME"
|
short_desc="NetworkManager panel applet for GNOME"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
|
license="GPL-2.0-or-later"
|
||||||
homepage="http://www.gnome.org/projects/NetworkManager/"
|
homepage="http://www.gnome.org/projects/NetworkManager/"
|
||||||
license="GPL-2"
|
changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
|
||||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=0adc4bfae8b49f7a1d929c22ef20933bd41fb4a8b458280f44c65f9e45b4c9c3
|
checksum=ca9b1233721f700a7190b98eea69ce6d0ccf74fbfde173ac868a4ec7a78840cb
|
||||||
|
lib32disabled=yes
|
||||||
|
|
||||||
# Package build options
|
# Package build options
|
||||||
build_options="gir"
|
build_options="gir"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue