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: ChangeLog chromium-5.0.360.5.ebuild chromium-5.0.342.5.ebuild chromium-5.0.356.0.ebuild
Date: Wed, 31 Mar 2010 05:49:12
Message-Id: E1Nwqnc-0005ka-5p@stork.gentoo.org
1 phajdan.jr 10/03/31 05:49:08
2
3 Modified: ChangeLog
4 Added: chromium-5.0.360.5.ebuild
5 Removed: chromium-5.0.342.5.ebuild chromium-5.0.356.0.ebuild
6 Log:
7 Version bump for dev channel release. Remove old.
8 (Portage version: 2.1.7.17/cvs/Linux i686)
9
10 Revision Changes Path
11 1.72 www-client/chromium/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.72&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.72&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?r1=1.71&r2=1.72
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
20 retrieving revision 1.71
21 retrieving revision 1.72
22 diff -u -r1.71 -r1.72
23 --- ChangeLog 29 Mar 2010 16:14:16 -0000 1.71
24 +++ ChangeLog 31 Mar 2010 05:49:07 -0000 1.72
25 @@ -1,6 +1,13 @@
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.71 2010/03/29 16:14:16 phajdan.jr Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.72 2010/03/31 05:49:07 phajdan.jr Exp $
30 +
31 +*chromium-5.0.360.5 (31 Mar 2010)
32 +
33 + 31 Mar 2010; Pawel Hajdan jr <phajdan.jr@g.o>
34 + -chromium-5.0.342.5.ebuild, -chromium-5.0.356.0.ebuild,
35 + +chromium-5.0.360.5.ebuild:
36 + Version bump for dev channel release. Remove old.
37
38 *chromium-5.0.360.0 (29 Mar 2010)
39
40
41
42
43 1.1 www-client/chromium/chromium-5.0.360.5.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.360.5.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.360.5.ebuild?rev=1.1&content-type=text/plain
47
48 Index: chromium-5.0.360.5.ebuild
49 ===================================================================
50 # Copyright 1999-2010 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.360.5.ebuild,v 1.1 2010/03/31 05:49:07 phajdan.jr Exp $
53
54 EAPI="2"
55 inherit eutils flag-o-matic multilib 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="bindist +ffmpeg +plugins-symlink"
65
66 RDEPEND="app-arch/bzip2
67 >=dev-libs/libevent-1.4.13
68 dev-libs/libxml2
69 dev-libs/libxslt
70 >=dev-libs/nss-3.12.3
71 >=gnome-base/gconf-2.24.0
72 >=media-libs/alsa-lib-1.0.19
73 media-libs/jpeg:0
74 media-libs/libpng
75 ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 )
76 sys-libs/zlib
77 >=x11-libs/gtk+-2.14.7
78 x11-libs/libXScrnSaver"
79 # dev-db/sqlite:3
80 DEPEND="${RDEPEND}
81 >=dev-util/gperf-3.0.3
82 >=dev-util/pkgconfig-0.23
83 sys-devel/flex"
84 RDEPEND+="
85 || (
86 x11-themes/gnome-icon-theme
87 x11-themes/tango-icon-theme
88 x11-themes/xfce4-icon-theme
89 )
90 x11-misc/xdg-utils"
91
92 # Incompatible system plugins:
93 # www-plugins/gecko-mediaplayer, bug #309231.
94 RDEPEND+="
95 plugins-symlink? (
96 !www-plugins/gecko-mediaplayer[gnome]
97 )"
98
99 pkg_setup() {
100 if [[ "${ROOT}" == "/" ]]; then
101 # Prevent user problems like bug 299777.
102 if ! grep -q /dev/shm <<< $(get_mounts); then
103 eerror "You don't have tmpfs mounted at /dev/shm."
104 eerror "${PN} isn't going to work in that configuration."
105 eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
106 eerror "run 'mount /dev/shm' and try again."
107 die "/dev/shm is not mounted"
108 fi
109 if [ `stat -c %a /dev/shm` -ne 1777 ]; then
110 eerror "/dev/shm does not have correct permissions."
111 eerror "${PN} isn't going to work in that configuration."
112 eerror "Please run chmod 1777 /dev/shm and try again."
113 die "/dev/shm has incorrect permissions"
114 fi
115 fi
116
117 elog "${PN} might crash occasionally. To get more useful backtraces"
118 elog "and submit better bug reports, please read"
119 elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
120
121 if ! use bindist; then
122 einfo
123 elog "You may not redistribute this build to any users on your network"
124 elog "or the internet."
125 elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
126 fi
127 }
128
129 src_prepare() {
130 # Gentoo uses .kde4, not .kde
131 # TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
132 # would be better
133 sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
134 || die "kde proxy sed failed"
135 # Changing this in ~/include.gypi does not work
136 sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
137 # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
138 epatch "${FILESDIR}"/${PN}-drop_sse2.patch
139 if ! use bindist; then
140 # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
141 epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
142 fi
143 # Prevent the make build from filling entire disk space on some systems,
144 # bug 297273.
145 epatch "${FILESDIR}"/${PN}-fix-make-build.patch
146
147 # Disable prefixing to allow linking against system zlib
148 sed -e '/^#include "mozzconf.h"$/d' \
149 -i third_party/zlib/zconf.h \
150 || die "zlib sed failed"
151 }
152
153 src_configure() {
154 export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
155
156 # Fails to build on arm if we don't do this
157 use arm && append-flags -fno-tree-sink
158
159 # CFLAGS/LDFLAGS
160 mkdir -p "${S}"/.gyp
161 cat << EOF > "${S}"/.gyp/include.gypi
162 {
163 'target_defaults': {
164 'cflags': [ '${CFLAGS// /','}' ],
165 'ldflags': [ '${LDFLAGS// /','}' ],
166 },
167 }
168 EOF
169 export HOME="${S}"
170
171 # Configuration options (system libraries)
172 local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
173 # -Duse_system_sqlite=1 : http://crbug.com/22208
174 # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
175
176 # Sandbox paths
177 myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
178
179 if use amd64 ; then
180 myconf="${myconf} -Dtarget_arch=x64"
181 fi
182
183 if use x86 ; then
184 myconf="${myconf} -Dtarget_arch=ia32"
185 fi
186
187 if use arm; then
188 myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
189 fi
190
191 if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
192 myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
193 fi
194
195 if use ffmpeg; then
196 myconf="${myconf} -Duse_system_ffmpeg=1"
197 fi
198
199 build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
200 }
201
202 src_compile() {
203 emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
204 rootdir="${S}" \
205 CC=$(tc-getCC) \
206 CXX=$(tc-getCXX) \
207 AR=$(tc-getAR) \
208 RANLIB=$(tc-getRANLIB) \
209 || die "compilation failed"
210 }
211
212 src_install() {
213 # Chromium does not have "install" target in the build system.
214 export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
215
216 dodir ${CHROMIUM_HOME}
217
218 exeinto ${CHROMIUM_HOME}
219 doexe out/Release/chrome
220 doexe out/Release/chrome_sandbox
221 fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
222 doexe out/Release/xdg-settings
223 doexe "${FILESDIR}"/chromium-launcher.sh
224
225 insinto ${CHROMIUM_HOME}
226 doins out/Release/chrome.pak
227
228 doins -r out/Release/locales
229 doins -r out/Release/resources
230
231 # chrome.1 is for chromium --help
232 newman out/Release/chrome.1 chrome.1
233 newman out/Release/chrome.1 chromium.1
234
235 if use ffmpeg; then
236 # Chromium looks for these in its folder
237 # See media_posix.cc and base_paths_linux.cc
238 dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
239 dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
240 dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
241 fi
242
243 # Plugins symlink, optional wrt bug #301911
244 if use plugins-symlink; then
245 dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
246 fi
247
248 # Icon and desktop entry
249 newicon out/Release/product_logo_48.png ${PN}-browser.png
250 dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
251 make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
252 sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
253 || die "desktop file sed failed"
254 # Gnome default application entry
255 dodir /usr/share/gnome-control-center/default-apps
256 insinto /usr/share/gnome-control-center/default-apps
257 doins "${FILESDIR}"/chromium.xml
258 }
Report Message
Find on MARC Find on Google Groups