diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2015-06-01 05:46:30 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2015-06-01 05:46:30 +0000 |
| commit | 849d874f7ccbdb63a9624c2cb8d32c41f6fd72b6 (patch) | |
| tree | e11be93b23419f699b792a688e84f014f669ebff /net-analyzer | |
| parent | Cleanup. (diff) | |
| download | gentoo-2-849d874f7ccbdb63a9624c2cb8d32c41f6fd72b6.tar.gz gentoo-2-849d874f7ccbdb63a9624c2cb8d32c41f6fd72b6.tar.bz2 gentoo-2-849d874f7ccbdb63a9624c2cb8d32c41f6fd72b6.zip | |
Set RCC per Qt branch, too (maybe bug #549880).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-99999999.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog index 76921131207b..2ae67020f98b 100644 --- a/net-analyzer/wireshark/ChangeLog +++ b/net-analyzer/wireshark/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/wireshark # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.720 2015/06/01 04:20:10 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.721 2015/06/01 05:46:30 jer Exp $ + + 01 Jun 2015; Jeroen Roovers <jer@gentoo.org> wireshark-99999999.ebuild: + Set RCC per Qt branch, too (maybe bug #549880). 01 Jun 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.5.ebuild: Set RCC per Qt branch, too (maybe bug #549880). diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 74d28dfa16bf..96ac8aee3659 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.13 2015/05/14 07:51:39 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.14 2015/06/01 05:46:30 jer Exp $ EAPI=5 inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user @@ -97,7 +97,6 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ - "${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \ "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \ "${FILESDIR}"/${PN}-99999999-pkgconfig.patch @@ -159,8 +158,10 @@ src_configure() { $(use_with pcap) \ $(use_with portaudio) \ $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \ + $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \ $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \ $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ + $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ $(use_with sbc) \ $(use_with smi libsmi) \ |