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