From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5075D158086 for ; Tue, 7 Dec 2021 07:13:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96CFE2BC007; Tue, 7 Dec 2021 07:13:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7AE5C2BC007 for ; Tue, 7 Dec 2021 07:13:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 977DF343453 for ; Tue, 7 Dec 2021 07:13:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05F1179 for ; Tue, 7 Dec 2021 07:13:16 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638861175.86721c622f6e75874b3dc83b0133f5973b5ba84b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/, net-analyzer/wireshark/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 86721c622f6e75874b3dc83b0133f5973b5ba84b X-VCS-Branch: master Date: Tue, 7 Dec 2021 07:13:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3a390ce9-8867-418e-b077-70c821eda25b X-Archives-Hash: d39cd454f59be4ce23802522c205ff06 commit: 86721c622f6e75874b3dc83b0133f5973b5ba84b Author: Sam James gentoo org> AuthorDate: Tue Dec 7 07:12:47 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 7 07:12:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86721c62 net-analyzer/wireshark: fix USE=-tshark build for 3.6.0 Bug: https://bugs.gentoo.org/823720 Signed-off-by: Sam James gentoo.org> .../files/wireshark-3.6.0-fix-no-tshark.patch | 32 ++++++++++++++++++++++ net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 1 + 2 files changed, 33 insertions(+) diff --git a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch new file mode 100644 index 000000000000..dd497c51391c --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch @@ -0,0 +1,32 @@ +https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5 +https://gitlab.com/wireshark/wireshark/-/issues/17766 +https://bugs.gentoo.org/823720 + +From: Gerald Combs +Date: Mon, 6 Dec 2021 19:01:10 -0800 +Subject: [PATCH] CMake: Remove the update_tools_help target. + +Remove the update_tools_help target. Despite the comment, the weekly +update job doesn't use it, we don't have targets for our other update +scripts, and it currently causes issues if BUILD_tshark is disabled. +Fixes #17766. +--- a/docbook/CMakeLists.txt ++++ b/docbook/CMakeLists.txt +@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS + + set(GUIDE_INSTALL_DIRS) + +-# This is automatically updated each week. You probably don't need to run it +-# or depend on it. +-add_custom_target(update_tools_help +- COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8 +- ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/update-tools-help.py +- --program-path $ +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +-) +-set_docbook_target_properties(update_tools_help) +- + set(WSUG_TITLE "Wireshark User's Guide") + + set(WSUG_FILES +GitLab diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild index 3b3d7769e8ea..cd262a13d500 100644 --- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild @@ -97,6 +97,7 @@ RDEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.6.0-redhat.patch "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch + "${FILESDIR}"/${PN}-3.6.0-fix-no-tshark.patch ) pkg_setup() {