Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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