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