summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2018-09-02 19:56:44 +0200
committerJeroen Roovers <jer@gentoo.org>2018-09-02 19:58:03 +0200
commit1f2c951b114a1bf4c382dbe7b0055886c19ab5c1 (patch)
tree321eab4f33c5055e66f29315e541f7d5dce1e585
parentsys-auth/libfprint: Drop old (diff)
downloadgentoo-1f2c951b114a1bf4c382dbe7b0055886c19ab5c1.tar.gz
gentoo-1f2c951b114a1bf4c382dbe7b0055886c19ab5c1.tar.bz2
gentoo-1f2c951b114a1bf4c382dbe7b0055886c19ab5c1.zip
net-analyzer/wireshark: Hopefully fix docbook/
Bug: https://bugs.gentoo.org/665080 Package-Manager: Portage-2.3.48, Repoman-2.3.10
-rw-r--r--net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch40
-rw-r--r--net-analyzer/wireshark/wireshark-2.6.3.ebuild1
2 files changed, 41 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 00000000000..38d223491a6
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.3-docbook.patch
@@ -0,0 +1,40 @@
+--- 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(BUILD_${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}
diff --git a/net-analyzer/wireshark/wireshark-2.6.3.ebuild b/net-analyzer/wireshark/wireshark-2.6.3.ebuild
index b76d96cd942..abfa5bc13ee 100644
--- a/net-analyzer/wireshark/wireshark-2.6.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.3.ebuild
@@ -91,6 +91,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
+ "${FILESDIR}"/${PN}-2.6.3-docbook.patch
"${FILESDIR}"/${PN}-99999999-androiddump.patch
)