summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-06-27 21:04:43 +0000
committerJeroen Roovers <jer@gentoo.org>2012-06-27 21:04:43 +0000
commitc7c780cd4bf1b4fecd2250b538ec67c52dd9d34d (patch)
treef0c751412b4699a028b7e335c485c21e39b82a70 /net-analyzer/wireshark
parentImprove USE flag descriptions. (diff)
downloadgentoo-2-c7c780cd4bf1b4fecd2250b538ec67c52dd9d34d.tar.gz
gentoo-2-c7c780cd4bf1b4fecd2250b538ec67c52dd9d34d.tar.bz2
gentoo-2-c7c780cd4bf1b4fecd2250b538ec67c52dd9d34d.zip
Clean up patch.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r--net-analyzer/wireshark/ChangeLog6
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch19
2 files changed, 5 insertions, 20 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index ca6cff442a22..44911550274d 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.355 2012/06/27 20:48:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.356 2012/06/27 21:04:43 jer Exp $
+
+ 27 Jun 2012; Jeroen Roovers <jer@gentoo.org>
+ files/wireshark-1.8.0-underlinking.patch:
+ Clean up patch.
27 Jun 2012; Jeroen Roovers <jer@gentoo.org> wireshark-1.8.0.ebuild:
Remove IUSE=threads.
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch b/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch
index 667fa67421f0..bb2a61e0bd4e 100644
--- a/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch
+++ b/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch
@@ -1,10 +1,3 @@
- Makefile.am | 1 +
- Makefile.in | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 2bf4898..3ffa6a3 100644
---- a/Makefile.am
+++ b/Makefile.am
@@ -333,6 +333,7 @@ wireshark_LDADD = \
@LIBGNUTLS_LIBS@ \
@@ -14,15 +7,3 @@ index 2bf4898..3ffa6a3 100644
@GTK_LIBS@ -lm
wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
-diff --git a/Makefile.in b/Makefile.in
-index a7c8474..c94ebc9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1051,6 +1051,7 @@ wireshark_LDADD = \
- @LIBGNUTLS_LIBS@ \
- @LIBSMI_LDFLAGS@ \
- @PORTAUDIO_LIBS@ \
-+ @GLIB_LIBS@ \
- @GTK_LIBS@ -lm
-
- wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)