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: metadata.xml ChangeLog chromium-12.0.742.16.ebuild chromium-12.0.742.9-r1.ebuild chromium-10.0.648.205.ebuild chromium-11.0.696.50-r1.ebuild
Date: Tue, 03 May 2011 10:22:10
Message-Id: 20110503102159.5C48D20054@flycatcher.gentoo.org
1 phajdan.jr 11/05/03 10:21:59
2
3 Modified: metadata.xml ChangeLog
4 Added: chromium-12.0.742.16.ebuild
5 Removed: chromium-12.0.742.9-r1.ebuild
6 chromium-10.0.648.205.ebuild
7 chromium-11.0.696.50-r1.ebuild
8 Log:
9 Version bump for dev channel release. Remove old.
10
11 (Portage version: 2.1.9.42/cvs/Linux i686)
12
13 Revision Changes Path
14 1.14 www-client/chromium/metadata.xml
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/metadata.xml?rev=1.14&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/metadata.xml?rev=1.14&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/metadata.xml?r1=1.13&r2=1.14
19
20 Index: metadata.xml
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/metadata.xml,v
23 retrieving revision 1.13
24 retrieving revision 1.14
25 diff -u -r1.13 -r1.14
26 --- metadata.xml 12 Mar 2011 14:40:33 -0000 1.13
27 +++ metadata.xml 3 May 2011 10:21:59 -0000 1.14
28 @@ -3,8 +3,4 @@
29 <pkgmetadata>
30 <herd>chromium</herd>
31 <longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
32 - <use>
33 - <flag name="gecko-mediaplayer">Allow the browser to load
34 - <pkg>www-plugins/gecko-mediaplayer</pkg></flag>
35 - </use>
36 </pkgmetadata>
37
38
39
40 1.349 www-client/chromium/ChangeLog
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.349&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.349&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.348&r2=1.349
45
46 Index: ChangeLog
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
49 retrieving revision 1.348
50 retrieving revision 1.349
51 diff -u -r1.348 -r1.349
52 --- ChangeLog 29 Apr 2011 14:32:32 -0000 1.348
53 +++ ChangeLog 3 May 2011 10:21:59 -0000 1.349
54 @@ -1,6 +1,14 @@
55 # ChangeLog for www-client/chromium
56 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
57 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.348 2011/04/29 14:32:32 tomka Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.349 2011/05/03 10:21:59 phajdan.jr Exp $
59 +
60 +*chromium-12.0.742.16 (03 May 2011)
61 +
62 + 03 May 2011; Pawel Hajdan jr <phajdan.jr@g.o>
63 + -chromium-10.0.648.205.ebuild, -chromium-11.0.696.50-r1.ebuild,
64 + -chromium-12.0.742.9-r1.ebuild, +chromium-12.0.742.16.ebuild,
65 + metadata.xml:
66 + Version bump for dev channel release. Remove old.
67
68 29 Apr 2011; Thomas Kahle <tomka@g.o> chromium-11.0.696.57.ebuild:
69 x86 stable per bug 365125
70
71
72
73 1.1 www-client/chromium/chromium-12.0.742.16.ebuild
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-12.0.742.16.ebuild?rev=1.1&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-12.0.742.16.ebuild?rev=1.1&content-type=text/plain
77
78 Index: chromium-12.0.742.16.ebuild
79 ===================================================================
80 # Copyright 1999-2011 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-12.0.742.16.ebuild,v 1.1 2011/05/03 10:21:59 phajdan.jr Exp $
83
84 EAPI="3"
85 PYTHON_DEPEND="2:2.6"
86
87 inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \
88 pax-utils portability python toolchain-funcs versionator virtualx
89
90 DESCRIPTION="Open-source version of Google Chrome web browser"
91 HOMEPAGE="http://chromium.org/"
92 SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
93
94 LICENSE="BSD"
95 SLOT="0"
96 KEYWORDS="~amd64 ~arm ~x86"
97 IUSE="cups gnome gnome-keyring kerberos xinerama"
98
99 RDEPEND="app-arch/bzip2
100 dev-libs/dbus-glib
101 >=dev-libs/icu-4.4.1
102 >=dev-libs/libevent-1.4.13
103 dev-libs/libxml2[icu]
104 dev-libs/libxslt
105 >=dev-libs/nss-3.12.3
106 gnome? ( >=gnome-base/gconf-2.24.0 )
107 gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
108 >=media-libs/alsa-lib-1.0.19
109 media-libs/flac
110 virtual/jpeg
111 media-libs/libpng
112 >=media-libs/libvpx-0.9.5
113 >=media-libs/libwebp-0.1.2
114 media-libs/speex
115 cups? ( >=net-print/cups-1.3.11 )
116 sys-libs/pam
117 sys-libs/zlib
118 >=virtual/ffmpeg-0.6.90[threads]
119 x11-libs/gtk+:2
120 x11-libs/libXScrnSaver
121 x11-libs/libXtst"
122 DEPEND="${RDEPEND}
123 dev-lang/perl
124 >=dev-util/gperf-3.0.3
125 >=dev-util/pkgconfig-0.23
126 sys-devel/flex
127 >=sys-devel/make-3.81-r2
128 x11-libs/libXinerama
129 test? ( dev-python/simplejson virtual/krb5 )"
130 RDEPEND+="
131 kerberos? ( virtual/krb5 )
132 xinerama? ( x11-libs/libXinerama )
133 x11-misc/xdg-utils
134 virtual/ttf-fonts"
135
136 gyp_use() {
137 if [[ $# -lt 2 ]]; then
138 echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
139 return 1
140 fi
141 if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi
142 }
143
144 egyp() {
145 set -- build/gyp_chromium --depth=. "${@}"
146 echo "${@}" >&2
147 "${@}"
148 }
149
150 pkg_setup() {
151 CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
152
153 # Make sure the build system will use the right tools, bug #340795.
154 tc-export AR CC CXX RANLIB
155
156 # Make sure the build system will use the right python, bug #344367.
157 python_set_active_version 2
158 python_pkg_setup
159
160 # Prevent user problems like bug #299777.
161 if ! grep -q /dev/shm <<< $(get_mounts); then
162 ewarn "You don't have tmpfs mounted at /dev/shm."
163 ewarn "${PN} may fail to start in that configuration."
164 ewarn "Please uncomment the /dev/shm entry in /etc/fstab,"
165 ewarn "and run 'mount /dev/shm'."
166 fi
167 if [ `stat -c %a /dev/shm` -ne 1777 ]; then
168 ewarn "/dev/shm does not have correct permissions."
169 ewarn "${PN} may fail to start in that configuration."
170 ewarn "Please run 'chmod 1777 /dev/shm'."
171 fi
172
173 # Prevent user problems like bug #348235.
174 eshopts_push -s extglob
175 if is-flagq '-g?(gdb)?([1-9])'; then
176 ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
177 ewarn "You may experience really long compilation times and/or increased memory usage."
178 ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
179 fi
180 eshopts_pop
181
182 # Warn if the kernel doesn't support features useful for sandboxing,
183 # bug #363907.
184 CONFIG_CHECK="~PID_NS ~NET_NS"
185 PID_NS_WARNING="PID (process id) namespaces are needed for sandboxing."
186 NET_NS_WARNING="Network namespaces are needed for sandboxing."
187 check_extra_config
188 }
189
190 src_prepare() {
191 # Make sure we don't use bundled libvpx headers.
192 epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
193
194 # Fix compilation with system zlib, bug #364205. To be upstreamed.
195 epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
196
197 # Fix compilation without CUPS, bug #364525. To be upstreamed.
198 epatch "${FILESDIR}/${PN}-cups-r0.patch"
199
200 # Remove most bundled libraries. Some are still needed.
201 find third_party -type f \! -iname '*.gyp*' \
202 \! -path 'third_party/WebKit/*' \
203 \! -path 'third_party/angle/*' \
204 \! -path 'third_party/cacheinvalidation/*' \
205 \! -path 'third_party/cld/*' \
206 \! -path 'third_party/expat/*' \
207 \! -path 'third_party/ffmpeg/*' \
208 \! -path 'third_party/flac/flac.h' \
209 \! -path 'third_party/gpsd/*' \
210 \! -path 'third_party/harfbuzz/*' \
211 \! -path 'third_party/hunspell/*' \
212 \! -path 'third_party/iccjpeg/*' \
213 \! -path 'third_party/launchpad_translations/*' \
214 \! -path 'third_party/leveldb/*' \
215 \! -path 'third_party/libjingle/*' \
216 \! -path 'third_party/libsrtp/*' \
217 \! -path 'third_party/libvpx/libvpx.h' \
218 \! -path 'third_party/mesa/*' \
219 \! -path 'third_party/modp_b64/*' \
220 \! -path 'third_party/npapi/*' \
221 \! -path 'third_party/openmax/*' \
222 \! -path 'third_party/ots/*' \
223 \! -path 'third_party/protobuf/*' \
224 \! -path 'third_party/pyftpdlib/*' \
225 \! -path 'third_party/skia/*' \
226 \! -path 'third_party/speex/speex.h' \
227 \! -path 'third_party/sqlite/*' \
228 \! -path 'third_party/tcmalloc/*' \
229 \! -path 'third_party/tlslite/*' \
230 \! -path 'third_party/undoview/*' \
231 \! -path 'third_party/zlib/contrib/minizip/*' \
232 -delete || die
233
234 # Make sure the build system will use the right python, bug #344367.
235 # Only convert directories that need it, to save time.
236 python_convert_shebangs -q -r 2 build tools
237 }
238
239 src_configure() {
240 local myconf=""
241
242 # Never tell the build system to "enable" SSE2, it has a few unexpected
243 # additions, bug #336871.
244 myconf+=" -Ddisable_sse2=1"
245
246 # Use system-provided libraries.
247 # TODO: use_system_hunspell (upstream changes needed).
248 # TODO: use_system_ssl (http://crbug.com/58087).
249 # TODO: use_system_sqlite (http://crbug.com/22208).
250 myconf+="
251 -Duse_system_bzip2=1
252 -Duse_system_flac=1
253 -Duse_system_ffmpeg=1
254 -Duse_system_icu=1
255 -Duse_system_libevent=1
256 -Duse_system_libjpeg=1
257 -Duse_system_libpng=1
258 -Duse_system_libwebp=1
259 -Duse_system_libxml=1
260 -Duse_system_speex=1
261 -Duse_system_vpx=1
262 -Duse_system_xdg_utils=1
263 -Duse_system_zlib=1"
264
265 # Optional dependencies.
266 myconf+="
267 $(gyp_use cups use_cups)
268 $(gyp_use gnome use_gconf)
269 $(gyp_use gnome-keyring use_gnome_keyring)
270 $(gyp_use gnome-keyring linux_link_gnome_keyring)"
271
272 # Enable sandbox.
273 myconf+="
274 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
275 -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
276
277 if host-is-pax; then
278 # Prevent the build from failing (bug #301880). The performance
279 # difference is very small.
280 myconf+=" -Dv8_use_snapshot=0"
281 fi
282
283 # Our system ffmpeg should support more codecs than the bundled one
284 # for Chromium.
285 myconf+=" -Dproprietary_codecs=1"
286
287 # Use target arch detection logic from bug #354601.
288 case ${CHOST} in
289 i?86-*) myarch=x86 ;;
290 x86_64-*)
291 if [[ $ABI = "" ]] ; then
292 myarch=amd64
293 else
294 myarch="$ABI"
295 fi ;;
296 arm*-*) myarch=arm ;;
297 *) die "Unrecognized CHOST: ${CHOST}"
298 esac
299
300 if [[ $myarch = amd64 ]] ; then
301 myconf+=" -Dtarget_arch=x64"
302 elif [[ $myarch = x86 ]] ; then
303 myconf+=" -Dtarget_arch=ia32"
304 elif [[ $myarch = arm ]] ; then
305 # TODO: check this again after
306 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
307 append-flags -fno-tree-sink
308
309 myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
310 else
311 die "Failed to determine target arch, got '$myarch'."
312 fi
313
314 # Make sure that -Werror doesn't get added to CFLAGS by the build system.
315 # Depending on GCC version the warnings are different and we don't want
316 # the build to fail because of that.
317 myconf+=" -Dwerror="
318
319 # Avoid a build error with -Os, bug #352457.
320 replace-flags "-Os" "-O2"
321
322 egyp ${myconf} || die
323 }
324
325 src_compile() {
326 emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
327 pax-mark m out/Release/chrome
328 if use test; then
329 emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die
330 pax-mark m out/Release/{base,crypto,googleurl,net}_unittests
331 fi
332 }
333
334 src_test() {
335 # For more info see bug #350349.
336 local mylocale='en_US.utf8'
337 if ! locale -a | grep -q "$mylocale"; then
338 eerror "${PN} requires ${mylocale} locale for tests"
339 eerror "Please read the following guides for more information:"
340 eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
341 eerror " http://www.gentoo.org/doc/en/utf-8.xml"
342 die "locale ${mylocale} is not supported"
343 fi
344
345 # For more info see bug #350347.
346 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
347 '--gtest_filter=-ICUStringConversionsTest.*'
348
349 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
350 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
351
352 # NetUtilTest: bug #361885.
353 # UDP: unstable, active development. We should revisit this later.
354 LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
355 '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:*UDP*'
356 }
357
358 src_install() {
359 exeinto "${CHROMIUM_HOME}"
360 doexe out/Release/chrome
361 doexe out/Release/chrome_sandbox || die
362 fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
363 newexe "${FILESDIR}"/chromium-launcher-r1.sh chromium-launcher.sh || die
364
365 # It is important that we name the target "chromium-browser",
366 # xdg-utils expect it; bug #355517.
367 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser || die
368 # keep the old symlink around for consistency
369 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
370
371 insinto "${CHROMIUM_HOME}"
372 doins out/Release/chrome.pak || die
373 doins out/Release/resources.pak || die
374
375 doins -r out/Release/locales || die
376 doins -r out/Release/resources || die
377
378 newman out/Release/chrome.1 chromium.1 || die
379 newman out/Release/chrome.1 chromium-browser.1 || die
380
381 # Chromium looks for these in its folder
382 # See media_posix.cc and base_paths_linux.cc
383 dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
384 dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
385 dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
386
387 # Install icons and desktop entry.
388 for SIZE in 16 22 24 32 48 64 128 256 ; do
389 insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
390 newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
391 chromium-browser.png || die
392 done
393 local mime_types="text/html;text/xml;application/xhtml+xml;"
394 mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
395 make_desktop_entry chromium-browser "Chromium" chromium-browser \
396 "Network;WebBrowser" "MimeType=${mime_types}"
397 sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
398
399 # Install GNOME default application entry (bug #303100).
400 if use gnome; then
401 dodir /usr/share/gnome-control-center/default-apps || die
402 insinto /usr/share/gnome-control-center/default-apps
403 doins "${FILESDIR}"/chromium-browser.xml || die
404 fi
405 }
406
407 pkg_preinst() {
408 gnome2_icon_savelist
409 }
410
411 pkg_postinst() {
412 fdo-mime_desktop_database_update
413 gnome2_icon_cache_update
414
415 # For more info see bug #292201, bug #352263, bug #361859.
416 elog
417 elog "Depending on your desktop environment, you may need"
418 elog "to install additional packages to get icons on the Downloads page."
419 elog
420 elog "For KDE, the required package is kde-base/oxygen-icons."
421 elog
422 elog "For other desktop environments, try one of the following:"
423 elog " - x11-themes/gnome-icon-theme"
424 elog " - x11-themes/tango-icon-theme"
425
426 # For more info see bug #359153.
427 elog
428 elog "Some web pages may require additional fonts to display properly."
429 elog "Try installing some of the following packages if some characters"
430 elog "are not displayed properly:"
431 elog " - media-fonts/arphicfonts"
432 elog " - media-fonts/bitstream-cyberbit"
433 elog " - media-fonts/droid"
434 elog " - media-fonts/ipamonafont"
435 elog " - media-fonts/ja-ipafonts"
436 elog " - media-fonts/takao-fonts"
437 elog " - media-fonts/wqy-microhei"
438 elog " - media-fonts/wqy-zenhei"
439 }
440
441 pkg_postrm() {
442 gnome2_icon_cache_update
443 }