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