Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b83d903a145408658ec903956ea47bd8b73936e8
commit b83d903a145408658ec903956ea47bd8b73936e8 Author: Baste <[email protected]> Date: Mon Jan 30 08:53:51 2017 +0100 nm-applet-1.4.4-2-x86_64 - Fix Package and add patch diff --git a/source/gnome-extra/nm-applet/FrugalBuild b/source/gnome-extra/nm-applet/FrugalBuild index 330ddd5..1edb330 100644 --- a/source/gnome-extra/nm-applet/FrugalBuild +++ b/source/gnome-extra/nm-applet/FrugalBuild @@ -5,7 +5,7 @@ pkgname=nm-applet _F_gnome_name=network-manager-applet pkgver=1.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management applet" depends=('iso-codes>=3.70-2' 'networkmanager>=1.4.2' 'libsecret>=0.18.5-2' \ 'libnotify>=0.7.6-2' ) @@ -18,7 +18,9 @@ _F_gnome_ext=".tar.xz" _F_gnome_iconcache="y" _F_gnome_devel="n" Finclude gnome gnome-scriptlet -sha1sums=('2bddbc0386d26628ee29d00f0b7c6156fa98b44e') +source=($source crash.diff) +sha1sums=('2bddbc0386d26628ee29d00f0b7c6156fa98b44e' \ + '9c9392650858c677c90b32360b0f96ea23e668e1') _F_cd_path=$_F_gnome_name-$pkgver Fconfopts+=" --disable-static --without-bluetooth --enable-more-warnings=yes --disable-migration --without-team" @@ -34,17 +36,17 @@ build() Fsplit nm-connection-editor usr/bin/nm-connection-editor Fsplit nm-connection-editor usr/share/applications/nm-connection-editor.desktop - Fsplit nm-connection-editor usr/share/nm-applet/ce-* - Fsplit nm-connection-editor usr/share/nm-applet/eap-method-* - Fsplit nm-connection-editor usr/share/nm-applet/ws-* - Fsplit nm-connection-editor usr/share/nm-applet/nm-connection-editor.ui + #Fsplit nm-connection-editor usr/share/nm-applet/ce-* + #Fsplit nm-connection-editor usr/share/nm-applet/eap-method-* + #Fsplit nm-connection-editor usr/share/nm-applet/ws-* + #Fsplit nm-connection-editor usr/share/nm-applet/nm-connection-editor.ui Fsplit nm-connection-editor usr/share/icons/hicolor/*/apps/nm-device-*.* Fsplit nm-connection-editor usr/share/icons/hicolor/*/apps/nm-no-connection.* Fsplit nm-connection-editor usr/share/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png Fsplit nm-connection-editor usr/share/glib-2.0 Fsplit nm-connection-editor usr/share/man/man1/nm-connection-editor* Fsplit nm-connection-editor usr/lib - Fsplit nm-connection-editor usr/share/libnm-gtk + #Fsplit nm-connection-editor usr/share/libnm-gtk Fsplit nm-connection-editor usr/include Fsplit nm-connection-editor usr/share/gir-1.0 Fsplit nm-connection-editor usr/share/locale diff --git a/source/gnome-extra/nm-applet/crash.diff b/source/gnome-extra/nm-applet/crash.diff new file mode 100644 index 0000000..d92db7b --- /dev/null +++ b/source/gnome-extra/nm-applet/crash.diff @@ -0,0 +1,26 @@ +diff --git i/src/connection-editor/page-master.c w/src/connection-editor/page-master.c +index 42d97da0771a7749..e73c08f5080e21fe 100644 +--- i/src/connection-editor/page-master.c ++++ w/src/connection-editor/page-master.c +@@ -196,16 +196,18 @@ get_device_for_connection (NMClient *client, NMConnection *conn) + if ( !nm_setting_connection_get_interface_name (s_con) + && !nm_connection_get_interface_name (conn)) { + NMSetting *s_hw; +- GByteArray *mac_address; ++ gchar *mac_address; + + s_hw = nm_connection_get_setting_by_name (conn, nm_setting_connection_get_connection_type (s_con)); + if (!s_hw || !g_object_class_find_property (G_OBJECT_GET_CLASS (s_hw), "mac-address")) + return NULL; + + g_object_get (G_OBJECT (s_hw), "mac-address", &mac_address, NULL); +- if (!mac_address) ++ if (!mac_address || !mac_address[0]) { ++ g_free (mac_address); + return NULL; +- g_byte_array_unref (mac_address); ++ } ++ g_free (mac_address); + } + + /* OK, now find that device */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
