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