1 |
phajdan.jr 10/09/04 01:52:33 |
2 |
|
3 |
Modified: ChangeLog chromium-6.0.472.53.ebuild |
4 |
Added: chromium-6.0.472.53-r1.ebuild |
5 |
Removed: chromium-6.0.472.51.ebuild |
6 |
Log: |
7 |
Version bump for ~arch, and lower cups dependency for 6.0.472.53 which should go stable (bug #335750). |
8 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.170 www-client/chromium/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.170&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.170&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.169&r2=1.170 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
20 |
retrieving revision 1.169 |
21 |
retrieving revision 1.170 |
22 |
diff -u -r1.169 -r1.170 |
23 |
--- ChangeLog 2 Sep 2010 14:12:27 -0000 1.169 |
24 |
+++ ChangeLog 4 Sep 2010 01:52:33 -0000 1.170 |
25 |
@@ -1,6 +1,14 @@ |
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.169 2010/09/02 14:12:27 phajdan.jr Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.170 2010/09/04 01:52:33 phajdan.jr Exp $ |
30 |
+ |
31 |
+*chromium-6.0.472.53-r1 (04 Sep 2010) |
32 |
+ |
33 |
+ 04 Sep 2010; Pawel Hajdan jr <phajdan.jr@g.o> |
34 |
+ -chromium-6.0.472.51.ebuild, chromium-6.0.472.53.ebuild, |
35 |
+ +chromium-6.0.472.53-r1.ebuild: |
36 |
+ Version bump for ~arch, and lower cups dependency for 6.0.472.53 which |
37 |
+ should go stable (bug #335750). |
38 |
|
39 |
*chromium-6.0.472.53 (02 Sep 2010) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.2 www-client/chromium/chromium-6.0.472.53.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.53.ebuild?rev=1.2&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.53.ebuild?rev=1.2&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.53.ebuild?r1=1.1&r2=1.2 |
49 |
|
50 |
Index: chromium-6.0.472.53.ebuild |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.53.ebuild,v |
53 |
retrieving revision 1.1 |
54 |
retrieving revision 1.2 |
55 |
diff -u -r1.1 -r1.2 |
56 |
--- chromium-6.0.472.53.ebuild 2 Sep 2010 14:12:27 -0000 1.1 |
57 |
+++ chromium-6.0.472.53.ebuild 4 Sep 2010 01:52:33 -0000 1.2 |
58 |
@@ -1,6 +1,6 @@ |
59 |
# Copyright 1999-2010 Gentoo Foundation |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.53.ebuild,v 1.1 2010/09/02 14:12:27 phajdan.jr Exp $ |
62 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.53.ebuild,v 1.2 2010/09/04 01:52:33 phajdan.jr Exp $ |
63 |
|
64 |
EAPI="2" |
65 |
|
66 |
@@ -23,7 +23,7 @@ |
67 |
>=media-libs/alsa-lib-1.0.19 |
68 |
media-libs/jpeg:0 |
69 |
media-libs/libpng |
70 |
- cups? ( >=net-print/cups-1.4.4 ) |
71 |
+ cups? ( >=net-print/cups-1.3.11 ) |
72 |
sys-libs/zlib |
73 |
>=x11-libs/gtk+-2.14.7 |
74 |
x11-libs/libXScrnSaver" |
75 |
|
76 |
|
77 |
|
78 |
1.1 www-client/chromium/chromium-6.0.472.53-r1.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.53-r1.ebuild?rev=1.1&view=markup |
81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.53-r1.ebuild?rev=1.1&content-type=text/plain |
82 |
|
83 |
Index: chromium-6.0.472.53-r1.ebuild |
84 |
=================================================================== |
85 |
# Copyright 1999-2010 Gentoo Foundation |
86 |
# Distributed under the terms of the GNU General Public License v2 |
87 |
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.53-r1.ebuild,v 1.1 2010/09/04 01:52:33 phajdan.jr Exp $ |
88 |
|
89 |
EAPI="2" |
90 |
|
91 |
inherit eutils flag-o-matic multilib pax-utils toolchain-funcs |
92 |
|
93 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
94 |
HOMEPAGE="http://chromium.org/" |
95 |
SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" |
96 |
|
97 |
LICENSE="BSD" |
98 |
SLOT="0" |
99 |
KEYWORDS="~amd64 ~arm ~x86" |
100 |
IUSE="cups gnome-keyring sse2" |
101 |
|
102 |
RDEPEND="app-arch/bzip2 |
103 |
>=dev-libs/libevent-1.4.13 |
104 |
>=dev-libs/nss-3.12.3 |
105 |
>=gnome-base/gconf-2.24.0 |
106 |
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) |
107 |
>=media-libs/alsa-lib-1.0.19 |
108 |
media-libs/jpeg:0 |
109 |
media-libs/libpng |
110 |
cups? ( >=net-print/cups-1.4.4 ) |
111 |
sys-libs/zlib |
112 |
>=x11-libs/gtk+-2.14.7 |
113 |
x11-libs/libXScrnSaver" |
114 |
DEPEND="${RDEPEND} |
115 |
dev-lang/perl |
116 |
>=dev-util/gperf-3.0.3 |
117 |
>=dev-util/pkgconfig-0.23 |
118 |
>=gnome-base/gnome-keyring-2.28.2 |
119 |
sys-devel/flex" |
120 |
RDEPEND+=" |
121 |
|| ( |
122 |
x11-themes/gnome-icon-theme |
123 |
x11-themes/oxygen-molecule |
124 |
x11-themes/tango-icon-theme |
125 |
x11-themes/xfce4-icon-theme |
126 |
) |
127 |
x11-apps/xmessage |
128 |
x11-misc/xdg-utils |
129 |
virtual/ttf-fonts" |
130 |
|
131 |
get_chromium_home() { |
132 |
echo "/usr/$(get_libdir)/chromium-browser" |
133 |
} |
134 |
|
135 |
remove_bundled_lib() { |
136 |
einfo "Removing bundled library $1 ..." |
137 |
local out |
138 |
out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \ |
139 |
|| die "failed to remove bundled library $1" |
140 |
if [[ -z $out ]]; then |
141 |
die "no files matched when removing bundled library $1" |
142 |
fi |
143 |
} |
144 |
|
145 |
src_prepare() { |
146 |
# Fix compilation, bug #332131. |
147 |
epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch |
148 |
|
149 |
# Add Gentoo plugin paths. |
150 |
epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch |
151 |
|
152 |
remove_bundled_lib "third_party/bzip2" |
153 |
remove_bundled_lib "third_party/codesighs" |
154 |
remove_bundled_lib "third_party/cros" |
155 |
remove_bundled_lib "third_party/jemalloc" |
156 |
remove_bundled_lib "third_party/lcov" |
157 |
remove_bundled_lib "third_party/libevent" |
158 |
remove_bundled_lib "third_party/libjpeg" |
159 |
remove_bundled_lib "third_party/libpng" |
160 |
remove_bundled_lib "third_party/lzma_sdk" |
161 |
remove_bundled_lib "third_party/molokocacao" |
162 |
remove_bundled_lib "third_party/ocmock" |
163 |
remove_bundled_lib "third_party/py" |
164 |
remove_bundled_lib "third_party/pyftpdlib" |
165 |
remove_bundled_lib "third_party/simplejson" |
166 |
remove_bundled_lib "third_party/tlslite" |
167 |
# TODO: also remove third_party/libxml and third_party/libxslt when |
168 |
# http://crbug.com/29333 is fixed. |
169 |
# TODO: also remove third_party/zlib. For now the compilation fails if we |
170 |
# remove it (minizip-related). |
171 |
} |
172 |
|
173 |
src_configure() { |
174 |
local myconf="" |
175 |
|
176 |
# Make it possible to build chromium on non-sse2 systems. |
177 |
if use sse2; then |
178 |
myconf="${myconf} -Ddisable_sse2=0" |
179 |
else |
180 |
myconf="${myconf} -Ddisable_sse2=1" |
181 |
fi |
182 |
|
183 |
# Use system-provided libraries. |
184 |
# TODO: use_system_ffmpeg (http://crbug.com/50678). |
185 |
# TODO: use_system_libxml (http://crbug.com/29333). |
186 |
# TODO: use_system_sqlite (http://crbug.com/22208). |
187 |
# TODO: use_system_icu, use_system_hunspell (upstream changes needed). |
188 |
# TODO: use_system_ssl when we have a recent enough system NSS. |
189 |
myconf="${myconf} |
190 |
-Duse_system_bzip2=1 |
191 |
-Duse_system_libevent=1 |
192 |
-Duse_system_libjpeg=1 |
193 |
-Duse_system_libpng=1 |
194 |
-Duse_system_zlib=1" |
195 |
|
196 |
# The dependency on cups is optional, see bug #324105. |
197 |
if use cups; then |
198 |
myconf="${myconf} -Duse_cups=1" |
199 |
else |
200 |
myconf="${myconf} -Duse_cups=0" |
201 |
fi |
202 |
|
203 |
if use "gnome-keyring"; then |
204 |
myconf="${myconf} -Dlinux_link_gnome_keyring=1" |
205 |
else |
206 |
# TODO: we should also disable code trying to dlopen |
207 |
# gnome-keyring in that case. |
208 |
myconf="${myconf} -Dlinux_link_gnome_keyring=0" |
209 |
fi |
210 |
|
211 |
# Enable sandbox. |
212 |
myconf="${myconf} |
213 |
-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox |
214 |
-Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome" |
215 |
|
216 |
# Disable the V8 snapshot. It breaks the build on hardened (bug #301880), |
217 |
# and the performance gain isn't worth it. |
218 |
myconf="${myconf} -Dv8_use_snapshot=0" |
219 |
|
220 |
# Disable tcmalloc memory allocator. It causes problems, |
221 |
# for example bug #320419. |
222 |
myconf="${myconf} -Dlinux_use_tcmalloc=0" |
223 |
|
224 |
# Disable gpu rendering, it is incompatible with nvidia-drivers, |
225 |
# bug #319331. |
226 |
myconf="${myconf} -Denable_gpu=0" |
227 |
|
228 |
# Use target arch detection logic from bug #296917. |
229 |
local myarch="$ABI" |
230 |
[[ $myarch = "" ]] && myarch="$ARCH" |
231 |
|
232 |
if [[ $myarch = amd64 ]] ; then |
233 |
myconf="${myconf} -Dtarget_arch=x64" |
234 |
elif [[ $myarch = x86 ]] ; then |
235 |
myconf="${myconf} -Dtarget_arch=ia32" |
236 |
elif [[ $myarch = arm ]] ; then |
237 |
# TODO: check this again after |
238 |
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. |
239 |
append-flags -fno-tree-sink |
240 |
|
241 |
myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" |
242 |
else |
243 |
die "Failed to determine target arch, got '$myarch'." |
244 |
fi |
245 |
|
246 |
if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then |
247 |
myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" |
248 |
fi |
249 |
|
250 |
# Work around a likely GCC bug, see bug #331945. |
251 |
if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then |
252 |
append-flags -fno-ipa-cp |
253 |
fi |
254 |
|
255 |
# Make sure that -Werror doesn't get added to CFLAGS by the build system. |
256 |
# Depending on GCC version the warnings are different and we don't want |
257 |
# the build to fail because of that. |
258 |
myconf="${myconf} -Dwerror=" |
259 |
|
260 |
build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed" |
261 |
} |
262 |
|
263 |
src_compile() { |
264 |
emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \ |
265 |
rootdir="${S}" \ |
266 |
CC="$(tc-getCC)" \ |
267 |
CXX="$(tc-getCXX)" \ |
268 |
AR="$(tc-getAR)" \ |
269 |
RANLIB="$(tc-getRANLIB)" \ |
270 |
|| die "compilation failed" |
271 |
} |
272 |
|
273 |
src_install() { |
274 |
dodir "$(get_chromium_home)" |
275 |
|
276 |
exeinto "$(get_chromium_home)" |
277 |
pax-mark m out/Release/chrome |
278 |
doexe out/Release/chrome |
279 |
doexe out/Release/chrome_sandbox |
280 |
fperms 4755 "$(get_chromium_home)/chrome_sandbox" |
281 |
doexe out/Release/xdg-settings |
282 |
doexe "${FILESDIR}"/chromium-launcher.sh |
283 |
|
284 |
insinto "$(get_chromium_home)" |
285 |
doins out/Release/chrome.pak || die "installing chrome.pak failed" |
286 |
doins out/Release/resources.pak || die "installing resources.pak failed" |
287 |
|
288 |
doins -r out/Release/locales |
289 |
doins -r out/Release/resources |
290 |
|
291 |
# chrome.1 is for chromium --help |
292 |
newman out/Release/chrome.1 chrome.1 |
293 |
newman out/Release/chrome.1 chromium.1 |
294 |
|
295 |
doexe out/Release/ffmpegsumo_nolink || die |
296 |
doexe out/Release/libffmpegsumo.so || die |
297 |
|
298 |
# Install icon and desktop entry. |
299 |
newicon out/Release/product_logo_48.png ${PN}-browser.png |
300 |
dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium |
301 |
make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \ |
302 |
"MimeType=text/html;text/xml;application/xhtml+xml;" |
303 |
sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ |
304 |
|| die "desktop file sed failed" |
305 |
|
306 |
# Install GNOME default application entry (bug #303100). |
307 |
dodir /usr/share/gnome-control-center/default-apps |
308 |
insinto /usr/share/gnome-control-center/default-apps |
309 |
doins "${FILESDIR}"/chromium.xml |
310 |
} |