[patch] wireshark-1.11.0.patch

file_488640.txt (text/plain), 1.77 KB, created by Tom Wijsman (TomWij) (RETIRED) on 2013-10-19 21:57:53 UTC

--- a/wireshark-1.11.0.ebuild
+++ b/wireshark-1.11.0-r1.ebuild
@@ -14,12 +14,13 @@
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="
-	adns +caps crypt doc doc-pdf geoip gtk2 +gtk3 ipv6 kerberos libadns lua
-	+netlink +pcap portaudio +qt4 selinux smi ssl zlib
+	adns +caps crypt doc doc-pdf geoip gtk2 gtk3 ipv6 kerberos libadns lua
+	+netlink +pcap portaudio qt4 +qt5 selinux smi ssl zlib
 "
 REQUIRED_USE="
 	?? ( gtk2 gtk3 )
 	ssl? ( crypt )
+	qt5? ( !qt4 )
 "
 
 GTK_COMMON_DEPEND="
@@ -51,7 +52,15 @@
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 		x11-misc/xdg-utils
+		!dev-qt/qtcore:5
+		!dev-qt/qtgui:5
 		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-misc/xdg-utils
+		)
+
 	selinux? ( sec-policy/selinux-wireshark )
 	smi? ( net-libs/libsmi )
 	ssl? ( net-libs/gnutls )
@@ -87,6 +96,11 @@
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
 
+	if use qt5; then
+		export UIC="/usr/lib64/qt5/bin/uic"
+		export MOC="/usr/lib64/qt5/bin/moc"
+	fi
+
 	eautoreconf
 }
 
@@ -121,7 +135,7 @@
 	fi
 
 	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk2 || use gtk3 || use qt4 ; then
+	if use gtk2 || use gtk3 || use qt4 || use qt5 ; then
 		myconf+=( "--enable-wireshark" )
 	else
 		myconf+=( "--disable-wireshark" )
@@ -149,6 +163,7 @@
 		$(use_with pcap) \
 		$(use_with portaudio) \
 		$(use_with qt4 qt) \
+		$(use_with qt5 qt) \
 		$(use_with smi libsmi) \
 		$(use_with ssl gnutls) \
 		$(use_with zlib) \
@@ -189,7 +204,7 @@
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
-	if use gtk2 || use gtk3 || use qt4; then
+	if use gtk2 || use gtk3 || use qt4 || use qt5; then
 		local c d
 		for c in hi lo; do
 			for d in 16 32 48; do