wireshark: fix building with Qt 5.11

7 files changed, 71 insertions, 25 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index f4edaf6cd93..b971df7c5e6 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.189 2018/05/27 12:20:52 wiz Exp $
+# $NetBSD: Makefile,v 1.190 2018/06/21 12:22:10 adam Exp $
 
 DISTNAME=	wireshark-2.6.1
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://www.wireshark.org/download/src/
 EXTRACT_SUFX=	.tar.xz
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index 2cf11bcf1c7..9ab6fe289f0 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2018/05/27 12:20:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.37 2018/06/21 12:22:10 adam Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
@@ -672,32 +672,32 @@ man/man1/udpdump.1
 ${PLIST.mans}man/man1/wireshark.1
 man/man4/extcap.4
 man/man4/wireshark-filter.4
-${PLIST.icons}share/appdata/wireshark.appdata.xml
-${PLIST.icons}share/applications/wireshark-gtk.desktop
-${PLIST.icons}share/applications/wireshark.desktop
-${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png
+share/appdata/wireshark.appdata.xml
+share/applications/wireshark-gtk.desktop
+share/applications/wireshark.desktop
+share/icons/hicolor/128x128/apps/wireshark.png
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png
+share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png
+share/icons/hicolor/16x16/apps/wireshark.png
 ${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/24x24/apps/wireshark.png
+share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png
+share/icons/hicolor/24x24/apps/wireshark.png
 ${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/256x256/apps/wireshark.png
+share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png
+share/icons/hicolor/256x256/apps/wireshark.png
 ${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/32x32/apps/wireshark.png
+share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png
+share/icons/hicolor/32x32/apps/wireshark.png
 ${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/48x48/apps/wireshark.png
+share/icons/hicolor/32x32/mimetypes/application-wireshark-doc.png
+share/icons/hicolor/48x48/apps/wireshark.png
 ${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/64x64/apps/wireshark.png
+share/icons/hicolor/48x48/mimetypes/application-wireshark-doc.png
+share/icons/hicolor/64x64/apps/wireshark.png
 ${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png
-${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png
-${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg
-${PLIST.icons}share/mime/packages/wireshark.xml
+share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png
+share/icons/hicolor/scalable/apps/wireshark.svg
+share/mime/packages/wireshark.xml
 share/wireshark/AUTHORS-SHORT
 share/wireshark/COPYING
 share/wireshark/androiddump.html
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index ef95a84e3e1..b89a0bbd056 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.111 2018/05/27 12:20:52 wiz Exp $
+$NetBSD: distinfo,v 1.112 2018/06/21 12:22:10 adam Exp $
 
 SHA1 (wireshark-2.6.1.tar.xz) = a0cf45d99ab9a42e087af150cbdec08650b9977a
 RMD160 (wireshark-2.6.1.tar.xz) = a7f187de0c44b801b51e8b72df41681bbc1835f8
 SHA512 (wireshark-2.6.1.tar.xz) = e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
 Size (wireshark-2.6.1.tar.xz) = 28386244 bytes
+SHA1 (patch-ui_qt_packet__format__group__box.cpp) = 05d45f3aaa246622ed16a8b7819587ca89e66f14
+SHA1 (patch-ui_qt_time__shift__dialog.cpp) = 4622d8828fee3baf625ee00e36f03cca9c491d58
+SHA1 (patch-ui_qt_wireless__frame.cpp) = 4ba3a2fc90ae0058be2c27b6313d6ff777b9adac
diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk
index c7d2ffbe04e..b3c8f9ddfec 100644
--- a/net/wireshark/options.mk
+++ b/net/wireshark/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2018/05/03 23:02:39 wiz Exp $
+# $NetBSD: options.mk,v 1.19 2018/06/21 12:22:10 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.wireshark
 PKG_SUPPORTED_OPTIONS=		gtk3 lua
@@ -64,9 +64,9 @@ INSTALLATION_DIRS+=	share/icons/hicolor/scalable/apps
 ICON_SIZES=		16 32 48
 MIMEICON_SIZES=		16 24 32 48 64 128 256
 
-.      for d in ${ICON_SIZES}
+.    for d in ${ICON_SIZES}
 INSTALLATION_DIRS+=	share/icons/hicolor/${d}x${d}/apps
-.      endfor
+.    endfor
 
 .    for d in ${MIMEICON_SIZES}
 INSTALLATION_DIRS+=	share/icons/hicolor/${d}x${d}/mimetypes
diff --git a/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp b/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp
new file mode 100644
index 00000000000..f36db70e020
--- /dev/null
+++ b/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-ui_qt_packet__format__group__box.cpp,v 1.1 2018/06/21 12:22:10 adam Exp $
+
+Fix for Qt 5.11.
+
+--- ui/qt/packet_format_group_box.cpp.orig	2018-06-21 09:11:22.000000000 +0000
++++ ui/qt/packet_format_group_box.cpp
+@@ -10,6 +10,7 @@
+ #include <ui_packet_format_group_box.h>
+ 
+ #include <QStyle>
++#include <QStyleOption>
+ 
+ PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
+     QGroupBox(parent),
diff --git a/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp b/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp
new file mode 100644
index 00000000000..ef3ff639198
--- /dev/null
+++ b/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-ui_qt_time__shift__dialog.cpp,v 1.1 2018/06/21 12:22:10 adam Exp $
+
+Fix for Qt 5.11.
+
+--- ui/qt/time_shift_dialog.cpp.orig	2018-06-21 09:15:54.000000000 +0000
++++ ui/qt/time_shift_dialog.cpp
+@@ -14,6 +14,7 @@
+ #include <ui/time_shift.h>
+ #include <ui/qt/utils/tango_colors.h>
+ 
++#include <QStyleOption>
+ 
+ TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
+     QDialog(parent),
diff --git a/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp b/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp
new file mode 100644
index 00000000000..8c051361114
--- /dev/null
+++ b/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-ui_qt_wireless__frame.cpp,v 1.1 2018/06/21 12:22:10 adam Exp $
+
+Fix for Qt 5.11.
+
+--- ui/qt/wireless_frame.cpp.orig	2018-06-21 09:19:08.000000000 +0000
++++ ui/qt/wireless_frame.cpp
+@@ -23,6 +23,7 @@
+ #include <wsutil/frequency-utils.h>
+ 
+ #include <QProcess>
++#include <QAbstractItemView>
+ 
+ // To do:
+ // - Disable or hide invalid channel types.