* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-99999999.ebuild
@ 2015-04-13 5:00 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2015-04-13 5:00 UTC (permalink / raw
To: gentoo-commits
jer 15/04/13 05:00:01
Modified: ChangeLog wireshark-99999999.ebuild
Log:
Fix variables in wireshark.pc (bug #546126).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.709 net-analyzer/wireshark/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.709&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.709&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.708&r2=1.709
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.708
retrieving revision 1.709
diff -u -r1.708 -r1.709
--- ChangeLog 11 Apr 2015 00:46:45 -0000 1.708
+++ ChangeLog 13 Apr 2015 05:00:01 -0000 1.709
@@ -1,6 +1,10 @@
# 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.708 2015/04/11 00:46:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.709 2015/04/13 05:00:01 jer Exp $
+
+ 13 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-99999999.ebuild,
+ files/wireshark-99999999-pkgconfig.patch:
+ Fix variables in wireshark.pc (bug #546126).
11 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.4.ebuild,
wireshark-1.99.5.ebuild, wireshark-99999999.ebuild,
1.11 net-analyzer/wireshark/wireshark-99999999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?r1=1.10&r2=1.11
Index: wireshark-99999999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wireshark-99999999.ebuild 11 Apr 2015 00:46:45 -0000 1.10
+++ wireshark-99999999.ebuild 13 Apr 2015 05:00:01 -0000 1.11
@@ -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.10 2015/04/11 00:46:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.11 2015/04/13 05:00:01 jer Exp $
EAPI=5
inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user
@@ -98,7 +98,6 @@
"${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-gcc_option.patch \
"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \
"${FILESDIR}"/${PN}-1.99.0-qt5.patch \
"${FILESDIR}"/${PN}-99999999-pkgconfig.patch
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-99999999.ebuild
@ 2015-04-20 4:41 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2015-04-20 4:41 UTC (permalink / raw
To: gentoo-commits
jer 15/04/20 04:41:52
Modified: ChangeLog wireshark-99999999.ebuild
Log:
Fix qt4/5 configure logic.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.711 net-analyzer/wireshark/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.711&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.711&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.710&r2=1.711
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -r1.710 -r1.711
--- ChangeLog 13 Apr 2015 17:29:19 -0000 1.710
+++ ChangeLog 20 Apr 2015 04:41:52 -0000 1.711
@@ -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.710 2015/04/13 17:29:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.711 2015/04/20 04:41:52 jer Exp $
+
+ 20 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-99999999.ebuild:
+ Fix qt4/5 configure logic.
13 Apr 2015; Jeroen Roovers <jer@gentoo.org> wireshark-1.12.4.ebuild,
-files/wireshark-1.12.4-pkgconfig.patch,
1.12 net-analyzer/wireshark/wireshark-99999999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?r1=1.11&r2=1.12
Index: wireshark-99999999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wireshark-99999999.ebuild 13 Apr 2015 05:00:01 -0000 1.11
+++ wireshark-99999999.ebuild 20 Apr 2015 04:41:52 -0000 1.12
@@ -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.11 2015/04/13 05:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.12 2015/04/20 04:41:52 jer Exp $
EAPI=5
inherit autotools eutils fcaps git-r3 multilib qmake-utils qt4-r2 user
@@ -99,7 +99,6 @@
"${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}-1.99.0-qt5.patch \
"${FILESDIR}"/${PN}-99999999-pkgconfig.patch
epatch_user
@@ -137,6 +136,14 @@
use doc || export ac_cv_prog_HAVE_DOXYGEN=false
use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+ if use qt4; then
+ myconf+=" --with-qt=4"
+ elif use qt5; then
+ myconf+=" --with-qt=5"
+ else
+ myconf+=" --with-qt=no"
+ fi
+
# dumpcap requires libcap
# --disable-profile-build bugs #215806, #292991, #479602
econf \
@@ -151,8 +158,6 @@
$(use_with pcap dumpcap-group wireshark) \
$(use_with pcap) \
$(use_with portaudio) \
- $(use_with qt4) \
- $(use_with qt5) \
$(usex qt4 MOC=$(qt4_get_bindir)/moc '') \
$(usex qt4 UIC=$(qt4_get_bindir)/uic '') \
$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-99999999.ebuild
@ 2015-06-01 5:46 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2015-06-01 5:46 UTC (permalink / raw
To: gentoo-commits
jer 15/06/01 05:46:30
Modified: ChangeLog wireshark-99999999.ebuild
Log:
Set RCC per Qt branch, too (maybe bug #549880).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.721 net-analyzer/wireshark/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.721&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.721&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.720&r2=1.721
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v
retrieving revision 1.720
retrieving revision 1.721
diff -u -r1.720 -r1.721
--- ChangeLog 1 Jun 2015 04:20:10 -0000 1.720
+++ ChangeLog 1 Jun 2015 05:46:30 -0000 1.721
@@ -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).
1.14 net-analyzer/wireshark/wireshark-99999999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?r1=1.13&r2=1.14
Index: wireshark-99999999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wireshark-99999999.ebuild 14 May 2015 07:51:39 -0000 1.13
+++ wireshark-99999999.ebuild 1 Jun 2015 05:46:30 -0000 1.14
@@ -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 @@
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 @@
$(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) \
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-01 5:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-20 4:41 [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark: ChangeLog wireshark-99999999.ebuild Jeroen Roovers (jer)
-- strict thread matches above, loose matches on Subject: below --
2015-06-01 5:46 Jeroen Roovers (jer)
2015-04-13 5:00 Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox