From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 469641388C1 for ; Wed, 24 Feb 2016 08:41:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E669D21C02A; Wed, 24 Feb 2016 08:41:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 704B621C02A for ; Wed, 24 Feb 2016 08:41:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5966A340B65 for ; Wed, 24 Feb 2016 08:41:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1083415FB for ; Wed, 24 Feb 2016 08:41:45 +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: <1456303303.5c6f0ca77d32472e5973e8652078beeb2b1bb722.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.patch net-analyzer/wireshark/files/wireshark-99999999-sse4_2.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: 5c6f0ca77d32472e5973e8652078beeb2b1bb722 X-VCS-Branch: master Date: Wed, 24 Feb 2016 08:41:45 +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: 53ab39db-7858-4e32-a8be-be65feb5c2e2 X-Archives-Hash: 9bddec367e9b0cb2879b00469fc91278 commit: 5c6f0ca77d32472e5973e8652078beeb2b1bb722 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Feb 24 08:41:18 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Feb 24 08:41:43 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6f0ca7 net-analyzer/wireshark: Update live ebuild patches (bug #575090 by Garri). Package-Manager: portage-2.2.27 .../files/wireshark-99999999-androiddump.patch | 10 ++++++++++ .../wireshark/files/wireshark-99999999-sse4_2.patch | 20 ++++++++++++++++++++ net-analyzer/wireshark/wireshark-99999999.ebuild | 7 ++----- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch new file mode 100644 index 0000000..7c00d8b --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch @@ -0,0 +1,10 @@ +--- a/extcap/Makefile.am ++++ b/extcap/Makefile.am +@@ -46,6 +46,7 @@ + ../wiretap/libwiretap.la \ + ../wsutil/libwsutil.la \ + @GLIB_LIBS@ \ ++ @PCAP_LIBS@ \ + @SOCKET_LIBS@ + + if ENABLE_STATIC diff --git a/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch new file mode 100644 index 0000000..daef2a1 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-99999999-sse4_2.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1101,6 +1101,7 @@ + AC_SUBST(PIE_CFLAGS) + AC_SUBST(PIE_LDFLAGS) + ++AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[ + WS_CFLAGS_saved="$WS_CFLAGS" + AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C) + if test "x$can_add_to_cflags" = "xyes" +@@ -1128,6 +1129,9 @@ + fi + fi + WS_CFLAGS="$WS_CFLAGS_saved" ++],[ ++AC_MSG_RESULT(no) ++]) + + if test "x$ac_sse4_2_flag" != x; then + # diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 786f1b1..b0ab8fd 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -97,11 +97,10 @@ src_unpack() { src_prepare() { epatch \ - "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ - "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \ "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \ - "${FILESDIR}"/${PN}-2.1.0-sse4_2.patch + "${FILESDIR}"/${PN}-99999999-sse4_2.patch \ + "${FILESDIR}"/${PN}-99999999-androiddump.patch epatch_user @@ -155,7 +154,6 @@ src_configure() { econf \ $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ $(use_enable androiddump) \ - $(use_enable ipv6) \ $(use_enable tfshark) \ $(use_with adns c-ares) \ $(use_with caps libcap) \ @@ -212,7 +210,6 @@ src_install() { # install headers local wsheader for wsheader in \ - color.h \ config.h \ epan/*.h \ epan/crypt/*.h \