main/dhcpcd-ui: upgrade to 0.7.7

2 files changed, 5 insertions, 98 deletions

diff --git a/main/dhcpcd-ui/APKBUILD b/main/dhcpcd-ui/APKBUILD
index 19078ccc84..ea8a7f8c58 100644
--- a/main/dhcpcd-ui/APKBUILD
+++ b/main/dhcpcd-ui/APKBUILD
@@ -1,43 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd-ui
-pkgver=0.7.5
-pkgrel=2
+pkgver=0.7.7
+pkgrel=0
 pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd"
 url="https://roy.marples.name/projects/dhcpcd-ui"
 arch="all"
 license="BSD-2-Clause"
 depends="dhcpcd-dbus hicolor-icon-theme"
 makedepends="glib-dev gtk+-dev dbus-dev libnotify-dev bsd-compat-headers"
-install=
 subpackages="$pkgname-doc"
-source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2
-	dont-spam.patch
-	"
-
-_builddir="$srcdir"/dhcpcd-ui-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+source="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-$pkgver.tar.xz"
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
+		--prefix=/usr
 	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" AUTOSTARTDIR=/etc/xdg/autostart install
 }
 
-sha512sums="78dba758f7cee825a1618c33b1fff9549c4e51e19fd5eebd1ae5d6a4686726ec8ad86dc1ec5384238b43589dd700979c694f48bc94e2844f1ef898292660a5d2  dhcpcd-ui-0.7.5.tar.bz2
-bf7a002a6084048c3ca6f6bf952909193839fc3e394a1a037b823dfacc47960ca698ee539a22a89f29d2c8649ae750a70737db025718224840d23ecfbe514a83  dont-spam.patch"
+sha512sums="46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d  dhcpcd-ui-0.7.7.tar.xz"
diff --git a/main/dhcpcd-ui/dont-spam.patch b/main/dhcpcd-ui/dont-spam.patch
deleted file mode 100644
index b819b1f802..0000000000
--- a/main/dhcpcd-ui/dont-spam.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From ed60b357213cb8d90e10483e37fa343ddb346a0c Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Mon, 6 Nov 2017 13:45:47 +0000
-Subject: Don't spam the user about new AP's if we're connected already.
-
----
- src/dhcpcd-gtk/main.c       | 45 ++++++++++++++++++++++++---------------------
- src/dhcpcd-qt/dhcpcd-qt.cpp | 39 +++++++++++++++++++++++----------------
- 2 files changed, 47 insertions(+), 37 deletions(-)
-
-diff --git a/src/dhcpcd-gtk/main.c b/src/dhcpcd-gtk/main.c
-index 00e18d8..6444bf8 100644
---- a/src/dhcpcd-gtk/main.c
-+++ b/src/dhcpcd-gtk/main.c
-@@ -584,9 +584,8 @@ dhcpcd_wpa_scan_cb(DHCPCD_WPA *wpa, _unused void *data)
- 	DHCPCD_IF *i;
- 	WI_SCAN *w;
- 	DHCPCD_WI_SCAN *scans, *s1, *s2;
--	char *txt, *t;
--	int lerrno, fd;
- 	const char *msg;
-+	int lerrno, fd;
- 
- 	/* This could be a new WPA so watch it */
- 	fd = dhcpcd_wpa_get_fd(wpa);
-@@ -621,27 +620,31 @@ dhcpcd_wpa_scan_cb(DHCPCD_WPA *wpa, _unused void *data)
- 		TAILQ_INIT(&w->menus);
- 		TAILQ_INSERT_TAIL(&wi_scans, w, next);
- 	} else {
--		txt = NULL;
--		msg = N_("New Access Point");
--		for (s1 = scans; s1; s1 = s1->next) {
--			for (s2 = w->scans; s2; s2 = s2->next)
--				if (g_strcmp0(s1->ssid, s2->ssid) == 0)
--					break;
--			if (s2 == NULL) {
--				if (txt == NULL)
--					txt = g_strdup(s1->ssid);
--				else {
--					msg = N_("New Access Points");
--					t = g_strconcat(txt, "\n",
--					    s1->ssid, NULL);
--					g_free(txt);
--					txt = t;
-+		if (!i->up) {
-+			char *txt, *t;
-+
-+			txt = NULL;
-+			msg = N_("New Access Point");
-+			for (s1 = scans; s1; s1 = s1->next) {
-+				for (s2 = w->scans; s2; s2 = s2->next)
-+					if (g_strcmp0(s1->ssid, s2->ssid) == 0)
-+						break;
-+				if (s2 == NULL) {
-+					if (txt == NULL)
-+						txt = g_strdup(s1->ssid);
-+					else {
-+						msg = N_("New Access Points");
-+						t = g_strconcat(txt, "\n",
-+								s1->ssid, NULL);
-+						g_free(txt);
-+						txt = t;
-+					}
- 				}
- 			}
--		}
--		if (txt) {
--			notify(msg, txt, "network-wireless");
--			g_free(txt);
-+			if (txt) {
-+				notify(msg, txt, "network-wireless");
-+				g_free(txt);
-+			}
- 		}
- 		menu_update_scans(w, scans);
- 	}