Date: Monday, March 6, 2017 @ 19:22:06 Author: heftig Revision: 290059
1.4.6-1 Modified: network-manager-applet/trunk/PKGBUILD Deleted: network-manager-applet/trunk/crash.diff ------------+ PKGBUILD | 40 ++++++++++++++++++++-------------------- crash.diff | 26 -------------------------- 2 files changed, 20 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-03-06 19:18:27 UTC (rev 290058) +++ PKGBUILD 2017-03-06 19:22:06 UTC (rev 290059) @@ -10,18 +10,16 @@ pkgname=(nm-connection-editor network-manager-applet) pkgdesc="Applet for managing network connections" url="https://wiki.gnome.org/Projects/NetworkManager/"; -pkgver=1.4.4 -pkgrel=3 +pkgver=1.4.6 +pkgrel=1 arch=(i686 x86_64) license=(GPL2 LGPL2.1) depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes) -makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git) +makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git gtk-doc) options=(!emptydirs) -_commit=da51a3a0373ac6f6429ed3eb2211e56a363c8b94 # tags/1.4.4^0 -source=("git+https://git.gnome.org/browse/network-manager-applet#commit=$_commit"; - crash.diff) -sha256sums=('SKIP' - 'b529c587dd541a3ffb4f364deab0e17e3c7c02b9ca8109f824185660c53c7c5b') +_commit=582194699e34b9a2f7d0ea19e07f888c099ad966 # tags/1.4.6^0 +source=("git+https://git.gnome.org/browse/network-manager-applet#commit=$_commit";) +sha256sums=('SKIP') pkgver() { cd $pkgbase @@ -32,23 +30,25 @@ mkdir -p nma/etc/xdg nma/usr/bin \ nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet} cd $pkgbase - patch -Np1 -i ../crash.diff NOCONFIGURE=1 ./autogen.sh } build() { cd $pkgbase - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/NetworkManager \ - --disable-maintainer-mode \ - --disable-migration \ - --disable-static \ - --enable-gtk-doc \ - --with-modem-manager-1 \ - --with-team \ - --with-wwan \ - --without-appindicator + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + runstatedir=/run \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/NetworkManager \ + --disable-maintainer-mode \ + --disable-static \ + --enable-gtk-doc \ + --enable-introspection \ + --enable-ld-gc \ + --with-team \ + --with-wwan \ + --without-appindicator # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool Deleted: crash.diff =================================================================== --- crash.diff 2017-03-06 19:18:27 UTC (rev 290058) +++ crash.diff 2017-03-06 19:22:06 UTC (rev 290059) @@ -1,26 +0,0 @@ -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 */
