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

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

commit:     3614f5d49b3123f7a627e27bcb085d1d58c890b0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri May  4 17:53:50 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri May  4 18:01:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3614f5d4

net-analyzer/wireshark: #654714, #654690.

Package-Manager: Portage-2.3.33, Repoman-2.3.9

 .../wireshark/files/wireshark-2.6.0-qtsvg.patch    | 29 ++++++++++++++++++++++
 .../wireshark/files/wireshark-2.6.0-redhat.patch   | 11 ++++++++
 net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild   |  2 ++
 net-analyzer/wireshark/wireshark-99999999.ebuild   |  2 ++
 4 files changed, 44 insertions(+)

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
new file mode 100644
index 00000000000..63327727590
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -926,14 +926,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)
+@@ -1229,11 +1227,6 @@
+ 		# That's the name autofoo uses
+ 		set(QT_MULTIMEDIA_LIB 1)
+ 	endif()
+-	if(Qt5Svg_FOUND)
+-		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
+-		# That's the name autofoo uses
+-		set(QT_SVG_LIB 1)
+-	endif()
+ 	if(Qt5MacExtras_FOUND)
+ 		set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+ 		# That's the name autofoo uses

diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch
new file mode 100644
index 00000000000..fe17609bf61
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3019,7 +3019,7 @@
+ 
+ endif()
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++if(CMAKE_SYSTEM_NAME STREQUAL "Red Hat")
+ 	find_program(RPMBUILD_EXECUTABLE rpmbuild)
+ 	find_program(GIT_EXECUTABLE git)
+ endif()

diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
index 40b8f06bf92..23ffa310a9e 100644
--- a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild
@@ -89,6 +89,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-2.6.0-qtsvg.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump.patch
 )
 

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index c216e52d33d..7ca08d8b924 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -88,6 +88,8 @@ 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}-2.6.0-redhat.patch
 )
 
 pkg_setup() {