1 |
phajdan.jr 10/09/07 17:19:25 |
2 |
|
3 |
Modified: ChangeLog chromium-9999.ebuild |
4 |
Added: chromium-7.0.503.1-r1.ebuild |
5 |
Log: |
6 |
Fix dependencies, bug #332411 by Patrizio Bassi <hetfield666@×××××.com> and comment by Yuri Arabadji <yuri@××××××××.net>. |
7 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.171 www-client/chromium/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.171&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.171&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.170&r2=1.171 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
19 |
retrieving revision 1.170 |
20 |
retrieving revision 1.171 |
21 |
diff -u -r1.170 -r1.171 |
22 |
--- ChangeLog 4 Sep 2010 01:52:33 -0000 1.170 |
23 |
+++ ChangeLog 7 Sep 2010 17:19:25 -0000 1.171 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for www-client/chromium |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.170 2010/09/04 01:52:33 phajdan.jr Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.171 2010/09/07 17:19:25 phajdan.jr Exp $ |
29 |
+ |
30 |
+*chromium-7.0.503.1-r1 (07 Sep 2010) |
31 |
+ |
32 |
+ 07 Sep 2010; Pawel Hajdan jr <phajdan.jr@g.o> |
33 |
+ +files/chromium-gnome-keyring-r0.patch, +chromium-7.0.503.1-r1.ebuild, |
34 |
+ chromium-9999.ebuild: |
35 |
+ Fix dependencies, bug #332411 by Patrizio Bassi <hetfield666@×××××.com> |
36 |
+ and comment by Yuri Arabadji <yuri@××××××××.net>. |
37 |
|
38 |
*chromium-6.0.472.53-r1 (04 Sep 2010) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.81 www-client/chromium/chromium-9999.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.81&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.81&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.80&r2=1.81 |
48 |
|
49 |
Index: chromium-9999.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v |
52 |
retrieving revision 1.80 |
53 |
retrieving revision 1.81 |
54 |
diff -u -r1.80 -r1.81 |
55 |
--- chromium-9999.ebuild 28 Aug 2010 18:10:20 -0000 1.80 |
56 |
+++ chromium-9999.ebuild 7 Sep 2010 17:19:25 -0000 1.81 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2010 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.80 2010/08/28 18:10:20 phajdan.jr Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.81 2010/09/07 17:19:25 phajdan.jr Exp $ |
62 |
|
63 |
EAPI="2" |
64 |
|
65 |
@@ -34,8 +34,8 @@ |
66 |
dev-lang/perl |
67 |
>=dev-util/gperf-3.0.3 |
68 |
>=dev-util/pkgconfig-0.23 |
69 |
- >=gnome-base/gnome-keyring-2.28.2 |
70 |
- sys-devel/flex" |
71 |
+ sys-devel/flex |
72 |
+ virtual/perl-version" |
73 |
RDEPEND+=" |
74 |
|| ( |
75 |
x11-themes/gnome-icon-theme |
76 |
@@ -108,6 +108,9 @@ |
77 |
# Add Gentoo plugin paths. |
78 |
epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch |
79 |
|
80 |
+ # Make compile-time dependency on gnome-keyring optional, bug #332411. |
81 |
+ epatch "${FILESDIR}"/${PN}-gnome-keyring-r0.patch |
82 |
+ |
83 |
remove_bundled_lib "third_party/bzip2" |
84 |
remove_bundled_lib "third_party/codesighs" |
85 |
remove_bundled_lib "third_party/cros" |
86 |
@@ -161,11 +164,11 @@ |
87 |
fi |
88 |
|
89 |
if use "gnome-keyring"; then |
90 |
- myconf="${myconf} -Dlinux_link_gnome_keyring=1" |
91 |
+ myconf="${myconf} -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" |
92 |
else |
93 |
# TODO: we should also disable code trying to dlopen |
94 |
# gnome-keyring in that case. |
95 |
- myconf="${myconf} -Dlinux_link_gnome_keyring=0" |
96 |
+ myconf="${myconf} -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0" |
97 |
fi |
98 |
|
99 |
# Enable sandbox. |
100 |
|
101 |
|
102 |
|
103 |
1.1 www-client/chromium/chromium-7.0.503.1-r1.ebuild |
104 |
|
105 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-7.0.503.1-r1.ebuild?rev=1.1&view=markup |
106 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-7.0.503.1-r1.ebuild?rev=1.1&content-type=text/plain |
107 |
|
108 |
Index: chromium-7.0.503.1-r1.ebuild |
109 |
=================================================================== |
110 |
# Copyright 1999-2010 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-7.0.503.1-r1.ebuild,v 1.1 2010/09/07 17:19:25 phajdan.jr Exp $ |
113 |
|
114 |
EAPI="2" |
115 |
|
116 |
inherit eutils flag-o-matic multilib pax-utils toolchain-funcs |
117 |
|
118 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
119 |
HOMEPAGE="http://chromium.org/" |
120 |
SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" |
121 |
|
122 |
LICENSE="BSD" |
123 |
SLOT="0" |
124 |
KEYWORDS="~amd64 ~arm ~x86" |
125 |
IUSE="cups gnome gnome-keyring sse2" |
126 |
|
127 |
RDEPEND="app-arch/bzip2 |
128 |
>=dev-libs/icu-4.4.1 |
129 |
>=dev-libs/libevent-1.4.13 |
130 |
>=dev-libs/nss-3.12.3 |
131 |
>=gnome-base/gconf-2.24.0 |
132 |
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) |
133 |
>=media-libs/alsa-lib-1.0.19 |
134 |
media-libs/jpeg:0 |
135 |
media-libs/libpng |
136 |
cups? ( >=net-print/cups-1.4.4 ) |
137 |
sys-libs/zlib |
138 |
>=x11-libs/gtk+-2.14.7 |
139 |
x11-libs/libXScrnSaver" |
140 |
DEPEND="${RDEPEND} |
141 |
dev-lang/perl |
142 |
>=dev-util/gperf-3.0.3 |
143 |
>=dev-util/pkgconfig-0.23 |
144 |
sys-devel/flex |
145 |
virtual/perl-version" |
146 |
RDEPEND+=" |
147 |
|| ( |
148 |
x11-themes/gnome-icon-theme |
149 |
x11-themes/oxygen-molecule |
150 |
x11-themes/tango-icon-theme |
151 |
x11-themes/xfce4-icon-theme |
152 |
) |
153 |
x11-apps/xmessage |
154 |
x11-misc/xdg-utils |
155 |
virtual/ttf-fonts" |
156 |
|
157 |
get_chromium_home() { |
158 |
echo "/usr/$(get_libdir)/chromium-browser" |
159 |
} |
160 |
|
161 |
remove_bundled_lib() { |
162 |
einfo "Removing bundled library $1 ..." |
163 |
local out |
164 |
out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \ |
165 |
|| die "failed to remove bundled library $1" |
166 |
if [[ -z $out ]]; then |
167 |
die "no files matched when removing bundled library $1" |
168 |
fi |
169 |
} |
170 |
|
171 |
src_prepare() { |
172 |
# Add Gentoo plugin paths. |
173 |
epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch |
174 |
|
175 |
# Make compile-time dependency on gnome-keyring optional, bug #332411. |
176 |
epatch "${FILESDIR}"/${PN}-gnome-keyring-r0.patch |
177 |
|
178 |
remove_bundled_lib "third_party/bzip2" |
179 |
remove_bundled_lib "third_party/codesighs" |
180 |
remove_bundled_lib "third_party/cros" |
181 |
remove_bundled_lib "third_party/icu" |
182 |
remove_bundled_lib "third_party/jemalloc" |
183 |
remove_bundled_lib "third_party/lcov" |
184 |
remove_bundled_lib "third_party/libevent" |
185 |
remove_bundled_lib "third_party/libjpeg" |
186 |
remove_bundled_lib "third_party/libpng" |
187 |
remove_bundled_lib "third_party/lzma_sdk" |
188 |
remove_bundled_lib "third_party/molokocacao" |
189 |
remove_bundled_lib "third_party/ocmock" |
190 |
remove_bundled_lib "third_party/pyftpdlib" |
191 |
remove_bundled_lib "third_party/simplejson" |
192 |
remove_bundled_lib "third_party/tlslite" |
193 |
# TODO: also remove third_party/libxml and third_party/libxslt when |
194 |
# http://crbug.com/29333 is fixed. |
195 |
# TODO: also remove third_party/zlib. For now the compilation fails if we |
196 |
# remove it (minizip-related). |
197 |
} |
198 |
|
199 |
src_configure() { |
200 |
local myconf="" |
201 |
|
202 |
# Make it possible to build chromium on non-sse2 systems. |
203 |
if use sse2; then |
204 |
myconf="${myconf} -Ddisable_sse2=0" |
205 |
else |
206 |
myconf="${myconf} -Ddisable_sse2=1" |
207 |
fi |
208 |
|
209 |
# Use system-provided libraries. |
210 |
# TODO: use_system_ffmpeg (http://crbug.com/50678). |
211 |
# TODO: use_system_libxml (http://crbug.com/29333). |
212 |
# TODO: use_system_sqlite (http://crbug.com/22208). |
213 |
# TODO: use_system_hunspell (upstream changes needed). |
214 |
# TODO: use_system_ssl when we have a recent enough system NSS. |
215 |
myconf="${myconf} |
216 |
-Duse_system_bzip2=1 |
217 |
-Duse_system_icu=1 |
218 |
-Duse_system_libevent=1 |
219 |
-Duse_system_libjpeg=1 |
220 |
-Duse_system_libpng=1 |
221 |
-Duse_system_zlib=1" |
222 |
|
223 |
# The dependency on cups is optional, see bug #324105. |
224 |
if use cups; then |
225 |
myconf="${myconf} -Duse_cups=1" |
226 |
else |
227 |
myconf="${myconf} -Duse_cups=0" |
228 |
fi |
229 |
|
230 |
if use "gnome-keyring"; then |
231 |
myconf="${myconf} -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" |
232 |
else |
233 |
# TODO: we should also disable code trying to dlopen |
234 |
# gnome-keyring in that case. |
235 |
myconf="${myconf} -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0" |
236 |
fi |
237 |
|
238 |
# Enable sandbox. |
239 |
myconf="${myconf} |
240 |
-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox |
241 |
-Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome" |
242 |
|
243 |
# Disable the V8 snapshot. It breaks the build on hardened (bug #301880), |
244 |
# and the performance gain isn't worth it. |
245 |
myconf="${myconf} -Dv8_use_snapshot=0" |
246 |
|
247 |
# Disable tcmalloc memory allocator. It causes problems, |
248 |
# for example bug #320419. |
249 |
myconf="${myconf} -Dlinux_use_tcmalloc=0" |
250 |
|
251 |
# Use target arch detection logic from bug #296917. |
252 |
local myarch="$ABI" |
253 |
[[ $myarch = "" ]] && myarch="$ARCH" |
254 |
|
255 |
if [[ $myarch = amd64 ]] ; then |
256 |
myconf="${myconf} -Dtarget_arch=x64" |
257 |
elif [[ $myarch = x86 ]] ; then |
258 |
myconf="${myconf} -Dtarget_arch=ia32" |
259 |
elif [[ $myarch = arm ]] ; then |
260 |
# TODO: check this again after |
261 |
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. |
262 |
append-flags -fno-tree-sink |
263 |
|
264 |
myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" |
265 |
else |
266 |
die "Failed to determine target arch, got '$myarch'." |
267 |
fi |
268 |
|
269 |
if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then |
270 |
myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" |
271 |
fi |
272 |
|
273 |
# Work around a likely GCC bug, see bug #331945. |
274 |
if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then |
275 |
append-flags -fno-ipa-cp |
276 |
fi |
277 |
|
278 |
# Make sure that -Werror doesn't get added to CFLAGS by the build system. |
279 |
# Depending on GCC version the warnings are different and we don't want |
280 |
# the build to fail because of that. |
281 |
myconf="${myconf} -Dwerror=" |
282 |
|
283 |
build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed" |
284 |
} |
285 |
|
286 |
src_compile() { |
287 |
emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \ |
288 |
CC="$(tc-getCC)" \ |
289 |
CXX="$(tc-getCXX)" \ |
290 |
AR="$(tc-getAR)" \ |
291 |
RANLIB="$(tc-getRANLIB)" \ |
292 |
|| die "compilation failed" |
293 |
} |
294 |
|
295 |
src_install() { |
296 |
dodir "$(get_chromium_home)" |
297 |
|
298 |
exeinto "$(get_chromium_home)" |
299 |
pax-mark m out/Release/chrome |
300 |
doexe out/Release/chrome |
301 |
doexe out/Release/chrome_sandbox |
302 |
fperms 4755 "$(get_chromium_home)/chrome_sandbox" |
303 |
doexe out/Release/xdg-settings |
304 |
doexe "${FILESDIR}"/chromium-launcher.sh |
305 |
|
306 |
insinto "$(get_chromium_home)" |
307 |
doins out/Release/chrome.pak || die "installing chrome.pak failed" |
308 |
doins out/Release/resources.pak || die "installing resources.pak failed" |
309 |
|
310 |
doins -r out/Release/locales |
311 |
doins -r out/Release/resources |
312 |
|
313 |
# chrome.1 is for chromium --help |
314 |
newman out/Release/chrome.1 chrome.1 |
315 |
newman out/Release/chrome.1 chromium.1 |
316 |
|
317 |
doexe out/Release/ffmpegsumo_nolink || die |
318 |
doexe out/Release/libffmpegsumo.so || die |
319 |
|
320 |
# Install icon and desktop entry. |
321 |
newicon out/Release/product_logo_48.png ${PN}-browser.png |
322 |
dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium |
323 |
make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \ |
324 |
"MimeType=text/html;text/xml;application/xhtml+xml;" |
325 |
sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ |
326 |
|| die "desktop file sed failed" |
327 |
|
328 |
# Install GNOME default application entry (bug #303100). |
329 |
if use gnome; then |
330 |
dodir /usr/share/gnome-control-center/default-apps |
331 |
insinto /usr/share/gnome-control-center/default-apps |
332 |
doins "${FILESDIR}"/chromium.xml |
333 |
fi |
334 |
} |