Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

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