From 9a9ad15e5127360d7dab55623ab7fab51a4d5a31 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Sat, 28 Apr 2018 14:26:04 +0700
Subject: [PATCH] network/wireshark: Updated for version 2.6.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/wireshark/README               |  2 ++
 network/wireshark/wireshark.SlackBuild | 16 ++++++----------
 network/wireshark/wireshark.info       |  8 ++++----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/network/wireshark/README b/network/wireshark/README
index 62deab1e40..03021c4631 100644
--- a/network/wireshark/README
+++ b/network/wireshark/README
@@ -30,3 +30,5 @@ Optional dependencies:
 - spandsp
 - snappy
 - lz4
+
+NOTE: Wireshark 2.6 is the last release to support the legacy GTK-based UI.
diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild
index 11b5a15f05..499132efd5 100644
--- a/network/wireshark/wireshark.SlackBuild
+++ b/network/wireshark/wireshark.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for wireshark
 
 # Copyright 2008-2014  Michiel van Wessem, Leicester, United Kingdom
-# Copyright 2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2017-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
 # Originally written by Jick Nan (jick.nan@gmail.com)
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # Modified by Mario Preksavec <mario@slackware.hr>
 
 PRGNAM=wireshark
-VERSION=${VERSION:-2.4.6}
+VERSION=${VERSION:-2.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -104,20 +104,16 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/include/$PRGNAM/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
-install -m644 config.h register.h ws_diag_control.h ws_symbol_export.h $PKG/usr/include/$PRGNAM
+install -m644 config.h ws_diag_control.h ws_symbol_export.h $PKG/usr/include/$PRGNAM
   for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
     install -m644 $d/*.h $PKG/usr/include/$PRGNAM/$d
   done
 
 mkdir -p $PKG/usr/share/applications
 cp $PRGNAM.desktop $PKG/usr/share/applications
-mkdir -p $PKG/usr/share/icons/{hi,lo}color/{16x16,32x32,48x48}/apps
-for col in {lo,hi}; do
-  for size in {16,32,48}; do
-    cp image/${col}${size}-app-$PRGNAM.png \
-      $PKG/usr/share/icons/${col}color/${size}x${size}/apps/$PRGNAM.png
-  done
-done
+
+# Remove any .la files
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS* COPYING ChangeLog INSTALL* NEWS README* doc/READM* \
diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info
index 44e1065df9..57dcb624a6 100644
--- a/network/wireshark/wireshark.info
+++ b/network/wireshark/wireshark.info
@@ -1,10 +1,10 @@
 PRGNAM="wireshark"
-VERSION="2.4.6"
+VERSION="2.6.0"
 HOMEPAGE="https://www.wireshark.org/"
-DOWNLOAD="https://1.as.dl.wireshark.org/src/wireshark-2.4.6.tar.xz"
-MD5SUM="8cfb73e286dd6427ca4405e6e802d13e"
+DOWNLOAD="https://1.as.dl.wireshark.org/src/wireshark-2.6.0.tar.xz"
+MD5SUM="d9f9e206977da14427bfd66b582601ae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 lua GeoIP"
+REQUIRES="qt5 lua"
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"