| 1 |
commit: 3614f5d49b3123f7a627e27bcb085d1d58c890b0 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 4 17:53:50 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 4 18:01:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3614f5d4 |
| 7 |
|
| 8 |
net-analyzer/wireshark: #654714, #654690. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.33, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../wireshark/files/wireshark-2.6.0-qtsvg.patch | 29 ++++++++++++++++++++++ |
| 13 |
.../wireshark/files/wireshark-2.6.0-redhat.patch | 11 ++++++++ |
| 14 |
net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild | 2 ++ |
| 15 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 2 ++ |
| 16 |
4 files changed, 44 insertions(+) |
| 17 |
|
| 18 |
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..63327727590 |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-qtsvg.patch |
| 23 |
@@ -0,0 +1,29 @@ |
| 24 |
+--- a/CMakeLists.txt |
| 25 |
++++ b/CMakeLists.txt |
| 26 |
+@@ -926,14 +926,12 @@ |
| 27 |
+ Qt5LinguistTools |
| 28 |
+ Qt5Multimedia |
| 29 |
+ Qt5PrintSupport |
| 30 |
+- Qt5Svg |
| 31 |
+ Qt5Widgets |
| 32 |
+ ) |
| 33 |
+ set(Qt5Core_OPTIONS REQUIRED) |
| 34 |
+ set(Qt5LinguistTools_OPTIONS REQUIRED) |
| 35 |
+ set(Qt5Multimedia_OPTIONS REQUIRED) |
| 36 |
+ set(Qt5PrintSupport_OPTIONS REQUIRED) |
| 37 |
+- set(Qt5Svg_OPTIONS REQUIRED) |
| 38 |
+ set(Qt5Widgets_OPTIONS REQUIRED) |
| 39 |
+ if (APPLE) |
| 40 |
+ set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras) |
| 41 |
+@@ -1229,11 +1227,6 @@ |
| 42 |
+ # That's the name autofoo uses |
| 43 |
+ set(QT_MULTIMEDIA_LIB 1) |
| 44 |
+ endif() |
| 45 |
+- if(Qt5Svg_FOUND) |
| 46 |
+- set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES}) |
| 47 |
+- # That's the name autofoo uses |
| 48 |
+- set(QT_SVG_LIB 1) |
| 49 |
+- endif() |
| 50 |
+ if(Qt5MacExtras_FOUND) |
| 51 |
+ set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES}) |
| 52 |
+ # That's the name autofoo uses |
| 53 |
|
| 54 |
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch |
| 55 |
new file mode 100644 |
| 56 |
index 00000000000..fe17609bf61 |
| 57 |
--- /dev/null |
| 58 |
+++ b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch |
| 59 |
@@ -0,0 +1,11 @@ |
| 60 |
+--- a/CMakeLists.txt |
| 61 |
++++ b/CMakeLists.txt |
| 62 |
+@@ -3019,7 +3019,7 @@ |
| 63 |
+ |
| 64 |
+ endif() |
| 65 |
+ |
| 66 |
+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux") |
| 67 |
++if(CMAKE_SYSTEM_NAME STREQUAL "Red Hat") |
| 68 |
+ find_program(RPMBUILD_EXECUTABLE rpmbuild) |
| 69 |
+ find_program(GIT_EXECUTABLE git) |
| 70 |
+ endif() |
| 71 |
|
| 72 |
diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild |
| 73 |
index 40b8f06bf92..23ffa310a9e 100644 |
| 74 |
--- a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild |
| 75 |
+++ b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild |
| 76 |
@@ -89,6 +89,8 @@ PATCHES=( |
| 77 |
"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch |
| 78 |
"${FILESDIR}"/${PN}-2.4-androiddump.patch |
| 79 |
"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch |
| 80 |
+ "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch |
| 81 |
+ "${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 82 |
"${FILESDIR}"/${PN}-99999999-androiddump.patch |
| 83 |
) |
| 84 |
|
| 85 |
|
| 86 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 87 |
index c216e52d33d..7ca08d8b924 100644 |
| 88 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 89 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 90 |
@@ -88,6 +88,8 @@ RDEPEND=" |
| 91 |
PATCHES=( |
| 92 |
"${FILESDIR}"/${PN}-2.4-androiddump.patch |
| 93 |
"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch |
| 94 |
+ "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch |
| 95 |
+ "${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 96 |
) |
| 97 |
|
| 98 |
pkg_setup() { |
Archives