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