diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-09-08 10:50:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-09-08 10:50:14 +0100 |
commit | 3f71901f8c228f4de570abed1831ce3ee425343e (patch) | |
tree | a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /net-analyzer/wireshark/files | |
parent | 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff) |
gentoo resync 08.09.2018
Diffstat (limited to 'net-analyzer/wireshark/files')
-rw-r--r-- | net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch new file mode 100644 index 000000000000..9e5e8810991e --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch @@ -0,0 +1,56 @@ +--- a/docbook/CMakeLists.txt ++++ b/docbook/CMakeLists.txt +@@ -61,21 +61,22 @@ + common_graphics/warning.svg + ) + +-set(WSUG_TOOLS_HELP_COMMANDS ++set(WSUG_TOOLS_COMMANDS + capinfos ++ dumpcap + editcap + mergecap ++ rawshark + reordercap + text2pcap + tshark + ) + +-if (PCAP_FOUND) +- list(APPEND WSUG_TOOLS_HELP_COMMANDS +- dumpcap +- rawshark +- ) +-endif(PCAP_FOUND) ++foreach(th_build ${WSUG_TOOLS_COMMANDS}) ++if (TARGET ${th_build}) ++ list(APPEND WSUG_TOOLS_HELP_COMMANDS ${th_build}) ++endif(TARGET ${th_build}) ++endforeach() + + # We want the wsug_* targets to depend on the tools help files. + # We want update_tools_help to be an independent target. +@@ -92,6 +93,7 @@ + + foreach(th_command ${WSUG_TOOLS_HELP_COMMANDS}) + set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/${th_command}-h.txt) ++ add_dependencies(th_file th_command) + list(APPEND WSUG_TOOLS_HELP_FILES ${th_file}) + add_custom_command( + OUTPUT ${th_file} +@@ -103,6 +105,7 @@ + # Extra command output + # Note that these won't work on Windows unless we make -F and -T write + # to stdout and return 0 or wrap the commands similar to hhc.exe. ++if (TARGET editcap) + set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/editcap-F.txt) + list(APPEND WSUG_TOOLS_HELP_FILES ${th_file}) + add_custom_command( +@@ -117,6 +120,7 @@ + COMMAND $<TARGET_FILE:editcap> -T > ${th_file} + DEPENDS $<TARGET_FILE:editcap> + ) ++endif(TARGET editcap) + + add_custom_target(update_tools_help + DEPENDS ${WSUG_TOOLS_HELP_FILES} |