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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63A6D138334 for ; Sun, 3 Jun 2018 12:12:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 464E8E09D0; Sun, 3 Jun 2018 12:12:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3AEFE09D0 for ; Sun, 3 Jun 2018 12:12:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE1F2335C72 for ; Sun, 3 Jun 2018 12:12:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28FE429E for ; Sun, 3 Jun 2018 12:12:14 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1528027932.1ed92cf1f83756341e962f39e9c6f85cda353ed8.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch net-analyzer/wireshark/wireshark-99999999.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 1ed92cf1f83756341e962f39e9c6f85cda353ed8 X-VCS-Branch: master Date: Sun, 3 Jun 2018 12:12:14 +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-Archives-Salt: f608a179-f1bd-4190-b94e-ff6fa23d588d X-Archives-Hash: 6364edd23e1a10a27ffc4e869ce281e8 commit: 1ed92cf1f83756341e962f39e9c6f85cda353ed8 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Jun 3 12:11:25 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Jun 3 12:12:12 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed92cf1 net-analyzer/wireshark: Update live ebuild. Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../wireshark-99999999-androiddump-wsutil.patch | 34 ++++++++++++++++++++++ .../wireshark-99999999-ui-needs-wiretap.patch | 11 +++++++ net-analyzer/wireshark/wireshark-99999999.ebuild | 20 ++++--------- 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch new file mode 100644 index 00000000000..8ceb3ba5488 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch @@ -0,0 +1,34 @@ +--- a/extcap/CMakeLists.txt ++++ b/extcap/CMakeLists.txt +@@ -68,6 +68,8 @@ + if(HAVE_LIBPCAP) + set(androiddump_LIBS + ui ++ wiretap ++ wsutil + ${GLIB2_LIBRARIES} + ${PCAP_LIBRARIES} + ) +@@ -78,6 +80,7 @@ + set(androiddump_LIBS + ui + wiretap ++ wsutil + ${GLIB2_LIBRARIES} + ${ZLIB_LIBRARIES} + ${CMAKE_DL_LIBS} +@@ -89,7 +92,6 @@ + ) + + add_executable(androiddump WIN32 ${androiddump_FILES}) +- # XXX Shouldn't we add wsutil to androiddump_LIBS instead? + set_extcap_executable_properties(androiddump) + target_link_libraries(androiddump ${androiddump_LIBS}) + install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR}) +@@ -212,4 +214,4 @@ + ${androiddump_FILES} + ${sshdump_FILES} + ${ciscodump_FILES} +-) +\ No newline at end of file ++) diff --git a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch new file mode 100644 index 00000000000..c0bfc3acd5a --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch @@ -0,0 +1,11 @@ +--- a/ui/CMakeLists.txt ++++ b/ui/CMakeLists.txt +@@ -76,6 +76,8 @@ + + add_library(ui STATIC ${UI_SRC}) + ++set(ui_LIBS wiretap) ++ + set_target_properties(ui PROPERTIES + LINK_FLAGS "${WS_LINK_FLAGS}" + FOLDER "UI" diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 039381a543b..d1a9875cba3 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -13,8 +13,8 @@ SLOT="0/${PV}" KEYWORDS="" IUSE=" adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc - +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink - nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux + +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink + nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib " @@ -28,12 +28,6 @@ CDEPEND=" adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) caps? ( sys-libs/libcap ) - gtk? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - x11-misc/xdg-utils - ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) @@ -43,7 +37,6 @@ CDEPEND=" maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) - portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -81,14 +74,15 @@ DEPEND=" " RDEPEND=" ${CDEPEND} - gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) " PATCHES=( "${FILESDIR}"/${PN}-2.4-androiddump.patch - "${FILESDIR}"/${PN}-99999999-qtsvg.patch "${FILESDIR}"/${PN}-2.6.0-redhat.patch + "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch + "${FILESDIR}"/${PN}-99999999-qtsvg.patch + "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch ) pkg_setup() { @@ -141,7 +135,6 @@ src_configure() { -DBUILD_tshark=$(usex tshark) -DBUILD_udpdump=$(usex udpdump) -DBUILD_wireshark=$(usex qt5) - -DBUILD_wireshark_gtk=$(usex gtk) -DDISABLE_WERROR=yes -DENABLE_BCG729=$(usex bcg729) -DENABLE_CAP=$(usex caps) @@ -154,7 +147,6 @@ src_configure() { -DENABLE_NETLINK=$(usex netlink) -DENABLE_NGHTTP2=$(usex nghttp2) -DENABLE_PCAP=$(usex pcap) - -DENABLE_PORTAUDIO=$(usex portaudio) -DENABLE_SBC=$(usex sbc) -DENABLE_SMI=$(usex smi) -DENABLE_SNAPPY=$(usex snappy) @@ -204,7 +196,7 @@ src_install() { insinto /usr/include/wiretap doins wiretap/wtap.h - if use gtk || use qt5; then + if use qt5; then local s for s in 16 32 48 64 128 256 512 1024; do insinto /usr/share/icons/hicolor/${s}x${s}/apps