[patch] 488640-wireshark-1.99.0-qt5.patch

488640-wireshark-1.99.0-qt5.patch (text/plain), 2.26 KB, created by Jeroen Roovers (RETIRED) on 2014-10-20 11:05:31 UTC

Index: wireshark-1.99.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.0.ebuild,v
retrieving revision 1.2
diff -u -p -r1.2 wireshark-1.99.0.ebuild
--- wireshark-1.99.0.ebuild	14 Oct 2014 13:52:37 -0000	1.2
+++ wireshark-1.99.0.ebuild	20 Oct 2014 11:02:44 -0000
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.0.ebuild,v 1.2 2014/10/14 13:52:37 jer Exp $
 
 EAPI=5
-inherit autotools eutils fcaps qt4-r2 user
+inherit autotools eutils fcaps multilib qt4-r2 user
 
 DESCRIPTION="A network protocol analyzer formerly known as ethereal"
 HOMEPAGE="http://www.wireshark.org/"
@@ -14,10 +14,11 @@ SLOT="0/${PV}"
 KEYWORDS=""
 IUSE="
 	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
-	portaudio +qt4 selinux smi sse4_2 ssl zlib
+	portaudio +qt4 qt5 selinux smi sse4_2 ssl zlib
 "
 REQUIRED_USE="
 	ssl? ( crypt )
+	^^ ( qt4 qt5 )
 "
 
 GTK_COMMON_DEPEND="
@@ -46,6 +47,13 @@ RDEPEND="
 		dev-qt/qtgui:4
 		x11-misc/xdg-utils
 		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
 	selinux? ( sec-policy/selinux-wireshark )
 	smi? ( net-libs/libsmi )
 	ssl? ( net-libs/gnutls )
@@ -82,10 +90,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.99.0.1975-gcc_option.patch \
 		"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch
 
-	# Qt5 support is broken since the build system does not determine
-	# properly which `moc' it ought to use
-	sed -i -e 's| Qt5||g' acinclude.m4 || die
-
 	epatch_user
 
 	eautoreconf
@@ -108,7 +112,7 @@ src_configure() {
 	fi
 
 	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
-	if use gtk3 || use qt4 ; then
+	if use gtk3 || use qt4 || use qt5; then
 		myconf+=( "--enable-wireshark" )
 	else
 		myconf+=( "--disable-wireshark" )
@@ -132,7 +136,10 @@ src_configure() {
 		$(use_with pcap dumpcap-group wireshark) \
 		$(use_with pcap) \
 		$(use_with portaudio) \
-		$(use_with qt4 qt) \
+		$(usex qt4 --with-qt '') \
+		$(usex qt5 --with-qt '') \
+		$(usex qt5 MOC=/usr/$(get_libdir)/qt5/bin/moc '') \
+		$(usex qt5 UIC=/usr/$(get_libdir)/qt5/bin/uic '') \
 		$(use_with smi libsmi) \
 		$(use_with ssl gnutls) \
 		$(use_with zlib) \