net-analyzer/wireshark: Update qtsvg patch
authorJeroen Roovers <jer@gentoo.org>
Sat, 16 Feb 2019 10:23:36 +0000 (11:23 +0100)
committerJeroen Roovers <jer@gentoo.org>
Sat, 16 Feb 2019 10:24:03 +0000 (11:24 +0100)
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/678120
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch

index 231acd5a6faad7c6a065ac5bcc0e44d3389dd11f..8cff4bdd07521794a238c12cd68d9d14f2388cf7 100644 (file)
@@ -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)