Gentoo Archives: gentoo-commits

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