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.210.ebuild chromium-8.0.552.200.ebuild
Date: Wed, 24 Nov 2010 15:59:16
Message-Id: 20101124155910.807EA2004B@flycatcher.gentoo.org
1 phajdan.jr 10/11/24 15:59:10
2
3 Modified: ChangeLog
4 Added: chromium-8.0.552.210.ebuild
5 Removed: chromium-8.0.552.200.ebuild
6 Log:
7 Version bump for beta channel release. Remove old.
8 (Portage version: 2.1.8.3/cvs/Linux i686)
9
10 Revision Changes Path
11 1.229 www-client/chromium/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.229&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.229&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.228&r2=1.229
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
20 retrieving revision 1.228
21 retrieving revision 1.229
22 diff -u -r1.228 -r1.229
23 --- ChangeLog 19 Nov 2010 14:45:41 -0000 1.228
24 +++ ChangeLog 24 Nov 2010 15:59:10 -0000 1.229
25 @@ -1,6 +1,12 @@
26 # ChangeLog for www-client/chromium
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.228 2010/11/19 14:45:41 phajdan.jr Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.229 2010/11/24 15:59:10 phajdan.jr Exp $
30 +
31 +*chromium-8.0.552.210 (24 Nov 2010)
32 +
33 + 24 Nov 2010; Pawel Hajdan jr <phajdan.jr@g.o>
34 + -chromium-8.0.552.200.ebuild, +chromium-8.0.552.210.ebuild:
35 + Version bump for beta channel release. Remove old.
36
37 *chromium-9.0.587.0 (19 Nov 2010)
38
39
40
41
42 1.1 www-client/chromium/chromium-8.0.552.210.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-8.0.552.210.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-8.0.552.210.ebuild?rev=1.1&content-type=text/plain
46
47 Index: chromium-8.0.552.210.ebuild
48 ===================================================================
49 # Copyright 1999-2010 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-8.0.552.210.ebuild,v 1.1 2010/11/24 15:59:10 phajdan.jr Exp $
52
53 EAPI="2"
54
55 inherit eutils flag-o-matic multilib pax-utils portability toolchain-funcs
56
57 DESCRIPTION="Open-source version of Google Chrome web browser"
58 HOMEPAGE="http://chromium.org/"
59 SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
60
61 LICENSE="BSD"
62 SLOT="0"
63 KEYWORDS="~amd64 ~arm ~x86"
64 IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
65
66 RDEPEND="app-arch/bzip2
67 system-sqlite? (
68 >=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe]
69 )
70 system-v8? ( ~dev-lang/v8-2.4.9.13 )
71 >=dev-libs/icu-4.4.1
72 >=dev-libs/libevent-1.4.13
73 dev-libs/libxml2
74 dev-libs/libxslt
75 >=dev-libs/nss-3.12.3
76 >=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 virtual/jpeg
80 media-libs/libpng
81 >=media-video/ffmpeg-0.6_p25423[threads]
82 cups? ( >=net-print/cups-1.3.11 )
83 sys-libs/zlib
84 >=x11-libs/gtk+-2.14.7
85 x11-libs/libXScrnSaver"
86 DEPEND="${RDEPEND}
87 dev-lang/perl
88 >=dev-util/gperf-3.0.3
89 >=dev-util/pkgconfig-0.23
90 sys-devel/flex"
91 RDEPEND+="
92 || (
93 x11-themes/gnome-icon-theme
94 x11-themes/oxygen-molecule
95 x11-themes/tango-icon-theme
96 x11-themes/xfce4-icon-theme
97 )
98 x11-misc/xdg-utils
99 virtual/ttf-fonts
100 gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
101
102 remove_bundled_lib() {
103 einfo "Removing bundled library $1 ..."
104 local out
105 out="$(find $1 -type f \! -iname '*.gyp' -print -delete)" \
106 || die "failed to remove bundled library $1"
107 if [[ -z $out ]]; then
108 die "no files matched when removing bundled library $1"
109 fi
110 }
111
112 pkg_setup() {
113 CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
114
115 # Make sure the build system will use the right tools, bug #340795.
116 tc-export AR CC CXX RANLIB
117
118 # Prevent user problems like bug #299777.
119 if ! grep -q /dev/shm <<< $(get_mounts); then
120 ewarn "You don't have tmpfs mounted at /dev/shm."
121 ewarn "${PN} may fail to start in that configuration."
122 ewarn "Please uncomment the /dev/shm entry in /etc/fstab,"
123 ewarn "and run 'mount /dev/shm'."
124 fi
125 if [ `stat -c %a /dev/shm` -ne 1777 ]; then
126 ewarn "/dev/shm does not have correct permissions."
127 ewarn "${PN} may fail to start in that configuration."
128 ewarn "Please run 'chmod 1777 /dev/shm'."
129 fi
130 }
131
132 src_prepare() {
133 # Small fix to the system-provided icu support,
134 # to be upstreamed.
135 epatch "${FILESDIR}"/${PN}-system-icu-r1.patch
136
137 # Enable optional support for gecko-mediaplayer.
138 epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
139
140 # Backport a fix for bug #343971.
141 epatch "${FILESDIR}"/${PN}-locale-glib-r1.patch
142
143 remove_bundled_lib "third_party/bzip2"
144 remove_bundled_lib "third_party/codesighs"
145 remove_bundled_lib "third_party/icu"
146 remove_bundled_lib "third_party/jemalloc"
147 remove_bundled_lib "third_party/lcov"
148 remove_bundled_lib "third_party/libevent"
149 remove_bundled_lib "third_party/libjpeg"
150 remove_bundled_lib "third_party/libpng"
151 remove_bundled_lib "third_party/libxml"
152 remove_bundled_lib "third_party/libxslt"
153 remove_bundled_lib "third_party/lzma_sdk"
154 remove_bundled_lib "third_party/molokocacao"
155 remove_bundled_lib "third_party/ocmock"
156 remove_bundled_lib "third_party/pyftpdlib"
157 remove_bundled_lib "third_party/simplejson"
158 remove_bundled_lib "third_party/tlslite"
159 # TODO: also remove third_party/ffmpeg (needs to be compile-tested).
160 # TODO: also remove third_party/zlib. For now the compilation fails if we
161 # remove it (minizip-related).
162
163 if use system-sqlite; then
164 remove_bundled_lib "third_party/sqlite/src"
165 remove_bundled_lib "third_party/sqlite/preprocessed"
166 fi
167
168 if use system-v8; then
169 # Provide our own gyp file that links with the system v8.
170 # TODO: move this upstream.
171 cp "${FILESDIR}"/v8.gyp v8/tools/gyp || die
172
173 remove_bundled_lib "v8"
174
175 # The implementation files include v8 headers with full path,
176 # like #include "v8/include/v8.h". Make sure the system headers
177 # will be used.
178 # TODO: find a solution that can be upstreamed.
179 rmdir v8/include || die
180 ln -s /usr/include v8/include || die
181 fi
182 }
183
184 src_configure() {
185 local myconf=""
186
187 # Never tell the build system to "enable" SSE2, it has a few unexpected
188 # additions, bug #336871.
189 myconf+=" -Ddisable_sse2=1"
190
191 # Use system-provided libraries.
192 # TODO: use_system_hunspell (upstream changes needed).
193 # TODO: use_system_ssl (need to consult upstream).
194 myconf+="
195 -Duse_system_bzip2=1
196 -Duse_system_ffmpeg=1
197 -Duse_system_icu=1
198 -Duse_system_libevent=1
199 -Duse_system_libjpeg=1
200 -Duse_system_libpng=1
201 -Duse_system_libxml=1
202 -Duse_system_zlib=1"
203
204 if use system-sqlite; then
205 myconf+=" -Duse_system_sqlite=1"
206 fi
207
208 # The dependency on cups is optional, see bug #324105.
209 if use cups; then
210 myconf+=" -Duse_cups=1"
211 else
212 myconf+=" -Duse_cups=0"
213 fi
214
215 if use "gnome-keyring"; then
216 myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"
217 else
218 # TODO: we should also disable code trying to dlopen
219 # gnome-keyring in that case.
220 myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"
221 fi
222
223 # Enable sandbox.
224 myconf+="
225 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
226 -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
227
228 if host-is-pax; then
229 # Prevent the build from failing (bug #301880). The performance
230 # difference is very small.
231 myconf+=" -Dv8_use_snapshot=0"
232 fi
233
234 if use gecko-mediaplayer; then
235 # Disable hardcoded blacklist for gecko-mediaplayer.
236 # When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes
237 # the browser to hang. We can handle the situation via dependencies,
238 # thus making it possible to use gecko-mediaplayer.
239 append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
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 if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
265 myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44"
266 fi
267
268 # Work around a likely GCC bug, see bug #331945.
269 if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
270 append-flags -fno-ipa-cp
271 fi
272
273 # Make sure that -Werror doesn't get added to CFLAGS by the build system.
274 # Depending on GCC version the warnings are different and we don't want
275 # the build to fail because of that.
276 myconf+=" -Dwerror="
277
278 build/gyp_chromium --depth=. ${myconf} || die
279 }
280
281 src_compile() {
282 emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
283 }
284
285 src_install() {
286 exeinto "${CHROMIUM_HOME}"
287 pax-mark m out/Release/chrome
288 doexe out/Release/chrome
289 doexe out/Release/chrome_sandbox || die
290 fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
291 doexe out/Release/xdg-settings || die
292 doexe "${FILESDIR}"/chromium-launcher.sh || die
293
294 insinto "${CHROMIUM_HOME}"
295 doins out/Release/chrome.pak || die
296 doins out/Release/resources.pak || die
297
298 doins -r out/Release/locales || die
299 doins -r out/Release/resources || die
300
301 # chrome.1 is for chromium --help
302 newman out/Release/chrome.1 chrome.1 || die
303 newman out/Release/chrome.1 chromium.1 || die
304
305 # Chromium looks for these in its folder
306 # See media_posix.cc and base_paths_linux.cc
307 dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
308 dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
309 dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
310
311 # Install icon and desktop entry.
312 newicon out/Release/product_logo_48.png ${PN}-browser.png || die
313 dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
314 make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \
315 "MimeType=text/html;text/xml;application/xhtml+xml;"
316 sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
317
318 # Install GNOME default application entry (bug #303100).
319 if use gnome; then
320 dodir /usr/share/gnome-control-center/default-apps || die
321 insinto /usr/share/gnome-control-center/default-apps
322 doins "${FILESDIR}"/chromium.xml || die
323 fi
324 }