[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     d66c707eef1fa2e8fe400d0c7897feb4ebd6783c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 11:05:59 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 11:05:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66c707e

net-analyzer/wireshark: Update live ebuild.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../wireshark/files/wireshark-99999999-qtsvg.patch | 29 ++++++++++++++++++++++
 net-analyzer/wireshark/wireshark-99999999.ebuild   |  3 +--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
new file mode 100644
index 00000000000..4f151dbba21
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -910,14 +910,12 @@
+ 		Qt5LinguistTools
+ 		Qt5Multimedia
+ 		Qt5PrintSupport
+-		Qt5Svg
+ 		Qt5Widgets
+ 	)
+ 	set(Qt5Core_OPTIONS REQUIRED)
+ 	set(Qt5LinguistTools_OPTIONS REQUIRED)
+ 	set(Qt5Multimedia_OPTIONS REQUIRED)
+ 	set(Qt5PrintSupport_OPTIONS REQUIRED)
+-	set(Qt5Svg_OPTIONS REQUIRED)
+ 	set(Qt5Widgets_OPTIONS REQUIRED)
+ 	if (APPLE)
+ 		set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
+@@ -1187,11 +1185,6 @@
+ 		# That's the name autotools used
+ 		set(QT_MULTIMEDIA_LIB 1)
+ 	endif()
+-	if(Qt5Svg_FOUND)
+-		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
+-		# That's the name autotools used
+-		set(QT_SVG_LIB 1)
+-	endif()
+ 	if(Qt5MacExtras_FOUND)
+ 		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+ 		# That's the name autotools used

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 7ca08d8b924..039381a543b 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -87,8 +87,7 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 )