| 1 |
commit: d66c707eef1fa2e8fe400d0c7897feb4ebd6783c |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 3 11:05:59 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 3 11:05:59 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66c707e |
| 7 |
|
| 8 |
net-analyzer/wireshark: Update live ebuild. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../wireshark/files/wireshark-99999999-qtsvg.patch | 29 ++++++++++++++++++++++ |
| 13 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 3 +-- |
| 14 |
2 files changed, 30 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..4f151dbba21 |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch |
| 21 |
@@ -0,0 +1,29 @@ |
| 22 |
+--- a/CMakeLists.txt |
| 23 |
++++ b/CMakeLists.txt |
| 24 |
+@@ -910,14 +910,12 @@ |
| 25 |
+ Qt5LinguistTools |
| 26 |
+ Qt5Multimedia |
| 27 |
+ Qt5PrintSupport |
| 28 |
+- Qt5Svg |
| 29 |
+ Qt5Widgets |
| 30 |
+ ) |
| 31 |
+ set(Qt5Core_OPTIONS REQUIRED) |
| 32 |
+ set(Qt5LinguistTools_OPTIONS REQUIRED) |
| 33 |
+ set(Qt5Multimedia_OPTIONS REQUIRED) |
| 34 |
+ set(Qt5PrintSupport_OPTIONS REQUIRED) |
| 35 |
+- set(Qt5Svg_OPTIONS REQUIRED) |
| 36 |
+ set(Qt5Widgets_OPTIONS REQUIRED) |
| 37 |
+ if (APPLE) |
| 38 |
+ set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras) |
| 39 |
+@@ -1187,11 +1185,6 @@ |
| 40 |
+ # That's the name autotools used |
| 41 |
+ set(QT_MULTIMEDIA_LIB 1) |
| 42 |
+ endif() |
| 43 |
+- if(Qt5Svg_FOUND) |
| 44 |
+- set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES}) |
| 45 |
+- # That's the name autotools used |
| 46 |
+- set(QT_SVG_LIB 1) |
| 47 |
+- endif() |
| 48 |
+ if(Qt5MacExtras_FOUND) |
| 49 |
+ set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES}) |
| 50 |
+ # That's the name autotools used |
| 51 |
|
| 52 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 53 |
index 7ca08d8b924..039381a543b 100644 |
| 54 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 55 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 56 |
@@ -87,8 +87,7 @@ RDEPEND=" |
| 57 |
" |
| 58 |
PATCHES=( |
| 59 |
"${FILESDIR}"/${PN}-2.4-androiddump.patch |
| 60 |
- "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch |
| 61 |
- "${FILESDIR}"/${PN}-2.6.0-qtsvg.patch |
| 62 |
+ "${FILESDIR}"/${PN}-99999999-qtsvg.patch |
| 63 |
"${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 64 |
) |
Archives