summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-02-16 11:23:36 +0100
committerJeroen Roovers <jer@gentoo.org>2019-02-16 11:24:03 +0100
commit561e765fc776910165e5bda5de9cdf1bf6197c26 (patch)
tree83a9a5fdf5beeb4a0575e92982f8aaa8ce2da95f
parentapp-text/docbook-dsssl-stylesheets: arm stable, bug #676434 (diff)
downloadgentoo-561e765fc776910165e5bda5de9cdf1bf6197c26.tar.gz
gentoo-561e765fc776910165e5bda5de9cdf1bf6197c26.tar.bz2
gentoo-561e765fc776910165e5bda5de9cdf1bf6197c26.zip
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@gentoo.org>
-rw-r--r--net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch23
1 files 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)