1 |
phajdan.jr 10/10/07 06:39:19 |
2 |
|
3 |
Modified: ChangeLog chromium-9999.ebuild |
4 |
Added: chromium-7.0.544.0.ebuild |
5 |
Removed: chromium-7.0.536.2.ebuild |
6 |
Log: |
7 |
Version bump for dev channel release. Dropped support for system SSL, chromium now does not compile with it. |
8 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.196 www-client/chromium/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.196&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.196&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.195&r2=1.196 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
20 |
retrieving revision 1.195 |
21 |
retrieving revision 1.196 |
22 |
diff -u -r1.195 -r1.196 |
23 |
--- ChangeLog 5 Oct 2010 14:51:38 -0000 1.195 |
24 |
+++ ChangeLog 7 Oct 2010 06:39:19 -0000 1.196 |
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.195 2010/10/05 14:51:38 phajdan.jr Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.196 2010/10/07 06:39:19 phajdan.jr Exp $ |
30 |
+ |
31 |
+*chromium-7.0.544.0 (07 Oct 2010) |
32 |
+ |
33 |
+ 07 Oct 2010; Pawel Hajdan jr <phajdan.jr@g.o> |
34 |
+ +files/chromium-system-icu-r0.patch, -chromium-7.0.536.2.ebuild, |
35 |
+ +chromium-7.0.544.0.ebuild, chromium-9999.ebuild: |
36 |
+ Version bump for dev channel release. Dropped support for system SSL, |
37 |
+ chromium now does not compile with it. |
38 |
|
39 |
*chromium-7.0.536.2-r1 (05 Oct 2010) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.91 www-client/chromium/chromium-9999.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.91&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.91&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.90&r2=1.91 |
49 |
|
50 |
Index: chromium-9999.ebuild |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v |
53 |
retrieving revision 1.90 |
54 |
retrieving revision 1.91 |
55 |
diff -u -r1.90 -r1.91 |
56 |
--- chromium-9999.ebuild 5 Oct 2010 14:51:39 -0000 1.90 |
57 |
+++ chromium-9999.ebuild 7 Oct 2010 06:39:19 -0000 1.91 |
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-9999.ebuild,v 1.90 2010/10/05 14:51:39 phajdan.jr Exp $ |
62 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.91 2010/10/07 06:39:19 phajdan.jr Exp $ |
63 |
|
64 |
EAPI="2" |
65 |
|
66 |
@@ -25,7 +25,7 @@ |
67 |
>=dev-libs/libevent-1.4.13 |
68 |
dev-libs/libxml2 |
69 |
dev-libs/libxslt |
70 |
- >=dev-libs/nss-3.12.8 |
71 |
+ >=dev-libs/nss-3.12.3 |
72 |
>=gnome-base/gconf-2.24.0 |
73 |
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) |
74 |
>=media-libs/alsa-lib-1.0.19 |
75 |
@@ -109,15 +109,14 @@ |
76 |
} |
77 |
|
78 |
src_prepare() { |
79 |
- # Allow us to build with system SSL support, |
80 |
- # see http://crbug.com/57275. |
81 |
- epatch "${FILESDIR}"/${PN}-system-ssl-r0.patch |
82 |
- |
83 |
# Small fixes to the system-provided sqlite support, |
84 |
# to be upstreamed. |
85 |
epatch "${FILESDIR}"/${PN}-system-sqlite-r0.patch |
86 |
|
87 |
- remove_bundled_lib "net/third_party/nss" |
88 |
+ # Small fix to the system-provided icu support, |
89 |
+ # to be upstreamed. |
90 |
+ epatch "${FILESDIR}"/${PN}-system-icu-r0.patch |
91 |
+ |
92 |
remove_bundled_lib "third_party/bzip2" |
93 |
remove_bundled_lib "third_party/codesighs" |
94 |
remove_bundled_lib "third_party/cros" |
95 |
@@ -154,6 +153,7 @@ |
96 |
# Use system-provided libraries. |
97 |
# TODO: use_system_ffmpeg (http://crbug.com/50678). |
98 |
# TODO: use_system_hunspell (upstream changes needed). |
99 |
+ # TODO: use_system_ssl (need to consult upstream). |
100 |
myconf+=" |
101 |
-Duse_system_bzip2=1 |
102 |
-Duse_system_icu=1 |
103 |
@@ -161,7 +161,6 @@ |
104 |
-Duse_system_libjpeg=1 |
105 |
-Duse_system_libpng=1 |
106 |
-Duse_system_libxml=1 |
107 |
- -Duse_system_ssl=1 |
108 |
-Duse_system_zlib=1" |
109 |
|
110 |
if use system-sqlite; then |
111 |
|
112 |
|
113 |
|
114 |
1.1 www-client/chromium/chromium-7.0.544.0.ebuild |
115 |
|
116 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-7.0.544.0.ebuild?rev=1.1&view=markup |
117 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-7.0.544.0.ebuild?rev=1.1&content-type=text/plain |
118 |
|
119 |
Index: chromium-7.0.544.0.ebuild |
120 |
=================================================================== |
121 |
# Copyright 1999-2010 Gentoo Foundation |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-7.0.544.0.ebuild,v 1.1 2010/10/07 06:39:19 phajdan.jr Exp $ |
124 |
|
125 |
EAPI="2" |
126 |
|
127 |
inherit eutils flag-o-matic multilib pax-utils toolchain-funcs |
128 |
|
129 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
130 |
HOMEPAGE="http://chromium.org/" |
131 |
SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" |
132 |
|
133 |
LICENSE="BSD" |
134 |
SLOT="0" |
135 |
KEYWORDS="~amd64 ~arm ~x86" |
136 |
IUSE="cups gnome gnome-keyring system-sqlite" |
137 |
|
138 |
RDEPEND="app-arch/bzip2 |
139 |
system-sqlite? ( |
140 |
>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe] |
141 |
) |
142 |
>=dev-libs/icu-4.4.1 |
143 |
>=dev-libs/libevent-1.4.13 |
144 |
dev-libs/libxml2 |
145 |
dev-libs/libxslt |
146 |
>=dev-libs/nss-3.12.3 |
147 |
>=gnome-base/gconf-2.24.0 |
148 |
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) |
149 |
>=media-libs/alsa-lib-1.0.19 |
150 |
media-libs/jpeg:0 |
151 |
media-libs/libpng |
152 |
cups? ( >=net-print/cups-1.4.4 ) |
153 |
sys-libs/zlib |
154 |
>=x11-libs/gtk+-2.14.7 |
155 |
x11-libs/libXScrnSaver" |
156 |
DEPEND="${RDEPEND} |
157 |
dev-lang/perl |
158 |
>=dev-util/gperf-3.0.3 |
159 |
>=dev-util/pkgconfig-0.23 |
160 |
sys-devel/flex" |
161 |
RDEPEND+=" |
162 |
|| ( |
163 |
x11-themes/gnome-icon-theme |
164 |
x11-themes/oxygen-molecule |
165 |
x11-themes/tango-icon-theme |
166 |
x11-themes/xfce4-icon-theme |
167 |
) |
168 |
x11-apps/xmessage |
169 |
x11-misc/xdg-utils |
170 |
virtual/ttf-fonts" |
171 |
|
172 |
remove_bundled_lib() { |
173 |
einfo "Removing bundled library $1 ..." |
174 |
local out |
175 |
out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \ |
176 |
|| die "failed to remove bundled library $1" |
177 |
if [[ -z $out ]]; then |
178 |
die "no files matched when removing bundled library $1" |
179 |
fi |
180 |
} |
181 |
|
182 |
pkg_setup() { |
183 |
CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" |
184 |
} |
185 |
|
186 |
src_prepare() { |
187 |
# Small fixes to the system-provided sqlite support, |
188 |
# to be upstreamed. |
189 |
epatch "${FILESDIR}"/${PN}-system-sqlite-r0.patch |
190 |
|
191 |
# Small fix to the system-provided icu support, |
192 |
# to be upstreamed. |
193 |
epatch "${FILESDIR}"/${PN}-system-icu-r0.patch |
194 |
|
195 |
remove_bundled_lib "third_party/bzip2" |
196 |
remove_bundled_lib "third_party/codesighs" |
197 |
remove_bundled_lib "third_party/cros" |
198 |
remove_bundled_lib "third_party/icu" |
199 |
remove_bundled_lib "third_party/jemalloc" |
200 |
remove_bundled_lib "third_party/lcov" |
201 |
remove_bundled_lib "third_party/libevent" |
202 |
remove_bundled_lib "third_party/libjpeg" |
203 |
remove_bundled_lib "third_party/libpng" |
204 |
remove_bundled_lib "third_party/libxml" |
205 |
remove_bundled_lib "third_party/libxslt" |
206 |
remove_bundled_lib "third_party/lzma_sdk" |
207 |
remove_bundled_lib "third_party/molokocacao" |
208 |
remove_bundled_lib "third_party/ocmock" |
209 |
remove_bundled_lib "third_party/pyftpdlib" |
210 |
remove_bundled_lib "third_party/simplejson" |
211 |
remove_bundled_lib "third_party/tlslite" |
212 |
# TODO: also remove third_party/zlib. For now the compilation fails if we |
213 |
# remove it (minizip-related). |
214 |
|
215 |
if use system-sqlite; then |
216 |
remove_bundled_lib "third_party/sqlite/src" |
217 |
remove_bundled_lib "third_party/sqlite/preprocessed" |
218 |
fi |
219 |
} |
220 |
|
221 |
src_configure() { |
222 |
local myconf="" |
223 |
|
224 |
# Never tell the build system to "enable" SSE2, it has a few unexpected |
225 |
# additions, bug #336871. |
226 |
myconf+=" -Ddisable_sse2=1" |
227 |
|
228 |
# Use system-provided libraries. |
229 |
# TODO: use_system_ffmpeg (http://crbug.com/50678). |
230 |
# TODO: use_system_hunspell (upstream changes needed). |
231 |
# TODO: use_system_ssl (need to consult upstream). |
232 |
myconf+=" |
233 |
-Duse_system_bzip2=1 |
234 |
-Duse_system_icu=1 |
235 |
-Duse_system_libevent=1 |
236 |
-Duse_system_libjpeg=1 |
237 |
-Duse_system_libpng=1 |
238 |
-Duse_system_libxml=1 |
239 |
-Duse_system_zlib=1" |
240 |
|
241 |
if use system-sqlite; then |
242 |
myconf+=" -Duse_system_sqlite=1" |
243 |
fi |
244 |
|
245 |
# The dependency on cups is optional, see bug #324105. |
246 |
if use cups; then |
247 |
myconf+=" -Duse_cups=1" |
248 |
else |
249 |
myconf+=" -Duse_cups=0" |
250 |
fi |
251 |
|
252 |
if use "gnome-keyring"; then |
253 |
myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" |
254 |
else |
255 |
# TODO: we should also disable code trying to dlopen |
256 |
# gnome-keyring in that case. |
257 |
myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0" |
258 |
fi |
259 |
|
260 |
# Enable sandbox. |
261 |
myconf+=" |
262 |
-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
263 |
-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
264 |
|
265 |
if host-is-pax; then |
266 |
# Prevent the build from failing (bug #301880). The performance |
267 |
# difference is very small. |
268 |
myconf+=" -Dv8_use_snapshot=0" |
269 |
fi |
270 |
|
271 |
# Use target arch detection logic from bug #296917. |
272 |
local myarch="$ABI" |
273 |
[[ $myarch = "" ]] && myarch="$ARCH" |
274 |
|
275 |
if [[ $myarch = amd64 ]] ; then |
276 |
myconf+=" -Dtarget_arch=x64" |
277 |
elif [[ $myarch = x86 ]] ; then |
278 |
myconf+=" -Dtarget_arch=ia32" |
279 |
elif [[ $myarch = arm ]] ; then |
280 |
# TODO: check this again after |
281 |
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. |
282 |
append-flags -fno-tree-sink |
283 |
|
284 |
myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" |
285 |
else |
286 |
die "Failed to determine target arch, got '$myarch'." |
287 |
fi |
288 |
|
289 |
if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then |
290 |
myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44" |
291 |
fi |
292 |
|
293 |
# Work around a likely GCC bug, see bug #331945. |
294 |
if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then |
295 |
append-flags -fno-ipa-cp |
296 |
fi |
297 |
|
298 |
# Make sure that -Werror doesn't get added to CFLAGS by the build system. |
299 |
# Depending on GCC version the warnings are different and we don't want |
300 |
# the build to fail because of that. |
301 |
myconf+=" -Dwerror=" |
302 |
|
303 |
build/gyp_chromium --depth=. ${myconf} || die |
304 |
} |
305 |
|
306 |
src_compile() { |
307 |
emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die |
308 |
} |
309 |
|
310 |
src_install() { |
311 |
exeinto "${CHROMIUM_HOME}" |
312 |
pax-mark m out/Release/chrome |
313 |
doexe out/Release/chrome |
314 |
doexe out/Release/chrome_sandbox || die |
315 |
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
316 |
doexe out/Release/xdg-settings || die |
317 |
doexe "${FILESDIR}"/chromium-launcher.sh || die |
318 |
|
319 |
insinto "${CHROMIUM_HOME}" |
320 |
doins out/Release/chrome.pak || die |
321 |
doins out/Release/resources.pak || die |
322 |
|
323 |
doins -r out/Release/locales || die |
324 |
doins -r out/Release/resources || die |
325 |
|
326 |
# chrome.1 is for chromium --help |
327 |
newman out/Release/chrome.1 chrome.1 || die |
328 |
newman out/Release/chrome.1 chromium.1 || die |
329 |
|
330 |
doexe out/Release/ffmpegsumo_nolink || die |
331 |
doexe out/Release/libffmpegsumo.so || die |
332 |
|
333 |
# Install icon and desktop entry. |
334 |
newicon out/Release/product_logo_48.png ${PN}-browser.png || die |
335 |
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die |
336 |
make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \ |
337 |
"MimeType=text/html;text/xml;application/xhtml+xml;" |
338 |
sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die |
339 |
|
340 |
# Install GNOME default application entry (bug #303100). |
341 |
if use gnome; then |
342 |
dodir /usr/share/gnome-control-center/default-apps || die |
343 |
insinto /usr/share/gnome-control-center/default-apps |
344 |
doins "${FILESDIR}"/chromium.xml || die |
345 |
fi |
346 |
} |