Date: Thursday, January 26, 2017 @ 12:05:48 Author: heftig Revision: 287507
archrelease: copy trunk to testing-i686, testing-x86_64 Added: network-manager-applet/repos/testing-i686/PKGBUILD (from rev 287506, network-manager-applet/trunk/PKGBUILD) network-manager-applet/repos/testing-i686/crash.diff (from rev 287506, network-manager-applet/trunk/crash.diff) network-manager-applet/repos/testing-x86_64/PKGBUILD (from rev 287506, network-manager-applet/trunk/PKGBUILD) network-manager-applet/repos/testing-x86_64/crash.diff (from rev 287506, network-manager-applet/trunk/crash.diff) Deleted: network-manager-applet/repos/testing-i686/PKGBUILD network-manager-applet/repos/testing-x86_64/PKGBUILD ---------------------------+ /PKGBUILD | 186 ++++++++++++++++++++++++++++++++++++++++++++ testing-i686/PKGBUILD | 90 --------------------- testing-i686/crash.diff | 26 ++++++ testing-x86_64/PKGBUILD | 90 --------------------- testing-x86_64/crash.diff | 26 ++++++ 5 files changed, 238 insertions(+), 180 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2017-01-26 12:02:09 UTC (rev 287506) +++ testing-i686/PKGBUILD 2017-01-26 12:05:48 UTC (rev 287507) @@ -1,90 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Arjan Timmerman <ar...@archlinux.org> -# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org> -# Contributor: Tor Krill <t...@krill.nu> -# Contributor: Will Rea <sillywi...@gmail.com> - -pkgbase=network-manager-applet -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=2 -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) -options=(!emptydirs) -_commit=da51a3a0373ac6f6429ed3eb2211e56a363c8b94 # tags/1.4.4^0 -source=("git+https://git.gnome.org/browse/network-manager-applet#commit=$_commit") -sha256sums=('SKIP') - -pkgver() { - cd $pkgbase - git describe --tags | sed 's/-/+/g' -} - -prepare() { - mkdir -p nma/etc/xdg nma/usr/bin \ - nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet} - cd $pkgbase - 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 - - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -check() { - cd $pkgbase - make -k check -} - -package_nm-connection-editor() { - pkgdesc="NetworkManager GUI connection editor and widgets" - provides=("libnm-gtk=$pkgver-$pkgrel" "libnma=$pkgver-$pkgrel") - conflicts=(libnm-gtk) - replaces=(libnm-gtk) - - cd $pkgbase - make DESTDIR="$pkgdir" install - -### Split network-manager-applet - cd ../nma - mv "$pkgdir"/etc/xdg/autostart etc/xdg/ - mv "$pkgdir"/usr/bin/nm-applet usr/bin/ - mv "$pkgdir"/usr/share/GConf usr/share/ - - cd usr/share - mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/ - mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/ - - cd icons/hicolor/22x22 - mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/ - mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/ - mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/ - mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/ -} - -package_network-manager-applet() { - depends=(nm-connection-editor libmm-glib libnotify libsecret) - mv nma/* "$pkgdir" -} Copied: network-manager-applet/repos/testing-i686/PKGBUILD (from rev 287506, network-manager-applet/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2017-01-26 12:05:48 UTC (rev 287507) @@ -0,0 +1,93 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Arjan Timmerman <ar...@archlinux.org> +# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org> +# Contributor: Tor Krill <t...@krill.nu> +# Contributor: Will Rea <sillywi...@gmail.com> + +pkgbase=network-manager-applet +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 +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) +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') + +pkgver() { + cd $pkgbase + git describe --tags | sed 's/-/+/g' +} + +prepare() { + 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 + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +check() { + cd $pkgbase + make -k check +} + +package_nm-connection-editor() { + pkgdesc="NetworkManager GUI connection editor and widgets" + provides=("libnm-gtk=$pkgver-$pkgrel" "libnma=$pkgver-$pkgrel") + conflicts=(libnm-gtk) + replaces=(libnm-gtk) + + cd $pkgbase + make DESTDIR="$pkgdir" install + +### Split network-manager-applet + cd ../nma + mv "$pkgdir"/etc/xdg/autostart etc/xdg/ + mv "$pkgdir"/usr/bin/nm-applet usr/bin/ + mv "$pkgdir"/usr/share/GConf usr/share/ + + cd usr/share + mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/ + mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/ + + cd icons/hicolor/22x22 + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/ + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/ + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/ + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/ +} + +package_network-manager-applet() { + depends=(nm-connection-editor libmm-glib libnotify libsecret) + mv nma/* "$pkgdir" +} Property changes on: network-manager-applet/repos/testing-i686/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:mergeinfo Copied: network-manager-applet/repos/testing-i686/crash.diff (from rev 287506, network-manager-applet/trunk/crash.diff) =================================================================== --- testing-i686/crash.diff (rev 0) +++ testing-i686/crash.diff 2017-01-26 12:05:48 UTC (rev 287507) @@ -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 */ Property changes on: network-manager-applet/repos/testing-i686/crash.diff ___________________________________________________________________ Added: svn:mergeinfo Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2017-01-26 12:02:09 UTC (rev 287506) +++ testing-x86_64/PKGBUILD 2017-01-26 12:05:48 UTC (rev 287507) @@ -1,90 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Arjan Timmerman <ar...@archlinux.org> -# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org> -# Contributor: Tor Krill <t...@krill.nu> -# Contributor: Will Rea <sillywi...@gmail.com> - -pkgbase=network-manager-applet -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=2 -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) -options=(!emptydirs) -_commit=da51a3a0373ac6f6429ed3eb2211e56a363c8b94 # tags/1.4.4^0 -source=("git+https://git.gnome.org/browse/network-manager-applet#commit=$_commit") -sha256sums=('SKIP') - -pkgver() { - cd $pkgbase - git describe --tags | sed 's/-/+/g' -} - -prepare() { - mkdir -p nma/etc/xdg nma/usr/bin \ - nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet} - cd $pkgbase - 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 - - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -check() { - cd $pkgbase - make -k check -} - -package_nm-connection-editor() { - pkgdesc="NetworkManager GUI connection editor and widgets" - provides=("libnm-gtk=$pkgver-$pkgrel" "libnma=$pkgver-$pkgrel") - conflicts=(libnm-gtk) - replaces=(libnm-gtk) - - cd $pkgbase - make DESTDIR="$pkgdir" install - -### Split network-manager-applet - cd ../nma - mv "$pkgdir"/etc/xdg/autostart etc/xdg/ - mv "$pkgdir"/usr/bin/nm-applet usr/bin/ - mv "$pkgdir"/usr/share/GConf usr/share/ - - cd usr/share - mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/ - mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/ - - cd icons/hicolor/22x22 - mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/ - mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/ - mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/ - mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/ -} - -package_network-manager-applet() { - depends=(nm-connection-editor libmm-glib libnotify libsecret) - mv nma/* "$pkgdir" -} Copied: network-manager-applet/repos/testing-x86_64/PKGBUILD (from rev 287506, network-manager-applet/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2017-01-26 12:05:48 UTC (rev 287507) @@ -0,0 +1,93 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Arjan Timmerman <ar...@archlinux.org> +# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org> +# Contributor: Tor Krill <t...@krill.nu> +# Contributor: Will Rea <sillywi...@gmail.com> + +pkgbase=network-manager-applet +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 +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) +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') + +pkgver() { + cd $pkgbase + git describe --tags | sed 's/-/+/g' +} + +prepare() { + 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 + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +check() { + cd $pkgbase + make -k check +} + +package_nm-connection-editor() { + pkgdesc="NetworkManager GUI connection editor and widgets" + provides=("libnm-gtk=$pkgver-$pkgrel" "libnma=$pkgver-$pkgrel") + conflicts=(libnm-gtk) + replaces=(libnm-gtk) + + cd $pkgbase + make DESTDIR="$pkgdir" install + +### Split network-manager-applet + cd ../nma + mv "$pkgdir"/etc/xdg/autostart etc/xdg/ + mv "$pkgdir"/usr/bin/nm-applet usr/bin/ + mv "$pkgdir"/usr/share/GConf usr/share/ + + cd usr/share + mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/ + mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/ + + cd icons/hicolor/22x22 + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/ + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/ + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/ + mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/ +} + +package_network-manager-applet() { + depends=(nm-connection-editor libmm-glib libnotify libsecret) + mv nma/* "$pkgdir" +} Property changes on: network-manager-applet/repos/testing-x86_64/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:mergeinfo Copied: network-manager-applet/repos/testing-x86_64/crash.diff (from rev 287506, network-manager-applet/trunk/crash.diff) =================================================================== --- testing-x86_64/crash.diff (rev 0) +++ testing-x86_64/crash.diff 2017-01-26 12:05:48 UTC (rev 287507) @@ -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 */ Property changes on: network-manager-applet/repos/testing-x86_64/crash.diff ___________________________________________________________________ Added: svn:mergeinfo