diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-05-08 01:02:08 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-05-08 01:02:08 +0000 |
| commit | bb32294720ff968e13b1f7baedad67e7f0d498b9 (patch) | |
| tree | 5c0adfa27fbf261abf72d12491c6fba5bc552cbc /net-analyzer/wireshark | |
| parent | Add ~x86-fbsd wrt bug #468582 (diff) | |
| download | gentoo-2-bb32294720ff968e13b1f7baedad67e7f0d498b9.tar.gz gentoo-2-bb32294720ff968e13b1f7baedad67e7f0d498b9.tar.bz2 gentoo-2-bb32294720ff968e13b1f7baedad67e7f0d498b9.zip | |
Fix pkg-config use (bug #468490 by Chris Smith).
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/wireshark')
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/wireshark/files/wireshark-1.10.0-pkg-config.patch | 12 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild | 5 |
3 files changed, 20 insertions, 3 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 40dc0fa2fe75..902501be5d23 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.480 2013/05/07 22:06:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.481 2013/05/08 01:02:08 jer Exp $ + + 08 May 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.0_rc1.ebuild, + +files/wireshark-1.10.0-pkg-config.patch: + Fix pkg-config use (bug #468490 by Chris Smith). 07 May 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.0_rc1.ebuild: No need to replace AM_CONFIG_HEADER. diff --git a/net-analyzer/wireshark/files/wireshark-1.10.0-pkg-config.patch b/net-analyzer/wireshark/files/wireshark-1.10.0-pkg-config.patch new file mode 100644 index 000000000000..2295f34c629d --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-1.10.0-pkg-config.patch @@ -0,0 +1,12 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -185,6 +185,9 @@ + AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, "yes", "no") + AM_CONDITIONAL(HAVE_DOXYGEN, test x$HAVE_DOXYGEN = xyes) + ++# We need to call this because PKG_CHECK_MODULES is called conditionally ++PKG_PROG_PKG_CONFIG ++ + # + # Try to arrange for large file support. + # diff --git a/net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild index be24151f8c62..742a6c5fff7d 100644 --- a/net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild +++ b/net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild,v 1.3 2013/05/07 22:06:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild,v 1.4 2013/05/08 01:02:08 jer Exp $ EAPI=5 PYTHON_COMPAT=( python2_5 python2_6 python2_7 ) @@ -73,7 +73,8 @@ pkg_setup() { src_prepare() { epatch \ - "${FILESDIR}"/${PN}-1.6.13-ldflags.patch + "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ + "${FILESDIR}"/${PN}-1.10.0-pkg-config.patch sed -i \ -e '/^Icon/s|.png||g' \ |