1 |
anarchy 09/09/11 12:52:38 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: mozilla-firefox-3.5.3.ebuild |
5 |
Log: |
6 |
Security bump |
7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.548 www-client/mozilla-firefox/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.548&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.548&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?r1=1.547&r2=1.548 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v |
19 |
retrieving revision 1.547 |
20 |
retrieving revision 1.548 |
21 |
diff -u -r1.547 -r1.548 |
22 |
--- ChangeLog 10 Sep 2009 22:06:06 -0000 1.547 |
23 |
+++ ChangeLog 11 Sep 2009 12:52:38 -0000 1.548 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for www-client/mozilla-firefox |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.547 2009/09/10 22:06:06 fauli Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.548 2009/09/11 12:52:38 anarchy Exp $ |
29 |
+ |
30 |
+*mozilla-firefox-3.5.3 (11 Sep 2009) |
31 |
+ |
32 |
+ 11 Sep 2009; Jory A. Pratt <anarchy@g.o> |
33 |
+ +mozilla-firefox-3.5.3.ebuild: |
34 |
+ Security bump |
35 |
|
36 |
10 Sep 2009; Christian Faulhammer <fauli@g.o> |
37 |
mozilla-firefox-3.0.14.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.1 www-client/mozilla-firefox/mozilla-firefox-3.5.3.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.3.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.3.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: mozilla-firefox-3.5.3.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2009 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.3.ebuild,v 1.1 2009/09/11 12:52:38 anarchy Exp $ |
51 |
EAPI="2" |
52 |
WANT_AUTOCONF="2.1" |
53 |
|
54 |
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension |
55 |
|
56 |
LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR |
57 |
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 ja |
58 |
ka kk kn ko ku lt lv mk ml mn mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro |
59 |
ru si sk sl sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW" |
60 |
NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW" |
61 |
|
62 |
XUL_PV="1.9.1.3" |
63 |
MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff |
64 |
DESKTOP_PV="3.5" |
65 |
MY_PV="${PV/_beta/b}" # Handle betas for SRC_URI |
66 |
MY_PV="${PV/_/}" # Handle rcs for SRC_URI |
67 |
PATCH="${PN}-3.5.2-patches-0.1" |
68 |
|
69 |
DESCRIPTION="Firefox Web Browser" |
70 |
HOMEPAGE="http://www.mozilla.com/firefox" |
71 |
|
72 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86" |
73 |
SLOT="0" |
74 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
75 |
IUSE="+alsa bindist iceweasel java mozdevelop restrict-javascript" # qt-experimental |
76 |
|
77 |
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" |
78 |
SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 |
79 |
iceweasel? ( mirror://gentoo/iceweasel-icons-3.0.tar.bz2 ) |
80 |
http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2" |
81 |
|
82 |
for X in ${LANGS} ; do |
83 |
if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then |
84 |
SRC_URI="${SRC_URI} |
85 |
linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" |
86 |
fi |
87 |
IUSE="${IUSE} linguas_${X/-/_}" |
88 |
# english is handled internally |
89 |
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then |
90 |
if [ "${X}" != "en-US" ]; then |
91 |
SRC_URI="${SRC_URI} |
92 |
linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" |
93 |
fi |
94 |
IUSE="${IUSE} linguas_${X%%-*}" |
95 |
fi |
96 |
done |
97 |
|
98 |
# Not working. |
99 |
# qt-experimental? ( |
100 |
# x11-libs/qt-gui |
101 |
# x11-libs/qt-core ) |
102 |
# =net-libs/xulrunner-${XUL_PV}*[java=,qt-experimental=] |
103 |
|
104 |
RDEPEND=" |
105 |
>=sys-devel/binutils-2.16.1 |
106 |
>=dev-libs/nss-3.12.2 |
107 |
>=dev-libs/nspr-4.7.3 |
108 |
>=app-text/hunspell-1.2 |
109 |
alsa? ( media-libs/alsa-lib ) |
110 |
>=net-libs/xulrunner-${XUL_PV}[java=] |
111 |
>=x11-libs/cairo-1.8.8[X] |
112 |
x11-libs/pango[X]" |
113 |
|
114 |
DEPEND="${RDEPEND} |
115 |
dev-util/pkgconfig" |
116 |
|
117 |
PDEPEND="restrict-javascript? ( >=www-plugins/noscript-1.9.6.6 )" |
118 |
|
119 |
S="${WORKDIR}/mozilla-1.9.1" |
120 |
|
121 |
# Needed by src_compile() and src_install(). |
122 |
# Would do in pkg_setup but that loses the export attribute, they |
123 |
# become pure shell variables. |
124 |
export BUILD_OFFICIAL=1 |
125 |
export MOZILLA_OFFICIAL=1 |
126 |
|
127 |
linguas() { |
128 |
local LANG SLANG |
129 |
for LANG in ${LINGUAS}; do |
130 |
if has ${LANG} en en_US; then |
131 |
has en ${linguas} || linguas="${linguas:+"${linguas} "}en" |
132 |
continue |
133 |
elif has ${LANG} ${LANGS//-/_}; then |
134 |
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" |
135 |
continue |
136 |
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then |
137 |
for X in ${LANGS}; do |
138 |
if [[ "${X}" == "${LANG}-"* ]] && \ |
139 |
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then |
140 |
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" |
141 |
continue 2 |
142 |
fi |
143 |
done |
144 |
fi |
145 |
ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" |
146 |
done |
147 |
} |
148 |
|
149 |
pkg_setup() { |
150 |
if ! use bindist && ! use iceweasel ; then |
151 |
elog "You are enabling official branding. You may not redistribute this build" |
152 |
elog "to any users on your network or the internet. Doing so puts yourself into" |
153 |
elog "a legal problem with Mozilla Foundation" |
154 |
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" |
155 |
fi |
156 |
} |
157 |
|
158 |
src_unpack() { |
159 |
unpack ${A} |
160 |
|
161 |
if use iceweasel ; then |
162 |
unpack iceweasel-icons-3.0.tar.bz2 |
163 |
|
164 |
cp -r iceweaselicons/browser "${WORKDIR}" |
165 |
fi |
166 |
|
167 |
linguas |
168 |
for X in ${linguas}; do |
169 |
# FIXME: Add support for unpacking xpis to portage |
170 |
[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" |
171 |
done |
172 |
if [[ ${linguas} != "" && ${linguas} != "en" ]]; then |
173 |
einfo "Selected language packs (first will be default): ${linguas}" |
174 |
fi |
175 |
} |
176 |
|
177 |
src_prepare() { |
178 |
# Apply our patches |
179 |
EPATCH_SUFFIX="patch" \ |
180 |
EPATCH_FORCE="yes" \ |
181 |
epatch "${WORKDIR}" |
182 |
|
183 |
if use iceweasel ; then |
184 |
sed -i -e "s:Minefield:Iceweasel:" browser/locales/en-US/chrome/branding/brand.* \ |
185 |
browser/branding/nightly/configure.sh || die "iceweasel sed failed!" |
186 |
fi |
187 |
|
188 |
eautoreconf |
189 |
|
190 |
cd js/src |
191 |
eautoreconf |
192 |
|
193 |
# We need to re-patch this because autoreconf overwrites it |
194 |
epatch "${FILESDIR}/000_flex-configure-LANG.patch" |
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-extensions="${MEXTENSIONS}" |
214 |
mozconfig_annotate '' --enable-application=browser |
215 |
mozconfig_annotate '' --disable-mailnews |
216 |
mozconfig_annotate 'broken' --disable-crashreporter |
217 |
mozconfig_annotate '' --enable-image-encoder=all |
218 |
mozconfig_annotate '' --enable-canvas |
219 |
# Bug 60668: Galeon doesn't build without oji enabled, so enable it |
220 |
# regardless of java setting. |
221 |
mozconfig_annotate '' --enable-oji --enable-mathml |
222 |
mozconfig_annotate 'places' --enable-storage --enable-places |
223 |
mozconfig_annotate '' --enable-safe-browsing |
224 |
|
225 |
# System-wide install specs |
226 |
mozconfig_annotate '' --disable-installer |
227 |
mozconfig_annotate '' --disable-updater |
228 |
mozconfig_annotate '' --disable-strip |
229 |
mozconfig_annotate '' --disable-install-strip |
230 |
|
231 |
# Use system libraries |
232 |
mozconfig_annotate '' --enable-system-cairo |
233 |
mozconfig_annotate '' --enable-system-hunspell |
234 |
# mozconfig_annotate '' --enable-system-sqlite |
235 |
mozconfig_annotate '' --with-system-nspr |
236 |
mozconfig_annotate '' --with-system-nss |
237 |
mozconfig_annotate '' --enable-system-lcms |
238 |
mozconfig_annotate '' --with-system-bz2 |
239 |
mozconfig_annotate '' --with-system-libxul |
240 |
mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${XUL_PV} |
241 |
|
242 |
# IUSE mozdevelop |
243 |
mozconfig_use_enable mozdevelop jsd |
244 |
mozconfig_use_enable mozdevelop xpctools |
245 |
#mozconfig_use_extension mozdevelop venkman |
246 |
|
247 |
# IUSE qt-experimental |
248 |
# if use qt-experimental ; then |
249 |
# ewarn "You are enabling the EXPERIMENTAL qt toolkit" |
250 |
# ewarn "Usage is at your own risk" |
251 |
# ewarn "Known to be broken. DO NOT file bugs." |
252 |
# mozconfig_annotate '' --disable-system-cairo |
253 |
# mozconfig_annotate 'qt-experimental' --enable-default-toolkit=cairo-qt |
254 |
# else |
255 |
mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2 |
256 |
# fi |
257 |
|
258 |
# Other ff-specific settings |
259 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
260 |
|
261 |
# Enable/Disable audio in firefox |
262 |
mozconfig_use_enable alsa ogg |
263 |
mozconfig_use_enable alsa wave |
264 |
|
265 |
if ! use bindist && ! use iceweasel ; then |
266 |
mozconfig_annotate '' --enable-official-branding |
267 |
fi |
268 |
|
269 |
# Finalize and report settings |
270 |
mozconfig_final |
271 |
|
272 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
273 |
append-cxxflags -fno-stack-protector |
274 |
fi |
275 |
|
276 |
#################################### |
277 |
# |
278 |
# Configure and build |
279 |
# |
280 |
#################################### |
281 |
|
282 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf |
283 |
} |
284 |
|
285 |
src_compile() { |
286 |
# Should the build use multiprocessing? Not enabled by default, as it tends to break |
287 |
[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" |
288 |
emake ${jobs} || die |
289 |
} |
290 |
|
291 |
src_install() { |
292 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" |
293 |
|
294 |
emake DESTDIR="${D}" install || die "emake install failed" |
295 |
rm "${D}"/usr/bin/firefox |
296 |
|
297 |
linguas |
298 |
for X in ${linguas}; do |
299 |
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" |
300 |
done |
301 |
|
302 |
# Install icon and .desktop for menu entry |
303 |
if use iceweasel ; then |
304 |
newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png |
305 |
newmenu "${FILESDIR}"/icon/iceweasel.desktop \ |
306 |
${PN}-${DESKTOP_PV}.desktop |
307 |
elif ! use bindist ; then |
308 |
newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png |
309 |
newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \ |
310 |
${PN}-${DESKTOP_PV}.desktop |
311 |
else |
312 |
newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png |
313 |
newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \ |
314 |
${PN}-${DESKTOP_PV}.desktop |
315 |
sed -i -e "s:Bon Echo:Minefield:" \ |
316 |
"${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "sed failed!" |
317 |
fi |
318 |
|
319 |
# Add StartupNotify=true bug 237317 |
320 |
if use startup-notification ; then |
321 |
echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop |
322 |
fi |
323 |
|
324 |
# Create /usr/bin/firefox |
325 |
cat <<EOF >"${D}"/usr/bin/firefox |
326 |
#!/bin/sh |
327 |
export LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}\${LD_LIBRARY_PATH+":\${LD_LIBRARY_PATH}"}" |
328 |
exec "${MOZILLA_FIVE_HOME}"/firefox "\$@" |
329 |
EOF |
330 |
|
331 |
fperms 0755 /usr/bin/firefox |
332 |
pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/firefox |
333 |
|
334 |
# Enable very specific settings not inherited from xulrunner |
335 |
cp "${FILESDIR}"/firefox-default-prefs.js \ |
336 |
"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ |
337 |
die "failed to cp xulrunner-default-prefs.js" |
338 |
|
339 |
# Plugins dir |
340 |
dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins || die |
341 |
} |
342 |
|
343 |
pkg_postinst() { |
344 |
ewarn "All the packages built against ${PN} won't compile," |
345 |
ewarn "any package that fails to build warrants a bug report." |
346 |
elog |
347 |
|
348 |
# Update mimedb for the new .desktop file |
349 |
fdo-mime_desktop_database_update |
350 |
} |