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.375.23.ebuild chromium-5.0.371.0.ebuild
Date: Wed, 28 Apr 2010 13:12:25
Message-Id: 20100428131218.5A4AE2C063@corvid.gentoo.org
1 phajdan.jr 10/04/28 13:12:18
2
3 Modified: ChangeLog
4 Added: chromium-5.0.375.23.ebuild
5 Removed: chromium-5.0.371.0.ebuild
6 Log:
7 Version bump for dev channel release. Remove old.
8 (Portage version: 2.1.8.3/cvs/Linux i686)
9
10 Revision Changes Path
11 1.91 www-client/chromium/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.91&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?rev=1.91&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/ChangeLog?r1=1.90&r2=1.91
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
20 retrieving revision 1.90
21 retrieving revision 1.91
22 diff -u -r1.90 -r1.91
23 --- ChangeLog 26 Apr 2010 11:43:49 -0000 1.90
24 +++ ChangeLog 28 Apr 2010 13:12:17 -0000 1.91
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.90 2010/04/26 11:43:49 voyageur Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.91 2010/04/28 13:12:17 phajdan.jr Exp $
30 +
31 +*chromium-5.0.375.23 (28 Apr 2010)
32 +
33 + 28 Apr 2010; Pawel Hajdan jr <phajdan.jr@g.o>
34 + -chromium-5.0.371.0.ebuild, +chromium-5.0.375.23.ebuild:
35 + Version bump for dev channel release. Remove old.
36
37 26 Apr 2010; Bernard Cafarelli <voyageur@g.o>
38 +files/chromium-gcc45.patch, chromium-5.0.342.9.ebuild:
39
40
41
42 1.1 www-client/chromium/chromium-5.0.375.23.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.375.23.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-5.0.375.23.ebuild?rev=1.1&content-type=text/plain
46
47 Index: chromium-5.0.375.23.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-5.0.375.23.ebuild,v 1.1 2010/04/28 13:12:18 phajdan.jr Exp $
52
53 EAPI="2"
54 inherit eutils flag-o-matic multilib portability toolchain-funcs
55
56 DESCRIPTION="Open-source version of Google Chrome web browser"
57 HOMEPAGE="http://chromium.org/"
58 SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
59
60 LICENSE="BSD"
61 SLOT="0"
62 KEYWORDS="~amd64 ~arm ~x86"
63 IUSE="mp3 +plugins-symlink x264"
64
65 RDEPEND="app-arch/bzip2
66 >=dev-libs/libevent-1.4.13
67 dev-libs/libxml2
68 dev-libs/libxslt
69 >=dev-libs/nss-3.12.3
70 >=gnome-base/gconf-2.24.0
71 >=media-libs/alsa-lib-1.0.19
72 media-libs/jpeg:0
73 media-libs/libpng
74 >=media-video/ffmpeg-0.5_p21602[mp3=,threads,x264=]
75 sys-libs/zlib
76 >=x11-libs/gtk+-2.14.7
77 x11-libs/libXScrnSaver"
78 # dev-db/sqlite:3
79 DEPEND="${RDEPEND}
80 dev-lang/perl
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/oxygen-molecule
88 x11-themes/tango-icon-theme
89 x11-themes/xfce4-icon-theme
90 )
91 x11-misc/xdg-utils
92 virtual/ttf-fonts"
93
94 # Incompatible system plugins:
95 # www-plugins/gecko-mediaplayer, bug #309231.
96 RDEPEND+="
97 plugins-symlink? (
98 !www-plugins/gecko-mediaplayer[gnome]
99 )"
100
101 pkg_setup() {
102 if [[ "${ROOT}" == "/" ]]; then
103 # Prevent user problems like bug 299777.
104 if ! grep -q /dev/shm <<< $(get_mounts); then
105 eerror "You don't have tmpfs mounted at /dev/shm."
106 eerror "${PN} isn't going to work in that configuration."
107 eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
108 eerror "run 'mount /dev/shm' and try again."
109 die "/dev/shm is not mounted"
110 fi
111 if [ `stat -c %a /dev/shm` -ne 1777 ]; then
112 eerror "/dev/shm does not have correct permissions."
113 eerror "${PN} isn't going to work in that configuration."
114 eerror "Please run chmod 1777 /dev/shm and try again."
115 die "/dev/shm has incorrect permissions"
116 fi
117 fi
118
119 elog "${PN} might crash occasionally. To get more useful backtraces"
120 elog "and submit better bug reports, please read"
121 elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
122 }
123
124 src_prepare() {
125 # Changing this in ~/include.gypi does not work
126 sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
127
128 # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
129 epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
130
131 # Allow supporting more media types provided system ffmpeg supports them.
132 epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch
133
134 # Fix build failure with libpng-1.4, bug 310959.
135 epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
136
137 # Disable prefixing to allow linking against system zlib
138 sed -e '/^#include "mozzconf.h"$/d' \
139 -i third_party/zlib/zconf.h \
140 || die "zlib sed failed"
141 }
142
143 src_configure() {
144 export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
145
146 # Fails to build on arm if we don't do this
147 use arm && append-flags -fno-tree-sink
148
149 if use mp3 ; then
150 append-cflags -DGENTOO_CHROMIUM_MP3_ENABLED
151 fi
152
153 if use x264 ; then
154 append-cflags -DGENTOO_CHROMIUM_H264_ENABLED
155 fi
156
157 # CFLAGS/LDFLAGS
158 mkdir -p "${S}"/.gyp
159 cat << EOF > "${S}"/.gyp/include.gypi
160 {
161 'target_defaults': {
162 'cflags': [ '${CFLAGS// /','}' ],
163 'ldflags': [ '${LDFLAGS// /','}' ],
164 },
165 }
166 EOF
167 export HOME="${S}"
168
169 # Configuration options (system libraries)
170 local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
171 # -Duse_system_sqlite=1 : http://crbug.com/22208
172 # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
173
174 # Sandbox paths
175 myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
176
177 # Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
178 # and the performance gain isn't worth it.
179 myconf="${myconf} -Dv8_use_snapshot=0"
180
181 # Use target arch detection logic from bug #296917.
182 local myarch="$ABI"
183 [[ $myarch = "" ]] && myarch="$ARCH"
184
185 if [[ $myarch = amd64 ]] ; then
186 myconf="${myconf} -Dtarget_arch=x64"
187 elif [[ $myarch = x86 ]] ; then
188 myconf="${myconf} -Dtarget_arch=ia32"
189 elif [[ $myarch = arm ]] ; then
190 myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
191 else
192 die "Failed to determine target arch, got '$myarch'."
193 fi
194
195 if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
196 myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
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 # Chromium looks for these in its folder
236 # See media_posix.cc and base_paths_linux.cc
237 dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
238 dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
239 dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
240
241 # Plugins symlink, optional wrt bug #301911
242 if use plugins-symlink; then
243 dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
244 fi
245
246 # Icon and desktop entry
247 newicon out/Release/product_logo_48.png ${PN}-browser.png
248 dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
249 make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
250 sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
251 || die "desktop file sed failed"
252 # Gnome default application entry
253 dodir /usr/share/gnome-control-center/default-apps
254 insinto /usr/share/gnome-control-center/default-apps
255 doins "${FILESDIR}"/chromium.xml
256 }