From 30fa5c30a7e3f5c4b239ffbf64f0c608ade400b3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Thu, 19 Nov 2015 23:31:04 +0100
Subject: [PATCH] wireshark: update to 2.0.0.

---
 common/shlibs              |  6 +++---
 srcpkgs/wireshark/template | 35 +++++++++--------------------------
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bd73f233711..a5b867ceaf5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1548,9 +1548,9 @@ libdovecot-lda.so.0 dovecot-2.2.11_2
 libnetapi.so.0 samba-3.6.23_1
 libsmbsharemodes.so.0 samba-3.6.23_1
 libmysqld.so.18 libmariadbclient-5.5.36_1
-libwsutil.so.4 libwireshark-1.12.0_1
-libwiretap.so.4 libwireshark-1.12.0_1
-libwireshark.so.5 libwireshark-1.12.0_1
+libwsutil.so.6 libwireshark-2.0.0_1
+libwiretap.so.5 libwireshark-2.0.0_1
+libwireshark.so.6 libwireshark-2.0.0_1
 libfreerdp-core.so.1.0 libfreerdp-1.0.2_2
 libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2
 libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index be8cd83d2d4..23e202fccb0 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,11 +1,11 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=1.12.8
+version=2.0.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl --with-pcap --with-libcap --with-zlib --with-lua
  --with-krb5 --with-gtk3=yes --without-portaudio CC_FOR_BUILD=cc"
-hostmakedepends="pkg-config flex perl python-devel mit-krb5-devel libtool"
+hostmakedepends="pkg-config flex perl python-devel mit-krb5-devel automake libtool"
 makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel
  geoip-devel libgcrypt-devel gtk+3-devel libcap-devel sbc-devel"
 depends="libcap-progs"
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 homepage="http://www.wireshark.org"
 license="GPL-2"
 distfiles="http://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2"
-checksum=357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7
+checksum=90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd
 system_groups="wireshark"
 subpackages="libwireshark libwireshark-devel wireshark-gtk"
 
@@ -29,28 +29,11 @@ else
 fi
 
 pre_configure() {
-	libtoolize -f
+	autoreconf -fi
 	find -type f -name Makefile.in -exec sed -i "s/^LIBS = .*/\0 -ldl/" {} \;
 }
 post_install() {
 	local _includeDir=usr/include/wireshark
-	# Icons
-	for d in 16 32 48; do
-		vinstall image/hi${d}-app-wireshark.png 644 \
-			usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png
-	done
-
-	 for d in 16 24 32 48 64 128 256 ; do
-		vinstall image/WiresharkDoc-${d}.png 644 \
-			usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png
-	 done
-
-	# Desktop Launcher
-	vinstall wireshark.desktop 644 usr/share/applications
-	if [ -z "$CROSS_BUILD" ]; then
-		sed -i 's/^Name.*=Wireshark/& (Qt)/g;/Exec=/s/wireshark/&-qt/g' wireshark.desktop
-		vinstall wireshark.desktop 644 usr/share/applications wireshark-qt.desktop
-	fi
 
 	# Headers
 	vmkdir $_includeDir
@@ -84,10 +67,9 @@ wireshark-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} hicolor-icon-theme desktop-file-utils"
 	short_desc+=" - GTK+ frontend"
 	pkg_install() {
-		vmove usr/bin/wireshark
+		vmove usr/bin/wireshark-gtk
 		vmove usr/share/icons
-		vmove usr/share/man/man1/wireshark.1
-		vmove usr/share/applications/wireshark.desktop
+		vmove usr/share/applications/wireshark-gtk.desktop
 	}
 }
 wireshark-qt_package() {
@@ -95,7 +77,8 @@ wireshark-qt_package() {
 	depends="${sourcepkg}>=${version}_${revision} desktop-file-utils"
 	short_desc+=" - Qt frontend"
 	pkg_install() {
-		vmove usr/bin/wireshark-qt
-		vmove usr/share/applications/wireshark-qt.desktop
+		vmove usr/bin/wireshark
+		vmove usr/share/man/man1/wireshark.1
+		vmove usr/share/applications/wireshark.desktop
 	}
 }