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