diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-06 11:18:16 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-06 11:18:16 +0100 |
| commit | ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd (patch) | |
| tree | f2204ce5f94dc3cb13728ff93649d889944952bb /net-analyzer/wireshark/files | |
| parent | fe1c8b732bd548b699d4c2ef725f67f8b8c8911c (diff) | |
gentoo resync : 06.05.2018
Diffstat (limited to 'net-analyzer/wireshark/files')
| -rw-r--r-- | net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch | 29 | ||||
| -rw-r--r-- | net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch | 11 |
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 000000000000..633277275901 --- /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 000000000000..fe17609bf619 --- /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() |