From bb0397669c5fcbe51e7be4849aeb23c8b188154c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 4 Sep 2017 20:53:34 +0000
Subject: main/wpa_supplicant: modernize and use qt5

---
 main/wpa_supplicant/APKBUILD | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'main/wpa_supplicant')

diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD
index 9ebdd7b034..2ea796a37a 100644
--- a/main/wpa_supplicant/APKBUILD
+++ b/main/wpa_supplicant/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wpa_supplicant
 pkgver=2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
 url="https://w1.fi/wpa_supplicant/"
 arch="all"
 license="BSD"
 subpackages="$pkgname-doc $pkgname-gui"
 depends="dbus"
-makedepends="libressl-dev dbus-dev libnl3-dev qt-dev pcsc-lite-dev"
+makedepends="libressl-dev dbus-dev libnl3-dev qt5-qtbase-dev pcsc-lite-dev"
 source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz
 	wpa_supplicant.initd
 	wpa_supplicant.confd
@@ -22,26 +22,27 @@ source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz
 builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$builddir"
-	default_prepare || return 1
+	default_prepare
 
 	# Copy our configuration file to the build directory
-	cp "$srcdir"/config "$builddir"/wpa_supplicant/.config || return 1
+	cp "$srcdir"/config "$builddir"/wpa_supplicant/.config
 }
 
 build() {
 	cd "$builddir"/wpa_supplicant
-	make LIBDIR=/lib BINDIR=/sbin || return 1
-	make wpa_gui-qt4 || return 1
-	make eapol_test || return 1
+	make LIBDIR=/lib BINDIR=/sbin
+	qmake-qt5 -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro
+	make -C wpa_gui-qt4
+	make eapol_test
 }
 
 package() {
 	cd "$builddir"/wpa_supplicant
-	make DESTDIR="$pkgdir" LIBDIR=/lib BINDIR=/sbin install || return 1
+	make DESTDIR="$pkgdir" LIBDIR=/lib BINDIR=/sbin install
 	install -Dm644 wpa_supplicant.conf \
-		"$pkgdir"/usr/share/doc/wpa_supplicant/examples/wpa_supplicant.conf || return 1
+		"$pkgdir"/usr/share/doc/wpa_supplicant/examples/wpa_supplicant.conf
 	install -Dm755 "$srcdir"/wpa_cli.sh \
-		"$pkgdir"/etc/wpa_supplicant/wpa_cli.sh || return 1
+		"$pkgdir"/etc/wpa_supplicant/wpa_cli.sh
 
 	local man=
 	for man in doc/docbook/*.?; do
@@ -49,7 +50,7 @@ package() {
 			"$pkgdir"/usr/share/man/man${man##*.}/${man##*/} \
 			|| return 1
 	done
-	install -Dm755 eapol_test "$pkgdir"/sbin/eapol_test || return 1
+	install -Dm755 eapol_test "$pkgdir"/sbin/eapol_test
 
 	# gui
 	install -d "$pkgdir"/usr/bin
@@ -57,18 +58,18 @@ package() {
 		|| return 1
 
 	# dbus
-	cd dbus || return 1
+	cd dbus
 	install -d "$pkgdir"/etc/dbus-1/system.d
 	install -m644 dbus-wpa_supplicant.conf \
-		"$pkgdir"/etc/dbus-1/system.d/wpa_supplicant.conf || return 1
+		"$pkgdir"/etc/dbus-1/system.d/wpa_supplicant.conf
 	install -d "$pkgdir"/usr/share/dbus-1/system-services
 	install fi.epitest.hostap.WPASupplicant.service \
-		"$pkgdir"/usr/share/dbus-1/system-services || return 1
+		"$pkgdir"/usr/share/dbus-1/system-services
 	install -d "$pkgdir"/var/run/wpa_supplicant
 	install -Dm755 "$srcdir"/wpa_supplicant.initd \
-		"$pkgdir"/etc/init.d/wpa_supplicant || return 1
+		"$pkgdir"/etc/init.d/wpa_supplicant
 	install -Dm644 "$srcdir"/wpa_supplicant.confd \
-		"$pkgdir"/etc/conf.d/wpa_supplicant || return 1
+		"$pkgdir"/etc/conf.d/wpa_supplicant
 }
 
 gui() {
-- 
cgit v1.2.3