1 |
phajdan.jr 11/03/01 14:41:18 |
2 |
|
3 |
Modified: ChangeLog chromium-9999-r1.ebuild |
4 |
Added: chromium-11.0.686.0.ebuild |
5 |
Log: |
6 |
Version bump for dev channel release. |
7 |
|
8 |
(Portage version: 2.1.9.25/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.295 www-client/chromium/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.295&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.295&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.294&r2=1.295 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
20 |
retrieving revision 1.294 |
21 |
retrieving revision 1.295 |
22 |
diff -u -r1.294 -r1.295 |
23 |
--- ChangeLog 1 Mar 2011 13:52:49 -0000 1.294 |
24 |
+++ ChangeLog 1 Mar 2011 14:41:18 -0000 1.295 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for www-client/chromium |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.294 2011/03/01 13:52:49 wired Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.295 2011/03/01 14:41:18 phajdan.jr Exp $ |
30 |
+ |
31 |
+*chromium-11.0.686.0 (01 Mar 2011) |
32 |
+ |
33 |
+ 01 Mar 2011; Pawel Hajdan jr <phajdan.jr@g.o> |
34 |
+ +files/chromium-system-icu-r0.patch, +chromium-11.0.686.0.ebuild, |
35 |
+ chromium-9999-r1.ebuild: |
36 |
+ Version bump for dev channel release. |
37 |
|
38 |
*chromium-9999-r1 (01 Mar 2011) |
39 |
*chromium-11.0.672.2-r3 (01 Mar 2011) |
40 |
|
41 |
|
42 |
|
43 |
1.2 www-client/chromium/chromium-9999-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.2&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.2&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.1&r2=1.2 |
48 |
|
49 |
Index: chromium-9999-r1.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v |
52 |
retrieving revision 1.1 |
53 |
retrieving revision 1.2 |
54 |
diff -u -r1.1 -r1.2 |
55 |
--- chromium-9999-r1.ebuild 1 Mar 2011 13:52:49 -0000 1.1 |
56 |
+++ chromium-9999-r1.ebuild 1 Mar 2011 14:41:18 -0000 1.2 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/03/01 13:52:49 wired Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.2 2011/03/01 14:41:18 phajdan.jr Exp $ |
62 |
|
63 |
EAPI="3" |
64 |
PYTHON_DEPEND="2:2.6" |
65 |
@@ -175,10 +175,6 @@ |
66 |
\! -path 'third_party/zlib/contrib/minizip/*' \ |
67 |
-delete || die |
68 |
|
69 |
- # Provide our own gyp file to use system flac. |
70 |
- # TODO: move this upstream. |
71 |
- cp "${FILESDIR}/flac.gyp" "third_party/flac" || die |
72 |
- |
73 |
# Remove bundled v8. |
74 |
find v8 -type f \! -iname '*.gyp*' -delete || die |
75 |
|
76 |
@@ -213,6 +209,7 @@ |
77 |
# TODO: use_system_sqlite (http://crbug.com/22208). |
78 |
myconf+=" |
79 |
-Duse_system_bzip2=1 |
80 |
+ -Duse_system_flac=1 |
81 |
-Duse_system_ffmpeg=1 |
82 |
-Duse_system_icu=1 |
83 |
-Duse_system_libevent=1 |
84 |
|
85 |
|
86 |
|
87 |
1.1 www-client/chromium/chromium-11.0.686.0.ebuild |
88 |
|
89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-11.0.686.0.ebuild?rev=1.1&view=markup |
90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-11.0.686.0.ebuild?rev=1.1&content-type=text/plain |
91 |
|
92 |
Index: chromium-11.0.686.0.ebuild |
93 |
=================================================================== |
94 |
# Copyright 1999-2011 Gentoo Foundation |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.686.0.ebuild,v 1.1 2011/03/01 14:41:18 phajdan.jr Exp $ |
97 |
|
98 |
EAPI="3" |
99 |
PYTHON_DEPEND="2:2.6" |
100 |
V8_DEPEND="3.1.6.1" |
101 |
|
102 |
inherit eutils fdo-mime flag-o-matic multilib pax-utils portability python \ |
103 |
toolchain-funcs versionator virtualx |
104 |
|
105 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
106 |
HOMEPAGE="http://chromium.org/" |
107 |
SRC_URI="http://build.chromium.org/official/${P}.tar.bz2" |
108 |
|
109 |
LICENSE="BSD" |
110 |
SLOT="0" |
111 |
KEYWORDS="~amd64 ~x86" |
112 |
IUSE="cups gnome gnome-keyring" |
113 |
|
114 |
RDEPEND="app-arch/bzip2 |
115 |
>=dev-lang/v8-${V8_DEPEND} |
116 |
dev-libs/dbus-glib |
117 |
>=dev-libs/icu-4.4.1 |
118 |
>=dev-libs/libevent-1.4.13 |
119 |
dev-libs/libxml2[icu] |
120 |
dev-libs/libxslt |
121 |
>=dev-libs/nss-3.12.3 |
122 |
gnome? ( >=gnome-base/gconf-2.24.0 ) |
123 |
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) |
124 |
>=media-libs/alsa-lib-1.0.19 |
125 |
media-libs/flac |
126 |
virtual/jpeg |
127 |
media-libs/libpng |
128 |
media-libs/libvpx |
129 |
media-libs/speex |
130 |
>=media-video/ffmpeg-0.6_p25767[threads] |
131 |
cups? ( >=net-print/cups-1.3.11 ) |
132 |
sys-libs/zlib |
133 |
x11-libs/gtk+:2 |
134 |
x11-libs/libXScrnSaver |
135 |
x11-libs/libXtst" |
136 |
DEPEND="${RDEPEND} |
137 |
dev-lang/perl |
138 |
>=dev-util/chromium-tools-0.1.4 |
139 |
>=dev-util/gperf-3.0.3 |
140 |
>=dev-util/pkgconfig-0.23 |
141 |
sys-devel/flex |
142 |
>=sys-devel/make-3.81-r2" |
143 |
RDEPEND+=" |
144 |
|| ( |
145 |
x11-themes/gnome-icon-theme |
146 |
x11-themes/xfce4-icon-theme |
147 |
) |
148 |
x11-misc/xdg-utils |
149 |
virtual/ttf-fonts" |
150 |
|
151 |
egyp() { |
152 |
set -- build/gyp_chromium --depth=. "${@}" |
153 |
echo "${@}" >&2 |
154 |
"${@}" |
155 |
} |
156 |
|
157 |
pkg_setup() { |
158 |
CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" |
159 |
|
160 |
# Make sure the build system will use the right tools, bug #340795. |
161 |
tc-export AR CC CXX RANLIB |
162 |
|
163 |
# Make sure the build system will use the right python, bug #344367. |
164 |
python_set_active_version 2 |
165 |
python_pkg_setup |
166 |
|
167 |
# Prevent user problems like bug #299777. |
168 |
if ! grep -q /dev/shm <<< $(get_mounts); then |
169 |
ewarn "You don't have tmpfs mounted at /dev/shm." |
170 |
ewarn "${PN} may fail to start in that configuration." |
171 |
ewarn "Please uncomment the /dev/shm entry in /etc/fstab," |
172 |
ewarn "and run 'mount /dev/shm'." |
173 |
fi |
174 |
if [ `stat -c %a /dev/shm` -ne 1777 ]; then |
175 |
ewarn "/dev/shm does not have correct permissions." |
176 |
ewarn "${PN} may fail to start in that configuration." |
177 |
ewarn "Please run 'chmod 1777 /dev/shm'." |
178 |
fi |
179 |
|
180 |
# Prevent user problems like bug #348235. |
181 |
eshopts_push -s extglob |
182 |
if is-flagq '-g?(gdb)?([1-9])'; then |
183 |
ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." |
184 |
ewarn "You may experience really long compilation times and/or increased memory usage." |
185 |
ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug." |
186 |
fi |
187 |
eshopts_pop |
188 |
} |
189 |
|
190 |
src_prepare() { |
191 |
# Make sure we don't use bundled libvpx headers. |
192 |
epatch "${FILESDIR}"/${PN}-system-vpx-r2.patch |
193 |
|
194 |
# Make sure we don't use bundled ICU headers. |
195 |
epatch "${FILESDIR}"/${PN}-system-icu-r0.patch |
196 |
|
197 |
# Remove most bundled libraries. Some are still needed. |
198 |
find third_party -type f \! -iname '*.gyp*' \ |
199 |
\! -path 'third_party/WebKit/*' \ |
200 |
\! -path 'third_party/angle/*' \ |
201 |
\! -path 'third_party/cacheinvalidation/*' \ |
202 |
\! -path 'third_party/cld/*' \ |
203 |
\! -path 'third_party/expat/*' \ |
204 |
\! -path 'third_party/ffmpeg/*' \ |
205 |
\! -path 'third_party/flac/flac.h' \ |
206 |
\! -path 'third_party/gpsd/*' \ |
207 |
\! -path 'third_party/harfbuzz/*' \ |
208 |
\! -path 'third_party/hunspell/*' \ |
209 |
\! -path 'third_party/iccjpeg/*' \ |
210 |
\! -path 'third_party/launchpad_translations/*' \ |
211 |
\! -path 'third_party/libjingle/*' \ |
212 |
\! -path 'third_party/libsrtp/*' \ |
213 |
\! -path 'third_party/libwebp/*' \ |
214 |
\! -path 'third_party/mesa/*' \ |
215 |
\! -path 'third_party/modp_b64/*' \ |
216 |
\! -path 'third_party/npapi/*' \ |
217 |
\! -path 'third_party/openmax/*' \ |
218 |
\! -path 'third_party/ots/*' \ |
219 |
\! -path 'third_party/protobuf/*' \ |
220 |
\! -path 'third_party/skia/*' \ |
221 |
\! -path 'third_party/speex/speex.h' \ |
222 |
\! -path 'third_party/sqlite/*' \ |
223 |
\! -path 'third_party/tcmalloc/*' \ |
224 |
\! -path 'third_party/undoview/*' \ |
225 |
\! -path 'third_party/zlib/contrib/minizip/*' \ |
226 |
-delete || die |
227 |
|
228 |
# Check for the maintainer to ensure that the dependencies |
229 |
# are up-to-date. |
230 |
local v8_bundled="$(v8-extract-version v8/src/version.cc)" |
231 |
if [ "${V8_DEPEND}" != "${v8_bundled}" ]; then |
232 |
die "update v8 dependency to ${v8_bundled}" |
233 |
fi |
234 |
|
235 |
# Remove bundled v8. |
236 |
find v8 -type f \! -iname '*.gyp*' -delete || die |
237 |
|
238 |
# Disable experimental extensions incompatible with system-provided V8, |
239 |
# bug #354343. |
240 |
cp "${FILESDIR}/experimental.gyp" "v8/src/extensions/experimental" || die |
241 |
sed -e 's/ENABLE_JAVASCRIPT_I18N_API=1/ENABLE_JAVASCRIPT_I18N_API=0/g' \ |
242 |
-i build/features_override.gypi || die |
243 |
|
244 |
# The implementation files include v8 headers with full path, |
245 |
# like #include "v8/include/v8.h". Make sure the system headers |
246 |
# will be used. |
247 |
# TODO: find a solution that can be upstreamed. |
248 |
rmdir v8/include || die |
249 |
ln -s /usr/include v8/include || die |
250 |
|
251 |
# Make sure the build system will use the right python, bug #344367. |
252 |
# Only convert directories that need it, to save time. |
253 |
python_convert_shebangs -q -r 2 build tools |
254 |
} |
255 |
|
256 |
src_configure() { |
257 |
local myconf="" |
258 |
|
259 |
# Never tell the build system to "enable" SSE2, it has a few unexpected |
260 |
# additions, bug #336871. |
261 |
myconf+=" -Ddisable_sse2=1" |
262 |
|
263 |
# Use system-provided libraries. |
264 |
# TODO: use_system_hunspell (upstream changes needed). |
265 |
# TODO: use_system_ssl (http://crbug.com/58087). |
266 |
# TODO: use_system_sqlite (http://crbug.com/22208). |
267 |
myconf+=" |
268 |
-Duse_system_bzip2=1 |
269 |
-Duse_system_flac=1 |
270 |
-Duse_system_ffmpeg=1 |
271 |
-Duse_system_icu=1 |
272 |
-Duse_system_libevent=1 |
273 |
-Duse_system_libjpeg=1 |
274 |
-Duse_system_libpng=1 |
275 |
-Duse_system_libxml=1 |
276 |
-Duse_system_speex=1 |
277 |
-Duse_system_v8=1 |
278 |
-Duse_system_vpx=1 |
279 |
-Duse_system_xdg_utils=1 |
280 |
-Duse_system_zlib=1" |
281 |
|
282 |
# The dependency on cups is optional, see bug #324105. |
283 |
if use cups; then |
284 |
myconf+=" -Duse_cups=1" |
285 |
else |
286 |
myconf+=" -Duse_cups=0" |
287 |
fi |
288 |
|
289 |
# Make GConf dependency optional, http://crbug.com/13322. |
290 |
if use gnome; then |
291 |
myconf+=" -Duse_gconf=1" |
292 |
else |
293 |
myconf+=" -Duse_gconf=0" |
294 |
fi |
295 |
|
296 |
if use "gnome-keyring"; then |
297 |
myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" |
298 |
else |
299 |
# TODO: we should also disable code trying to dlopen |
300 |
# gnome-keyring in that case. |
301 |
myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0" |
302 |
fi |
303 |
|
304 |
# Enable sandbox. |
305 |
myconf+=" |
306 |
-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
307 |
-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
308 |
|
309 |
# Our system ffmpeg should support more codecs than the bundled one |
310 |
# for Chromium. |
311 |
myconf+=" -Dproprietary_codecs=1" |
312 |
|
313 |
# Use target arch detection logic from bug #296917. |
314 |
local myarch="$ABI" |
315 |
[[ $myarch = "" ]] && myarch="$ARCH" |
316 |
|
317 |
if [[ $myarch = amd64 ]] ; then |
318 |
myconf+=" -Dtarget_arch=x64" |
319 |
elif [[ $myarch = x86 ]] ; then |
320 |
myconf+=" -Dtarget_arch=ia32" |
321 |
elif [[ $myarch = arm ]] ; then |
322 |
# TODO: check this again after |
323 |
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. |
324 |
append-flags -fno-tree-sink |
325 |
|
326 |
myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" |
327 |
else |
328 |
die "Failed to determine target arch, got '$myarch'." |
329 |
fi |
330 |
|
331 |
# Make sure that -Werror doesn't get added to CFLAGS by the build system. |
332 |
# Depending on GCC version the warnings are different and we don't want |
333 |
# the build to fail because of that. |
334 |
myconf+=" -Dwerror=" |
335 |
|
336 |
# Avoid a build error with -Os, bug #352457. |
337 |
replace-flags "-Os" "-O2" |
338 |
|
339 |
egyp ${myconf} || die |
340 |
} |
341 |
|
342 |
src_compile() { |
343 |
emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die |
344 |
pax-mark m out/Release/chrome |
345 |
if use test; then |
346 |
emake base_unittests BUILDTYPE=Release V=1 || die |
347 |
pax-mark m out/Release/base_unittests |
348 |
fi |
349 |
} |
350 |
|
351 |
src_test() { |
352 |
# For more info see bug #350349. |
353 |
local mylocale='en_US.utf8' |
354 |
if ! locale -a | grep -q "$mylocale"; then |
355 |
eerror "${PN} requires ${mylocale} locale for tests" |
356 |
eerror "Please read the following guides for more information:" |
357 |
eerror " http://www.gentoo.org/doc/en/guide-localization.xml" |
358 |
eerror " http://www.gentoo.org/doc/en/utf-8.xml" |
359 |
die "locale ${mylocale} is not supported" |
360 |
fi |
361 |
|
362 |
# For more info see bug #350347. |
363 |
LC_ALL="${mylocale}" maketype=out/Release/base_unittests virtualmake \ |
364 |
'--gtest_filter=-ICUStringConversionsTest.*' || die |
365 |
} |
366 |
|
367 |
src_install() { |
368 |
exeinto "${CHROMIUM_HOME}" |
369 |
doexe out/Release/chrome |
370 |
doexe out/Release/chrome_sandbox || die |
371 |
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
372 |
newexe "${FILESDIR}"/chromium-launcher-r1.sh chromium-launcher.sh || die |
373 |
|
374 |
# It is important that we name the target "chromium-browser", |
375 |
# xdg-utils expect it; bug #355517. |
376 |
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser || die |
377 |
# keep the old symlink around for consistency |
378 |
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die |
379 |
|
380 |
insinto "${CHROMIUM_HOME}" |
381 |
doins out/Release/chrome.pak || die |
382 |
doins out/Release/resources.pak || die |
383 |
|
384 |
doins -r out/Release/locales || die |
385 |
doins -r out/Release/resources || die |
386 |
|
387 |
newman out/Release/chrome.1 chromium.1 || die |
388 |
newman out/Release/chrome.1 chromium-browser.1 || die |
389 |
|
390 |
# Chromium looks for these in its folder |
391 |
# See media_posix.cc and base_paths_linux.cc |
392 |
dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die |
393 |
dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die |
394 |
dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die |
395 |
|
396 |
# Install icon and desktop entry. |
397 |
newicon chrome/app/theme/chromium/product_logo_48.png \ |
398 |
chromium-browser.png || die |
399 |
make_desktop_entry chromium-browser "Chromium" chromium-browser \ |
400 |
"Network;WebBrowser" "MimeType=text/html;text/xml;application/xhtml+xml;" |
401 |
sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die |
402 |
|
403 |
# Install GNOME default application entry (bug #303100). |
404 |
if use gnome; then |
405 |
dodir /usr/share/gnome-control-center/default-apps || die |
406 |
insinto /usr/share/gnome-control-center/default-apps |
407 |
doins "${FILESDIR}"/chromium-browser.xml || die |
408 |
fi |
409 |
} |
410 |
|
411 |
pkg_postinst() { |
412 |
fdo-mime_desktop_database_update |
413 |
} |