main/wireshark: enable qt gui

3 files changed, 14 insertions, 34 deletions

diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index 6f82f6e2b..7f09cca87 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wireshark
 pkgver=1.12.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
 arch="all"
@@ -10,12 +10,10 @@ license="GPL2+"
 depends="bash"
 makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev
 	gtk+3.0-dev c-ares-dev pcre-dev gnutls-dev libgcrypt-dev openssl-dev
-	libnl3-dev"
+	libnl3-dev qt5-qtbase-dev"
 install=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark"
-source="http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2
-	wireshark.desktop
-	wireshark.png"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-common tshark"
+source="http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -41,20 +39,13 @@ build() {
 		--infodir=/usr/share/info \
 		--with-ssl \
 		--with-gnutls \
-		--disable-text2pcap \
-		--disable-dftest \
-		--disable-randpkt \
 		|| return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" install || return 1
-	install -Dm644 "$srcdir"/wireshark.png \
-		"$pkgdir"/usr/share/icons/wireshark.png
-	install -Dm644 "$srcdir"/wireshark.desktop \
-		"$pkgdir"/usr/share/applications/wireshark.desktop
+	make -j1 DESTDIR="$pkgdir" install install_desktop_files || return 1
 	find "$pkgdir" -name '*.la' -delete
 }
 
@@ -69,7 +60,7 @@ common() {
 	# move all bins except wireshark
 	for i in "$pkgdir"/usr/bin/*; do
 		case "$i" in
-			*/tshark|*/wireshark) continue;;
+			*/tshark|*/wireshark|*-qt) continue;;
 		esac
 		mv "$i" "$subpkgdir"/usr/bin/
 	done
@@ -81,12 +72,11 @@ tshark() {
 	mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark
 }
 
-md5sums="8dcfe451d8769901129809d2e19c1fb7  wireshark-1.12.0.tar.bz2
-504ede44c02b2a52f6cbd3bffdf93b8d  wireshark.desktop
-e771800a8c977fe223583a453bc27397  wireshark.png"
-sha256sums="0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7  wireshark-1.12.0.tar.bz2
-10c8b5bdd1d161454c93df166f39b2bae72efe6021beb61d84dd65dc329260fe  wireshark.desktop
-a9f6d78dd64a87acd1b600222156b9fc26e7ccbbc43fc77c1da138908bdb2d3c  wireshark.png"
-sha512sums="03c55106e2b4d5690d0b5fe74b2f4723f07ea9f9a6ca0f54b006045ec4bda47cb31dd3aa8c1879375844f6e6b49f1ffd4a6bb2e34564d43d6e0a25a08302b902  wireshark-1.12.0.tar.bz2
-6e1eab7793a97377017be9126b7d25bd9c10d2b0e06be1e83e66ac2ea64dce5c4f8f7783d483921867241d298eb0ac82ff3f9910e90c2065125bff9a3856f52e  wireshark.desktop
-b421575dbc3d496a8c3d5485929c161c06d3403bff2fef4f1db07b1db729ca173c6e89cb648d127c02800359975d5e0880c344dc58fa9d24dde570a862bdd7d4  wireshark.png"
+qt() {
+	pkgdesc="wireshark - Qt GUI"
+	install -d "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/wireshark-qt "$subpkgdir"/usr/bin/
+}
+md5sums="8dcfe451d8769901129809d2e19c1fb7  wireshark-1.12.0.tar.bz2"
+sha256sums="0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7  wireshark-1.12.0.tar.bz2"
+sha512sums="03c55106e2b4d5690d0b5fe74b2f4723f07ea9f9a6ca0f54b006045ec4bda47cb31dd3aa8c1879375844f6e6b49f1ffd4a6bb2e34564d43d6e0a25a08302b902  wireshark-1.12.0.tar.bz2"
diff --git a/main/wireshark/wireshark.desktop b/main/wireshark/wireshark.desktop
deleted file mode 100644
index f4317f6d0..000000000
--- a/main/wireshark/wireshark.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-GenericName=Wireshark
-Comment=Network protocol analyzer
-Name=wireshark
-Exec=wireshark
-Icon=/usr/share/icons/wireshark.png
-Type=Application
-Terminal=false
-Categories=Application;Network;
diff --git a/main/wireshark/wireshark.png b/main/wireshark/wireshark.png
deleted file mode 100644
index 4e4026304..000000000
--- a/main/wireshark/wireshark.png
+++ /dev/null