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-8.0.552.23.ebuild chromium-7.0.517.36.ebuild chromium-8.0.552.11.ebuild chromium-7.0.544.0-r2.ebuild chromium-6.0.472.63.ebuild chromium-6.0.472.62.ebuild
Date: Sat, 30 Oct 2010 08:03:57
Message-Id: 20101030080351.8CEB120051@flycatcher.gentoo.org
1 phajdan.jr 10/10/30 08:03:51
2
3 Modified: ChangeLog
4 Added: chromium-8.0.552.23.ebuild
5 Removed: chromium-7.0.517.36.ebuild
6 chromium-8.0.552.11.ebuild
7 chromium-7.0.544.0-r2.ebuild
8 chromium-6.0.472.63.ebuild
9 chromium-6.0.472.62.ebuild
10 Log:
11 Version bump for dev channel release. Remove old.
12 (Portage version: 2.1.8.3/cvs/Linux i686)
13
14 Revision Changes Path
15 1.211 www-client/chromium/ChangeLog
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.211&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.211&content-type=text/plain
19 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.210&r2=1.211
20
21 Index: ChangeLog
22 ===================================================================
23 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
24 retrieving revision 1.210
25 retrieving revision 1.211
26 diff -u -r1.210 -r1.211
27 --- ChangeLog 29 Oct 2010 08:52:07 -0000 1.210
28 +++ ChangeLog 30 Oct 2010 08:03:51 -0000 1.211
29 @@ -1,6 +1,14 @@
30 # ChangeLog for www-client/chromium
31 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
32 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.210 2010/10/29 08:52:07 phajdan.jr Exp $
33 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.211 2010/10/30 08:03:51 phajdan.jr Exp $
34 +
35 +*chromium-8.0.552.23 (30 Oct 2010)
36 +
37 + 30 Oct 2010; Pawel Hajdan jr <phajdan.jr@g.o>
38 + -chromium-6.0.472.62.ebuild, -chromium-6.0.472.63.ebuild,
39 + -chromium-7.0.517.36.ebuild, -chromium-7.0.544.0-r2.ebuild,
40 + -chromium-8.0.552.11.ebuild, +chromium-8.0.552.23.ebuild:
41 + Version bump for dev channel release. Remove old.
42
43 29 Oct 2010; Pawel Hajdan jr <phajdan.jr@g.o> +files/v8.gyp,
44 chromium-8.0.552.18.ebuild, chromium-9999.ebuild, metadata.xml:
45
46
47
48 1.1 www-client/chromium/chromium-8.0.552.23.ebuild
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-8.0.552.23.ebuild?rev=1.1&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-8.0.552.23.ebuild?rev=1.1&content-type=text/plain
52
53 Index: chromium-8.0.552.23.ebuild
54 ===================================================================
55 # Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-8.0.552.23.ebuild,v 1.1 2010/10/30 08:03:51 phajdan.jr Exp $
58
59 EAPI="2"
60
61 inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
62
63 DESCRIPTION="Open-source version of Google Chrome web browser"
64 HOMEPAGE="http://chromium.org/"
65 SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
66
67 LICENSE="BSD"
68 SLOT="0"
69 KEYWORDS="~amd64 ~arm ~x86"
70 IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
71
72 RDEPEND="app-arch/bzip2
73 system-sqlite? (
74 >=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
75 )
76 system-v8? ( ~dev-lang/v8-2.4.9.6 )
77 >=dev-libs/icu-4.4.1
78 >=dev-libs/libevent-1.4.13
79 dev-libs/libxml2
80 dev-libs/libxslt
81 >=dev-libs/nss-3.12.3
82 >=gnome-base/gconf-2.24.0
83 gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
84 >=media-libs/alsa-lib-1.0.19
85 media-libs/jpeg:0
86 media-libs/libpng
87 >=media-video/ffmpeg-0.6_p25423[threads]
88 cups? ( >=net-print/cups-1.4.4 )
89 sys-libs/zlib
90 >=x11-libs/gtk+-2.14.7
91 x11-libs/libXScrnSaver"
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 RDEPEND+="
98 || (
99 x11-themes/gnome-icon-theme
100 x11-themes/oxygen-molecule
101 x11-themes/tango-icon-theme
102 x11-themes/xfce4-icon-theme
103 )
104 x11-apps/xmessage
105 x11-misc/xdg-utils
106 virtual/ttf-fonts
107 gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
108
109 remove_bundled_lib() {
110 einfo "Removing bundled library $1 ..."
111 local out
112 out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \
113 || die "failed to remove bundled library $1"
114 if [[ -z $out ]]; then
115 die "no files matched when removing bundled library $1"
116 fi
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
126 src_prepare() {
127 # Small fix to the system-provided icu support,
128 # to be upstreamed.
129 epatch "${FILESDIR}"/${PN}-system-icu-r1.patch
130
131 # Enable optional support for gecko-mediaplayer.
132 epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
133
134 remove_bundled_lib "third_party/bzip2"
135 remove_bundled_lib "third_party/codesighs"
136 remove_bundled_lib "third_party/icu"
137 remove_bundled_lib "third_party/jemalloc"
138 remove_bundled_lib "third_party/lcov"
139 remove_bundled_lib "third_party/libevent"
140 remove_bundled_lib "third_party/libjpeg"
141 remove_bundled_lib "third_party/libpng"
142 remove_bundled_lib "third_party/libxml"
143 remove_bundled_lib "third_party/libxslt"
144 remove_bundled_lib "third_party/lzma_sdk"
145 remove_bundled_lib "third_party/molokocacao"
146 remove_bundled_lib "third_party/ocmock"
147 remove_bundled_lib "third_party/pyftpdlib"
148 remove_bundled_lib "third_party/simplejson"
149 remove_bundled_lib "third_party/tlslite"
150 # TODO: also remove third_party/ffmpeg (needs to be compile-tested).
151 # TODO: also remove third_party/zlib. For now the compilation fails if we
152 # remove it (minizip-related).
153
154 if use system-sqlite; then
155 remove_bundled_lib "third_party/sqlite/src"
156 remove_bundled_lib "third_party/sqlite/preprocessed"
157 fi
158
159 if use system-v8; then
160 # Provide our own gyp file that links with the system v8.
161 # TODO: move this upstream.
162 cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
163
164 remove_bundled_lib "v8"
165
166 # The implementation files include v8 headers with full path,
167 # like #include "v8/include/v8.h". Make sure the system headers
168 # will be used.
169 # TODO: find a solution that can be upstreamed.
170 rmdir v8/include || die
171 ln -s /usr/include v8/include || die
172 fi
173 }
174
175 src_configure() {
176 local myconf=""
177
178 # Never tell the build system to "enable" SSE2, it has a few unexpected
179 # additions, bug #336871.
180 myconf+=" -Ddisable_sse2=1"
181
182 # Use system-provided libraries.
183 # TODO: use_system_hunspell (upstream changes needed).
184 # TODO: use_system_ssl (need to consult upstream).
185 myconf+="
186 -Duse_system_bzip2=1
187 -Duse_system_ffmpeg=1
188 -Duse_system_icu=1
189 -Duse_system_libevent=1
190 -Duse_system_libjpeg=1
191 -Duse_system_libpng=1
192 -Duse_system_libxml=1
193 -Duse_system_zlib=1"
194
195 if use system-sqlite; then
196 myconf+=" -Duse_system_sqlite=1"
197 fi
198
199 # The dependency on cups is optional, see bug #324105.
200 if use cups; then
201 myconf+=" -Duse_cups=1"
202 else
203 myconf+=" -Duse_cups=0"
204 fi
205
206 if use "gnome-keyring"; then
207 myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"
208 else
209 # TODO: we should also disable code trying to dlopen
210 # gnome-keyring in that case.
211 myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"
212 fi
213
214 # Enable sandbox.
215 myconf+="
216 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
217 -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
218
219 if host-is-pax; then
220 # Prevent the build from failing (bug #301880). The performance
221 # difference is very small.
222 myconf+=" -Dv8_use_snapshot=0"
223 fi
224
225 if use gecko-mediaplayer; then
226 # Disable hardcoded blacklist for gecko-mediaplayer.
227 # When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes
228 # the browser to hang. We can handle the situation via dependencies,
229 # thus making it possible to use gecko-mediaplayer.
230 append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
231 fi
232
233 # Our system ffmpeg should support more codecs than the bundled one
234 # for Chromium.
235 myconf+=" -Dproprietary_codecs=1"
236
237 # Use target arch detection logic from bug #296917.
238 local myarch="$ABI"
239 [[ $myarch = "" ]] && myarch="$ARCH"
240
241 if [[ $myarch = amd64 ]] ; then
242 myconf+=" -Dtarget_arch=x64"
243 elif [[ $myarch = x86 ]] ; then
244 myconf+=" -Dtarget_arch=ia32"
245 elif [[ $myarch = arm ]] ; then
246 # TODO: check this again after
247 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
248 append-flags -fno-tree-sink
249
250 myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
251 else
252 die "Failed to determine target arch, got '$myarch'."
253 fi
254
255 if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
256 myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44"
257 fi
258
259 # Work around a likely GCC bug, see bug #331945.
260 if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
261 append-flags -fno-ipa-cp
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 build/gyp_chromium --depth=. ${myconf} || die
270 }
271
272 src_compile() {
273 emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
274 }
275
276 src_install() {
277 exeinto "${CHROMIUM_HOME}"
278 pax-mark m out/Release/chrome
279 doexe out/Release/chrome
280 doexe out/Release/chrome_sandbox || die
281 fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
282 doexe out/Release/xdg-settings || die
283 doexe "${FILESDIR}"/chromium-launcher.sh || die
284
285 insinto "${CHROMIUM_HOME}"
286 doins out/Release/chrome.pak || die
287 doins out/Release/resources.pak || die
288
289 doins -r out/Release/locales || die
290 doins -r out/Release/resources || die
291
292 # chrome.1 is for chromium --help
293 newman out/Release/chrome.1 chrome.1 || die
294 newman out/Release/chrome.1 chromium.1 || die
295
296 # Chromium looks for these in its folder
297 # See media_posix.cc and base_paths_linux.cc
298 dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
299 dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
300 dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
301
302 # Install icon and desktop entry.
303 newicon out/Release/product_logo_48.png ${PN}-browser.png || die
304 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
305 make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \
306 "MimeType=text/html;text/xml;application/xhtml+xml;"
307 sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
308
309 # Install GNOME default application entry (bug #303100).
310 if use gnome; then
311 dodir /usr/share/gnome-control-center/default-apps || die
312 insinto /usr/share/gnome-control-center/default-apps
313 doins "${FILESDIR}"/chromium.xml || die
314 fi
315 }