1 |
polynomial-c 11/08/31 09:36:39 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: firefox-3.6.21.ebuild |
5 |
Removed: firefox-3.6.18.ebuild |
6 |
Log: |
7 |
Security bump |
8 |
|
9 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.92 www-client/firefox/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/ChangeLog?rev=1.92&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/ChangeLog?rev=1.92&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/ChangeLog?r1=1.91&r2=1.92 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v |
21 |
retrieving revision 1.91 |
22 |
retrieving revision 1.92 |
23 |
diff -u -r1.91 -r1.92 |
24 |
--- ChangeLog 30 Aug 2011 16:34:21 -0000 1.91 |
25 |
+++ ChangeLog 31 Aug 2011 09:36:39 -0000 1.92 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for www-client/firefox |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.91 2011/08/30 16:34:21 jer Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.92 2011/08/31 09:36:39 polynomial-c Exp $ |
31 |
+ |
32 |
+*firefox-3.6.21 (31 Aug 2011) |
33 |
+ |
34 |
+ 31 Aug 2011; Lars Wendler <polynomial-c@g.o> -firefox-3.6.18.ebuild, |
35 |
+ +firefox-3.6.21.ebuild: |
36 |
+ Security bump. Removed old. |
37 |
|
38 |
30 Aug 2011; Jeroen Roovers <jer@g.o> firefox-3.6.20.ebuild: |
39 |
Stable for HPPA (bug #360427). |
40 |
|
41 |
|
42 |
|
43 |
1.1 www-client/firefox/firefox-3.6.21.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/firefox-3.6.21.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/firefox-3.6.21.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: firefox-3.6.21.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2011 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.21.ebuild,v 1.1 2011/08/31 09:36:39 polynomial-c Exp $ |
53 |
EAPI="3" |
54 |
WANT_AUTOCONF="2.1" |
55 |
|
56 |
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python |
57 |
|
58 |
LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR \ |
59 |
es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it \ |
60 |
ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm \ |
61 |
ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW" |
62 |
NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW" |
63 |
|
64 |
MAJ_XUL_PV="1.9.2" |
65 |
MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff |
66 |
DESKTOP_PV="3.6" |
67 |
MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI |
68 |
XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s |
69 |
PATCH="${PN}-3.6-patches-0.4" |
70 |
|
71 |
DESCRIPTION="Firefox Web Browser" |
72 |
HOMEPAGE="http://www.mozilla.com/firefox" |
73 |
|
74 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
75 |
SLOT="0" |
76 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
77 |
IUSE="+alsa bindist gnome +ipc java libnotify system-sqlite wifi" |
78 |
|
79 |
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" |
80 |
SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 |
81 |
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" |
82 |
|
83 |
for X in ${LANGS} ; do |
84 |
if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then |
85 |
SRC_URI="${SRC_URI} |
86 |
linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" |
87 |
fi |
88 |
IUSE="${IUSE} linguas_${X/-/_}" |
89 |
# english is handled internally |
90 |
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then |
91 |
if [ "${X}" != "en-US" ]; then |
92 |
SRC_URI="${SRC_URI} |
93 |
linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" |
94 |
fi |
95 |
IUSE="${IUSE} linguas_${X%%-*}" |
96 |
fi |
97 |
done |
98 |
|
99 |
RDEPEND=" |
100 |
>=sys-devel/binutils-2.16.1 |
101 |
>=dev-libs/nss-3.12.8 |
102 |
>=dev-libs/nspr-4.8.6 |
103 |
>=app-text/hunspell-1.2 |
104 |
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) |
105 |
alsa? ( media-libs/alsa-lib ) |
106 |
>=x11-libs/cairo-1.8.8[X] |
107 |
gnome? ( >=gnome-base/gnome-vfs-2.16.3 |
108 |
>=gnome-base/libgnomeui-2.16.1 |
109 |
>=gnome-base/gconf-2.16.0 |
110 |
>=gnome-base/libgnome-2.16.0 ) |
111 |
wifi? ( net-wireless/wireless-tools ) |
112 |
libnotify? ( >=x11-libs/libnotify-0.4 ) |
113 |
~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]" |
114 |
|
115 |
DEPEND="${RDEPEND} |
116 |
java? ( >=virtual/jdk-1.4 ) |
117 |
=dev-lang/python-2*[threads] |
118 |
dev-util/pkgconfig" |
119 |
|
120 |
RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )" |
121 |
|
122 |
S="${WORKDIR}/mozilla-1.9.2" |
123 |
|
124 |
# This is a copy of the launcher program installed as part of xulrunner, so has |
125 |
# already been stripped. Bug #332071 for details. |
126 |
QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox" |
127 |
|
128 |
linguas() { |
129 |
local LANG SLANG |
130 |
for LANG in ${LINGUAS}; do |
131 |
if has ${LANG} en en_US; then |
132 |
has en ${linguas} || linguas="${linguas:+"${linguas} "}en" |
133 |
continue |
134 |
elif has ${LANG} ${LANGS//-/_}; then |
135 |
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" |
136 |
continue |
137 |
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then |
138 |
for X in ${LANGS}; do |
139 |
if [[ "${X}" == "${LANG}-"* ]] && \ |
140 |
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then |
141 |
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" |
142 |
continue 2 |
143 |
fi |
144 |
done |
145 |
fi |
146 |
ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" |
147 |
done |
148 |
} |
149 |
|
150 |
# XXX FIXME XXX: All refs to mozilla-${PN} need to become ${PN} with the next bump |
151 |
# Note that this WILL cause breakage for packages that use fx's libdir and includedir |
152 |
pkg_setup() { |
153 |
# Ensure we always build with C locale. |
154 |
export LANG="C" |
155 |
export LC_ALL="C" |
156 |
export LC_MESSAGES="C" |
157 |
export LC_CTYPE="C" |
158 |
|
159 |
if ! use bindist ; then |
160 |
einfo |
161 |
elog "You are enabling official branding. You may not redistribute this build" |
162 |
elog "to any users on your network or the internet. Doing so puts yourself into" |
163 |
elog "a legal problem with Mozilla Foundation" |
164 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
165 |
fi |
166 |
|
167 |
java-pkg-opt-2_pkg_setup |
168 |
|
169 |
python_set_active_version 2 |
170 |
} |
171 |
|
172 |
src_unpack() { |
173 |
unpack firefox-${MY_PV}.source.tar.bz2 ${PATCH}.tar.bz2 |
174 |
|
175 |
linguas |
176 |
for X in ${linguas}; do |
177 |
# FIXME: Add support for unpacking xpis to portage |
178 |
[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" |
179 |
done |
180 |
} |
181 |
|
182 |
src_prepare() { |
183 |
# Apply our patches |
184 |
EPATCH_SUFFIX="patch" \ |
185 |
EPATCH_FORCE="yes" \ |
186 |
epatch "${WORKDIR}" |
187 |
|
188 |
# Allow user to apply additional patches without modifing ebuild |
189 |
epatch_user |
190 |
|
191 |
eautoreconf |
192 |
|
193 |
cd js/src |
194 |
eautoreconf |
195 |
} |
196 |
|
197 |
src_configure() { |
198 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
199 |
MEXTENSIONS="default" |
200 |
|
201 |
#################################### |
202 |
# |
203 |
# mozconfig, CFLAGS and CXXFLAGS setup |
204 |
# |
205 |
#################################### |
206 |
|
207 |
mozconfig_init |
208 |
mozconfig_config |
209 |
|
210 |
# It doesn't compile on alpha without this LDFLAGS |
211 |
use alpha && append-ldflags "-Wl,--no-relax" |
212 |
|
213 |
mozconfig_annotate '' --enable-crypto |
214 |
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" |
215 |
mozconfig_annotate '' --enable-application=browser |
216 |
mozconfig_annotate '' --disable-mailnews |
217 |
mozconfig_annotate 'broken' --disable-crashreporter |
218 |
mozconfig_annotate '' --enable-image-encoder=all |
219 |
mozconfig_annotate '' --enable-canvas |
220 |
mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2 |
221 |
# Bug 60668: Galeon doesn't build without oji enabled, so enable it |
222 |
# regardless of java setting. |
223 |
mozconfig_annotate '' --enable-oji --enable-mathml |
224 |
mozconfig_annotate 'places' --enable-storage --enable-places |
225 |
mozconfig_annotate '' --enable-safe-browsing |
226 |
|
227 |
# Build mozdevelop permately |
228 |
mozconfig_annotate '' --enable-jsd --enable-xpctools |
229 |
|
230 |
# System-wide install specs |
231 |
mozconfig_annotate '' --disable-installer |
232 |
mozconfig_annotate '' --disable-updater |
233 |
mozconfig_annotate '' --disable-strip |
234 |
mozconfig_annotate '' --disable-install-strip |
235 |
|
236 |
# Use system libraries |
237 |
mozconfig_annotate '' --enable-system-cairo |
238 |
mozconfig_annotate '' --enable-system-hunspell |
239 |
mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr |
240 |
mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr |
241 |
mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) |
242 |
mozconfig_annotate '' --with-system-bz2 |
243 |
mozconfig_annotate '' --with-system-libxul |
244 |
mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV} |
245 |
|
246 |
mozconfig_use_enable gnome gnomevfs |
247 |
mozconfig_use_enable gnome gnomeui |
248 |
mozconfig_use_enable ipc # +ipc, upstream default |
249 |
mozconfig_use_enable libnotify |
250 |
mozconfig_use_enable java javaxpcom |
251 |
mozconfig_use_enable wifi necko-wifi |
252 |
mozconfig_use_enable alsa ogg |
253 |
mozconfig_use_enable alsa wave |
254 |
mozconfig_use_enable system-sqlite |
255 |
mozconfig_use_enable !bindist official-branding |
256 |
|
257 |
# Other ff-specific settings |
258 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
259 |
|
260 |
# Finalize and report settings |
261 |
mozconfig_final |
262 |
|
263 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
264 |
append-cxxflags -fno-stack-protector |
265 |
fi |
266 |
|
267 |
#################################### |
268 |
# |
269 |
# Configure and build |
270 |
# |
271 |
#################################### |
272 |
|
273 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf |
274 |
} |
275 |
|
276 |
src_compile() { |
277 |
# Should the build use multiprocessing? Not enabled by default, as it tends to break |
278 |
[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" |
279 |
emake ${jobs} || die |
280 |
} |
281 |
|
282 |
src_install() { |
283 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
284 |
|
285 |
emake DESTDIR="${D}" install || die "emake install failed" |
286 |
|
287 |
linguas |
288 |
for X in ${linguas}; do |
289 |
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" |
290 |
done |
291 |
|
292 |
# Install icon and .desktop for menu entry |
293 |
if ! use bindist ; then |
294 |
newicon "${S}"/other-licenses/branding/firefox/content/icon48.png ${PN}-icon.png |
295 |
newmenu "${FILESDIR}"/icon/${PN}-1.5.desktop \ |
296 |
mozilla-${PN}-${DESKTOP_PV}.desktop |
297 |
else |
298 |
newicon "${S}"/browser/branding/unofficial/content/icon48.png ${PN}-icon-unbranded.png |
299 |
newmenu "${FILESDIR}"/icon/${PN}-1.5-unbranded.desktop \ |
300 |
mozilla-${PN}-${DESKTOP_PV}.desktop |
301 |
sed -i -e "s:Bon\ Echo:Namoroka:" \ |
302 |
"${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop || die "sed failed!" |
303 |
fi |
304 |
|
305 |
# Add StartupNotify=true bug 237317 |
306 |
if use startup-notification ; then |
307 |
echo "StartupNotify=true" >> "${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop |
308 |
fi |
309 |
|
310 |
pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox |
311 |
|
312 |
# Enable very specific settings not inherited from xulrunner |
313 |
cp "${FILESDIR}"/firefox-default-prefs.js \ |
314 |
"${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ |
315 |
die "failed to cp firefox-default-prefs.js" |
316 |
|
317 |
# Plugins dir |
318 |
dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ |
319 |
|| die "failed to symlink" |
320 |
|
321 |
# very ugly hack to make firefox not sigbus on sparc |
322 |
use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ |
323 |
-i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \ |
324 |
die "sparc sed failed"; } |
325 |
} |
326 |
|
327 |
pkg_postinst() { |
328 |
ewarn "We have finished moving away from mozilla-${PN}" |
329 |
ewarn "to plain jane ${PN}. If for some reason you have a bug" |
330 |
ewarn "that results please open a report and assign to maintainer" |
331 |
ewarn "with mozilla@g.o being CC'd on the bug report." |
332 |
elog |
333 |
|
334 |
# Update mimedb for the new .desktop file |
335 |
fdo-mime_desktop_database_update |
336 |
} |