| 1 |
jer 15/07/24 05:44:36 |
| 2 |
|
| 3 |
Modified: wireshark-1.12.6.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
With USE=qt5, make sure we discover the correct RCC (bug #555638). |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.13 net-analyzer/wireshark/wireshark-1.12.6.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild?rev=1.13&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild?rev=1.13&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild?r1=1.12&r2=1.13 |
| 15 |
|
| 16 |
Index: wireshark-1.12.6.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v |
| 19 |
retrieving revision 1.12 |
| 20 |
retrieving revision 1.13 |
| 21 |
diff -u -r1.12 -r1.13 |
| 22 |
--- wireshark-1.12.6.ebuild 22 Jul 2015 15:32:49 -0000 1.12 |
| 23 |
+++ wireshark-1.12.6.ebuild 24 Jul 2015 05:44:36 -0000 1.13 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v 1.12 2015/07/22 15:32:49 zlogene Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v 1.13 2015/07/24 05:44:36 jer Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user |
| 32 |
@@ -97,7 +97,8 @@ |
| 33 |
"${FILESDIR}"/${PN}-1.99.0-qt5.patch \ |
| 34 |
"${FILESDIR}"/${PN}-1.99.1-sbc.patch \ |
| 35 |
"${FILESDIR}"/${PN}-1.12.5-cross-compile.patch \ |
| 36 |
- "${FILESDIR}"/${PN}-1.99.7-qt-pie.patch |
| 37 |
+ "${FILESDIR}"/${PN}-1.99.7-qt-pie.patch \ |
| 38 |
+ "${FILESDIR}"/${PN}-1.12.6-rcc.patch |
| 39 |
|
| 40 |
epatch_user |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.740 net-analyzer/wireshark/ChangeLog |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.740&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.740&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.739&r2=1.740 |
| 50 |
|
| 51 |
Index: ChangeLog |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
| 54 |
retrieving revision 1.739 |
| 55 |
retrieving revision 1.740 |
| 56 |
diff -u -r1.739 -r1.740 |
| 57 |
--- ChangeLog 22 Jul 2015 17:34:09 -0000 1.739 |
| 58 |
+++ ChangeLog 24 Jul 2015 05:44:36 -0000 1.740 |
| 59 |
@@ -1,6 +1,10 @@ |
| 60 |
# ChangeLog for net-analyzer/wireshark |
| 61 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.739 2015/07/22 17:34:09 zlogene Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.740 2015/07/24 05:44:36 jer Exp $ |
| 64 |
+ |
| 65 |
+ 24 Jul 2015; Jeroen Roovers <jer@g.o> wireshark-1.12.6.ebuild, |
| 66 |
+ +files/wireshark-1.12.6-rcc.patch: |
| 67 |
+ With USE=qt5, make sure we discover the correct RCC (bug #555638). |
| 68 |
|
| 69 |
22 Jul 2015; Mikle Kolyada <zlogene@g.o> -wireshark-1.12.4.ebuild: |
| 70 |
Drop old insecure version |
Archives