| 1 |
commit: 1f2c951b114a1bf4c382dbe7b0055886c19ab5c1 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 2 17:56:44 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 2 17:58:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2c951b |
| 7 |
|
| 8 |
net-analyzer/wireshark: Hopefully fix docbook/ |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/665080 |
| 11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 12 |
|
| 13 |
.../wireshark/files/wireshark-2.6.3-docbook.patch | 40 ++++++++++++++++++++++ |
| 14 |
net-analyzer/wireshark/wireshark-2.6.3.ebuild | 1 + |
| 15 |
2 files changed, 41 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..38d223491a6 |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch |
| 22 |
@@ -0,0 +1,40 @@ |
| 23 |
+--- a/docbook/CMakeLists.txt |
| 24 |
++++ b/docbook/CMakeLists.txt |
| 25 |
+@@ -61,21 +61,22 @@ |
| 26 |
+ common_graphics/warning.svg |
| 27 |
+ ) |
| 28 |
+ |
| 29 |
+-set(WSUG_TOOLS_HELP_COMMANDS |
| 30 |
++set(WSUG_TOOLS_COMMANDS |
| 31 |
+ capinfos |
| 32 |
++ dumpcap |
| 33 |
+ editcap |
| 34 |
+ mergecap |
| 35 |
++ rawshark |
| 36 |
+ reordercap |
| 37 |
+ text2pcap |
| 38 |
+ tshark |
| 39 |
+ ) |
| 40 |
+ |
| 41 |
+-if (PCAP_FOUND) |
| 42 |
+- list(APPEND WSUG_TOOLS_HELP_COMMANDS |
| 43 |
+- dumpcap |
| 44 |
+- rawshark |
| 45 |
+- ) |
| 46 |
+-endif(PCAP_FOUND) |
| 47 |
++foreach(th_build ${WSUG_TOOLS_COMMANDS}) |
| 48 |
++if (TARGET ${th_build}) |
| 49 |
++ list(APPEND WSUG_TOOLS_HELP_COMMANDS ${th_build}) |
| 50 |
++endif(BUILD_${th_build}) |
| 51 |
++endforeach() |
| 52 |
+ |
| 53 |
+ # We want the wsug_* targets to depend on the tools help files. |
| 54 |
+ # We want update_tools_help to be an independent target. |
| 55 |
+@@ -92,6 +93,7 @@ |
| 56 |
+ |
| 57 |
+ foreach(th_command ${WSUG_TOOLS_HELP_COMMANDS}) |
| 58 |
+ set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/${th_command}-h.txt) |
| 59 |
++ add_dependencies(th_file th_command) |
| 60 |
+ list(APPEND WSUG_TOOLS_HELP_FILES ${th_file}) |
| 61 |
+ add_custom_command( |
| 62 |
+ OUTPUT ${th_file} |
| 63 |
|
| 64 |
diff --git a/net-analyzer/wireshark/wireshark-2.6.3.ebuild b/net-analyzer/wireshark/wireshark-2.6.3.ebuild |
| 65 |
index b76d96cd942..abfa5bc13ee 100644 |
| 66 |
--- a/net-analyzer/wireshark/wireshark-2.6.3.ebuild |
| 67 |
+++ b/net-analyzer/wireshark/wireshark-2.6.3.ebuild |
| 68 |
@@ -91,6 +91,7 @@ PATCHES=( |
| 69 |
"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch |
| 70 |
"${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 71 |
"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch |
| 72 |
+ "${FILESDIR}"/${PN}-2.6.3-docbook.patch |
| 73 |
"${FILESDIR}"/${PN}-99999999-androiddump.patch |
| 74 |
) |
Archives