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.99.ebuild chromium-5.0.375.70-r1.ebuild
Date: Sat, 03 Jul 2010 07:48:01
Message-Id: 20100703074757.B32022CE15@corvid.gentoo.org
1 phajdan.jr 10/07/03 07:47:57
2
3 Modified: ChangeLog
4 Added: chromium-5.0.375.99.ebuild
5 Removed: chromium-5.0.375.70-r1.ebuild
6 Log:
7 Version bump for stable channel release. Removed old ebuild.
8 (Portage version: 2.1.8.3/cvs/Linux i686)
9
10 Revision Changes Path
11 1.129 www-client/chromium/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.129&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.129&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.128&r2=1.129
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
20 retrieving revision 1.128
21 retrieving revision 1.129
22 diff -u -r1.128 -r1.129
23 --- ChangeLog 25 Jun 2010 20:16:02 -0000 1.128
24 +++ ChangeLog 3 Jul 2010 07:47:57 -0000 1.129
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.128 2010/06/25 20:16:02 angelos Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.129 2010/07/03 07:47:57 phajdan.jr Exp $
30 +
31 +*chromium-5.0.375.99 (03 Jul 2010)
32 +
33 + 03 Jul 2010; Pawel Hajdan jr <phajdan.jr@g.o>
34 + -chromium-5.0.375.70-r1.ebuild, +chromium-5.0.375.99.ebuild:
35 + Version bump for stable channel release. Removed old ebuild.
36
37 25 Jun 2010; Christoph Mende <angelos@g.o>
38 chromium-5.0.375.86.ebuild:
39 @@ -386,7 +392,7 @@
40 -chromium-5.0.307.5.ebuild, +chromium-5.0.335.0.ebuild:
41 Version bump for dev channel release. Remove old.
42
43 - 23 Feb 2010; Raúl Porcel <armin76@g.o> chromium-5.0.322.2.ebuild,
44 + 23 Feb 2010; Raúl Porcel <armin76@g.o> chromium-5.0.322.2.ebuild,
45 chromium-9999.ebuild:
46 Add fix for arm build
47
48 @@ -457,7 +463,7 @@
49 Dev channel release bump, also include gnome default-apps file from pacho
50 in bug #303100
51
52 - 01 Feb 2010; Raúl Porcel <armin76@g.o> chromium-4.0.302.2.ebuild,
53 + 01 Feb 2010; Raúl Porcel <armin76@g.o> chromium-4.0.302.2.ebuild,
54 chromium-9999.ebuild:
55 Fix build on arm
56
57 @@ -506,11 +512,11 @@
58 +chromium-4.0.302.2.ebuild:
59 Version bump for dev channel release. Remove old.
60
61 - 22 Jan 2010; Raúl Porcel <armin76@g.o>
62 + 22 Jan 2010; Raúl Porcel <armin76@g.o>
63 -files/chromium-drop_armel_m32.patch, chromium-9999.ebuild:
64 Drop unneded arm patch
65
66 - 18 Jan 2010; Raúl Porcel <armin76@g.o> chromium-4.0.266.0.ebuild,
67 + 18 Jan 2010; Raúl Porcel <armin76@g.o> chromium-4.0.266.0.ebuild,
68 chromium-4.0.288.1.ebuild, chromium-4.0.295.0.ebuild:
69 Add ~arm
70
71 @@ -539,11 +545,11 @@
72 +chromium-4.0.288.1.ebuild:
73 Version bump for dev channel release.
74
75 - 07 Jan 2010; Raúl Porcel <armin76@g.o>
76 + 07 Jan 2010; Raúl Porcel <armin76@g.o>
77 +files/chromium-drop_armel_m32.patch, chromium-9999.ebuild:
78 Add patch to fix build on ARM, enable v8 build on ARM
79
80 - 25 Dec 2009; Raúl Porcel <armin76@g.o> chromium-4.0.266.0.ebuild,
81 + 25 Dec 2009; Raúl Porcel <armin76@g.o> chromium-4.0.266.0.ebuild,
82 chromium-9999.ebuild:
83 Add arm support, but don't keyword it as its still a big buggy
84
85 @@ -608,7 +614,7 @@
86 Version bump, enables bookmarks sync (with --enable-sync), and fix menu
87 location for adblock+ extension
88
89 - 15 Nov 2009; Tomáš Chvátal <scarabeus@g.o> chromium-9999.ebuild:
90 + 15 Nov 2009; Tomáš Chvátal <scarabeus@g.o> chromium-9999.ebuild:
91 QA: Drop keywords on live ebuilds.
92
93 09 Nov 2009; Bernard Cafarelli <voyageur@g.o>
94
95
96
97 1.1 www-client/chromium/chromium-5.0.375.99.ebuild
98
99 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-5.0.375.99.ebuild?rev=1.1&view=markup
100 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-5.0.375.99.ebuild?rev=1.1&content-type=text/plain
101
102 Index: chromium-5.0.375.99.ebuild
103 ===================================================================
104 # Copyright 1999-2010 Gentoo Foundation
105 # Distributed under the terms of the GNU General Public License v2
106 # $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.99.ebuild,v 1.1 2010/07/03 07:47:57 phajdan.jr Exp $
107
108 EAPI="2"
109
110 inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
111
112 DESCRIPTION="Open-source version of Google Chrome web browser"
113 HOMEPAGE="http://chromium.org/"
114 SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
115
116 LICENSE="BSD"
117 SLOT="0"
118 KEYWORDS="~amd64 ~arm ~x86"
119 IUSE="+plugins-symlink"
120
121 RDEPEND="app-arch/bzip2
122 >=dev-libs/libevent-1.4.13
123 dev-libs/libxml2
124 dev-libs/libxslt
125 >=dev-libs/nss-3.12.3
126 >=gnome-base/gconf-2.24.0
127 >=media-libs/alsa-lib-1.0.19
128 media-libs/jpeg:0
129 media-libs/libpng
130 media-video/ffmpeg[threads]
131 sys-libs/zlib
132 >=x11-libs/gtk+-2.14.7
133 x11-libs/libXScrnSaver"
134 # dev-db/sqlite:3
135 DEPEND="${RDEPEND}
136 dev-lang/perl
137 >=dev-util/gperf-3.0.3
138 >=dev-util/pkgconfig-0.23
139 sys-devel/flex"
140 RDEPEND+="
141 || (
142 x11-themes/gnome-icon-theme
143 x11-themes/oxygen-molecule
144 x11-themes/tango-icon-theme
145 x11-themes/xfce4-icon-theme
146 )
147 x11-apps/xmessage
148 x11-misc/xdg-utils
149 virtual/ttf-fonts"
150
151 # Incompatible system plugins:
152 # www-plugins/gecko-mediaplayer, bug #309231.
153 RDEPEND+="
154 plugins-symlink? (
155 !www-plugins/gecko-mediaplayer[gnome]
156 )"
157
158 src_prepare() {
159 # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
160 epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
161
162 # Allow supporting more media types.
163 epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
164
165 # Fix build failure with libpng-1.4, bug 310959.
166 epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
167 }
168
169 src_configure() {
170 export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
171
172 # Workaround for bug #318969.
173 # TODO: remove when http://crbug.com/43778 is fixed.
174 append-flags -D__STDC_CONSTANT_MACROS
175
176 # Fails to build on arm if we don't do this
177 use arm && append-flags -fno-tree-sink
178
179 # Configuration options (system libraries)
180 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"
181 # -Duse_system_sqlite=1 : http://crbug.com/22208
182 # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
183
184 # Sandbox paths
185 myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
186
187 # Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
188 # and the performance gain isn't worth it.
189 myconf="${myconf} -Dv8_use_snapshot=0"
190
191 # Disable tcmalloc memory allocator. It causes problems,
192 # for example bug #320419.
193 myconf="${myconf} -Dlinux_use_tcmalloc=0"
194
195 # Disable gpu rendering, it is incompatible with nvidia-drivers,
196 # bug #319331.
197 myconf="${myconf} -Denable_gpu=0"
198
199 # Use target arch detection logic from bug #296917.
200 local myarch="$ABI"
201 [[ $myarch = "" ]] && myarch="$ARCH"
202
203 if [[ $myarch = amd64 ]] ; then
204 myconf="${myconf} -Dtarget_arch=x64"
205 elif [[ $myarch = x86 ]] ; then
206 myconf="${myconf} -Dtarget_arch=ia32"
207 elif [[ $myarch = arm ]] ; then
208 myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
209 else
210 die "Failed to determine target arch, got '$myarch'."
211 fi
212
213 if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
214 myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
215 fi
216
217 # Make sure that -Werror doesn't get added to CFLAGS by the build system.
218 # Depending on GCC version the warnings are different and we don't want
219 # the build to fail because of that.
220 myconf="${myconf} -Dwerror="
221
222 build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
223 }
224
225 src_compile() {
226 emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
227 rootdir="${S}" \
228 CC=$(tc-getCC) \
229 CXX=$(tc-getCXX) \
230 AR=$(tc-getAR) \
231 RANLIB=$(tc-getRANLIB) \
232 || die "compilation failed"
233 }
234
235 src_install() {
236 # Chromium does not have "install" target in the build system.
237 export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
238
239 dodir ${CHROMIUM_HOME}
240
241 exeinto ${CHROMIUM_HOME}
242 pax-mark m out/Release/chrome
243 doexe out/Release/chrome
244 doexe out/Release/chrome_sandbox
245 fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
246 doexe out/Release/xdg-settings
247 doexe "${FILESDIR}"/chromium-launcher.sh
248
249 insinto ${CHROMIUM_HOME}
250 doins out/Release/chrome.pak
251
252 doins -r out/Release/locales
253 doins -r out/Release/resources
254
255 # chrome.1 is for chromium --help
256 newman out/Release/chrome.1 chrome.1
257 newman out/Release/chrome.1 chromium.1
258
259 # Chromium looks for these in its folder
260 # See media_posix.cc and base_paths_linux.cc
261 dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
262 dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
263 dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
264
265 # Plugins symlink, optional wrt bug #301911
266 if use plugins-symlink; then
267 dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
268 fi
269
270 # Icon and desktop entry
271 newicon out/Release/product_logo_48.png ${PN}-browser.png
272 dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
273 make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
274 sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
275 || die "desktop file sed failed"
276 # Gnome default application entry
277 dodir /usr/share/gnome-control-center/default-apps
278 insinto /usr/share/gnome-control-center/default-apps
279 doins "${FILESDIR}"/chromium.xml
280 }