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

[Jeroen Roovers]

commit:     561e765fc776910165e5bda5de9cdf1bf6197c26
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 10:23:36 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 10:24:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=561e765f

net-analyzer/wireshark: Update qtsvg patch

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/678120
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../wireshark/files/wireshark-99999999-qtsvg.patch | 23 ++--------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
index 231acd5a6fa..8cff4bdd075 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
+++ b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch
@@ -1,29 +1,10 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -910,14 +910,12 @@
+@@ -1058,7 +1058,6 @@
  		Qt5LinguistTools
  		Qt5Multimedia
  		Qt5PrintSupport
 -		Qt5Svg
  		Qt5Widgets
  	)
- 	set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 	set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 	set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 	set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
--	set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 	set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 	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
+ 	if(APPLE)