summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2018-05-04 19:53:50 +0200
committerJeroen Roovers <jer@gentoo.org>2018-05-04 20:01:27 +0200
commit3614f5d49b3123f7a627e27bcb085d1d58c890b0 (patch)
tree88135b3e13059e53b31bfd2ed7e825ce9ca768a0 /net-analyzer/wireshark/files
parentxfce-extra/xfce4-diskperf-plugin: Add patch to avoid name clash, bug 611418 (diff)
downloadgentoo-3614f5d49b3123f7a627e27bcb085d1d58c890b0.tar.gz
gentoo-3614f5d49b3123f7a627e27bcb085d1d58c890b0.tar.bz2
gentoo-3614f5d49b3123f7a627e27bcb085d1d58c890b0.zip
net-analyzer/wireshark: #654714, #654690.
Package-Manager: Portage-2.3.33, Repoman-2.3.9
Diffstat (limited to 'net-analyzer/wireshark/files')
-rw-r--r--net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch29
-rw-r--r--net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch11
2 files changed, 40 insertions, 0 deletions
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()