Date: Tuesday, May 29, 2018 @ 20:09:46 Author: heftig Revision: 325123
archrelease: copy trunk to extra-x86_64 Added: network-manager-applet/repos/extra-x86_64/PKGBUILD (from rev 325122, network-manager-applet/trunk/PKGBUILD) network-manager-applet/repos/extra-x86_64/fix-double-free.diff (from rev 325122, network-manager-applet/trunk/fix-double-free.diff) Deleted: network-manager-applet/repos/extra-x86_64/PKGBUILD ----------------------+ PKGBUILD | 152 +++++++++++++++++++++++++------------------------ fix-double-free.diff | 12 +++ 2 files changed, 90 insertions(+), 74 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-05-29 20:09:04 UTC (rev 325122) +++ PKGBUILD 2018-05-29 20:09:46 UTC (rev 325123) @@ -1,74 +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.8.12 -pkgrel=1 -arch=(x86_64) -license=(GPL LGPL) -depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr) -makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git gtk-doc meson) -options=(!emptydirs) -_commit=19b82d620395ac337b98194946086f99fd2f7351 # tags/1.8.12^0 -source=("git+https://gitlab.gnome.org/GNOME/network-manager-applet.git#commit=$_commit") -sha256sums=('SKIP') - -pkgver() { - cd $pkgbase - git describe --tags | sed 's/-dev/dev/;s/-/+/g' -} - -prepare() { - cd $pkgbase -} - -build() { - arch-meson $pkgbase build -Dselinux=false - ninja -C build -} - -check() { - cd build - meson test -} - -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) - - DESTDIR="$pkgdir" ninja -C build install - -### Split network-manager-applet - mkdir -p nma/etc/xdg nma/usr/bin \ - nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-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 networkmanager) - mv nma/* "$pkgdir" -} Copied: network-manager-applet/repos/extra-x86_64/PKGBUILD (from rev 325122, network-manager-applet/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-05-29 20:09:46 UTC (rev 325123) @@ -0,0 +1,78 @@ +# $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.8.12 +pkgrel=2 +arch=(x86_64) +license=(GPL LGPL) +depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr) +makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git gtk-doc meson) +options=(!emptydirs) +_commit=19b82d620395ac337b98194946086f99fd2f7351 # tags/1.8.12^0 +source=("git+https://gitlab.gnome.org/GNOME/network-manager-applet.git#commit=$_commit" + fix-double-free.diff) +sha256sums=('SKIP' + '1eb70bb68f27ee8451f287e280568d7098a095d3919d86b7959852d0b6e4e838') + +pkgver() { + cd $pkgbase + git describe --tags | sed 's/-dev/dev/;s/-/+/g' +} + +prepare() { + cd $pkgbase + # https://bugs.archlinux.org/task/58767 + patch -Np1 -i ../fix-double-free.diff +} + +build() { + arch-meson $pkgbase build -Dselinux=false + ninja -C build +} + +check() { + cd build + meson test +} + +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) + + DESTDIR="$pkgdir" ninja -C build install + +### Split network-manager-applet + mkdir -p nma/etc/xdg nma/usr/bin \ + nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-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 networkmanager) + mv nma/* "$pkgdir" +} Property changes on: network-manager-applet/repos/extra-x86_64/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: svn:mergeinfo Copied: network-manager-applet/repos/extra-x86_64/fix-double-free.diff (from rev 325122, network-manager-applet/trunk/fix-double-free.diff) =================================================================== --- fix-double-free.diff (rev 0) +++ fix-double-free.diff 2018-05-29 20:09:46 UTC (rev 325123) @@ -0,0 +1,12 @@ +diff --git i/src/ap-menu-item.c w/src/ap-menu-item.c +index 92953c04..7d614f45 100644 +--- i/src/ap-menu-item.c ++++ w/src/ap-menu-item.c +@@ -327,7 +327,6 @@ finalize (GObject *object) + g_free (priv->ssid_string); + + g_slist_free_full (priv->dupes, g_free); +- g_slist_free (priv->dupes); + + G_OBJECT_CLASS (nm_network_menu_item_parent_class)->finalize (object); + } Property changes on: network-manager-applet/repos/extra-x86_64/fix-double-free.diff ___________________________________________________________________ Added: svn:mergeinfo