1 |
jer 15/07/06 03:02:31 |
2 |
|
3 |
Modified: wireshark-1.12.6.ebuild wireshark-99999999.ebuild |
4 |
ChangeLog wireshark-1.99.7.ebuild |
5 |
Log: |
6 |
Qt build does not need -fPIE (maybe bug #552440). |
7 |
|
8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
9 |
|
10 |
Revision Changes Path |
11 |
1.10 net-analyzer/wireshark/wireshark-1.12.6.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild?rev=1.10&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild?rev=1.10&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild?r1=1.9&r2=1.10 |
16 |
|
17 |
Index: wireshark-1.12.6.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v |
20 |
retrieving revision 1.9 |
21 |
retrieving revision 1.10 |
22 |
diff -u -r1.9 -r1.10 |
23 |
--- wireshark-1.12.6.ebuild 3 Jul 2015 08:28:45 -0000 1.9 |
24 |
+++ wireshark-1.12.6.ebuild 6 Jul 2015 03:02:31 -0000 1.10 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2015 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v 1.9 2015/07/03 08:28:45 ago Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.6.ebuild,v 1.10 2015/07/06 03:02:31 jer Exp $ |
30 |
|
31 |
EAPI=5 |
32 |
inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user |
33 |
@@ -96,7 +96,8 @@ |
34 |
"${FILESDIR}"/${PN}-1.11.3-gtk-deprecated-warnings.patch \ |
35 |
"${FILESDIR}"/${PN}-1.99.0-qt5.patch \ |
36 |
"${FILESDIR}"/${PN}-1.99.1-sbc.patch \ |
37 |
- "${FILESDIR}"/${PN}-1.12.5-cross-compile.patch |
38 |
+ "${FILESDIR}"/${PN}-1.12.5-cross-compile.patch \ |
39 |
+ "${FILESDIR}"/${PN}-1.99.7-qt-pie.patch |
40 |
|
41 |
epatch_user |
42 |
|
43 |
|
44 |
|
45 |
|
46 |
1.16 net-analyzer/wireshark/wireshark-99999999.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.16&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?rev=1.16&content-type=text/plain |
50 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild?r1=1.15&r2=1.16 |
51 |
|
52 |
Index: wireshark-99999999.ebuild |
53 |
=================================================================== |
54 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v |
55 |
retrieving revision 1.15 |
56 |
retrieving revision 1.16 |
57 |
diff -u -r1.15 -r1.16 |
58 |
--- wireshark-99999999.ebuild 24 Jun 2015 05:31:48 -0000 1.15 |
59 |
+++ wireshark-99999999.ebuild 6 Jul 2015 03:02:31 -0000 1.16 |
60 |
@@ -1,6 +1,6 @@ |
61 |
# Copyright 1999-2015 Gentoo Foundation |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.15 2015/06/24 05:31:48 jer Exp $ |
64 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.16 2015/07/06 03:02:31 jer Exp $ |
65 |
|
66 |
EAPI=5 |
67 |
inherit autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils qt4-r2 user |
68 |
@@ -98,7 +98,8 @@ |
69 |
"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ |
70 |
"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ |
71 |
"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \ |
72 |
- "${FILESDIR}"/${PN}-99999999-pkgconfig.patch |
73 |
+ "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \ |
74 |
+ "${FILESDIR}"/${PN}-1.99.7-qt-pie.patch |
75 |
|
76 |
epatch_user |
77 |
|
78 |
|
79 |
|
80 |
|
81 |
1.735 net-analyzer/wireshark/ChangeLog |
82 |
|
83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.735&view=markup |
84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?rev=1.735&content-type=text/plain |
85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/ChangeLog?r1=1.734&r2=1.735 |
86 |
|
87 |
Index: ChangeLog |
88 |
=================================================================== |
89 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v |
90 |
retrieving revision 1.734 |
91 |
retrieving revision 1.735 |
92 |
diff -u -r1.734 -r1.735 |
93 |
--- ChangeLog 3 Jul 2015 08:28:45 -0000 1.734 |
94 |
+++ ChangeLog 6 Jul 2015 03:02:31 -0000 1.735 |
95 |
@@ -1,6 +1,11 @@ |
96 |
# ChangeLog for net-analyzer/wireshark |
97 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
98 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.734 2015/07/03 08:28:45 ago Exp $ |
99 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.735 2015/07/06 03:02:31 jer Exp $ |
100 |
+ |
101 |
+ 06 Jul 2015; Jeroen Roovers <jer@g.o> wireshark-1.12.6.ebuild, |
102 |
+ wireshark-1.99.7.ebuild, wireshark-99999999.ebuild, |
103 |
+ +files/wireshark-1.99.7-qt-pie.patch: |
104 |
+ Qt build does not need -fPIE (maybe bug #552440). |
105 |
|
106 |
03 Jul 2015; Agostino Sarubbo <ago@g.o> wireshark-1.12.6.ebuild: |
107 |
Stable for sparc, wrt bug #552434 |
108 |
|
109 |
|
110 |
|
111 |
1.3 net-analyzer/wireshark/wireshark-1.99.7.ebuild |
112 |
|
113 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild?rev=1.3&view=markup |
114 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild?rev=1.3&content-type=text/plain |
115 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild?r1=1.2&r2=1.3 |
116 |
|
117 |
Index: wireshark-1.99.7.ebuild |
118 |
=================================================================== |
119 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild,v |
120 |
retrieving revision 1.2 |
121 |
retrieving revision 1.3 |
122 |
diff -u -r1.2 -r1.3 |
123 |
--- wireshark-1.99.7.ebuild 24 Jun 2015 05:31:48 -0000 1.2 |
124 |
+++ wireshark-1.99.7.ebuild 6 Jul 2015 03:02:31 -0000 1.3 |
125 |
@@ -1,6 +1,6 @@ |
126 |
# Copyright 1999-2015 Gentoo Foundation |
127 |
# Distributed under the terms of the GNU General Public License v2 |
128 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild,v 1.2 2015/06/24 05:31:48 jer Exp $ |
129 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.7.ebuild,v 1.3 2015/07/06 03:02:31 jer Exp $ |
130 |
|
131 |
EAPI=5 |
132 |
inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user |
133 |
@@ -95,7 +95,8 @@ |
134 |
"${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ |
135 |
"${FILESDIR}"/${PN}-1.99.6-gcc_option.patch \ |
136 |
"${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \ |
137 |
- "${FILESDIR}"/${PN}-99999999-pkgconfig.patch |
138 |
+ "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \ |
139 |
+ "${FILESDIR}"/${PN}-1.99.7-qt-pie.patch |
140 |
|
141 |
epatch_user |
142 |
|
143 |
@@ -131,7 +132,7 @@ |
144 |
|
145 |
use qt4 && export QT_MIN_VERSION=4.6.0 |
146 |
|
147 |
- if use qt5;then |
148 |
+ if use qt5; then |
149 |
export QT_MIN_VERSION=5.3.0 |
150 |
append-cxxflags -fPIC -DPIC |
151 |
fi |