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

Gentoo Archives: gentoo-commits

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