* [gentoo-commits] gentoo-x86 commit in www-client/mozilla-firefox: ChangeLog mozilla-firefox-3.5-r2.ebuild mozilla-firefox-3.5-r1.ebuild
@ 2009-07-02 16:06 Nirbheek Chauhan (nirbheek)
0 siblings, 0 replies; only message in thread
From: Nirbheek Chauhan (nirbheek) @ 2009-07-02 16:06 UTC (permalink / raw
To: gentoo-commits
nirbheek 09/07/02 16:06:25
Modified: ChangeLog
Added: mozilla-firefox-3.5-r2.ebuild
Removed: mozilla-firefox-3.5-r1.ebuild
Log:
Previous fix for bug 256688 was a security risk, and was build-time instead of runtime as well
(Portage version: 2.2_rc33/cvs/Linux i686)
Revision Changes Path
1.517 www-client/mozilla-firefox/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.517&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.517&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?r1=1.516&r2=1.517
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -r1.516 -r1.517
--- ChangeLog 2 Jul 2009 06:57:14 -0000 1.516
+++ ChangeLog 2 Jul 2009 16:06:25 -0000 1.517
@@ -1,6 +1,13 @@
# ChangeLog for www-client/mozilla-firefox
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.516 2009/07/02 06:57:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.517 2009/07/02 16:06:25 nirbheek Exp $
+
+*mozilla-firefox-3.5-r2 (02 Jul 2009)
+
+ 02 Jul 2009; <nirbheek@gentoo.org> -mozilla-firefox-3.5-r1.ebuild,
+ +mozilla-firefox-3.5-r2.ebuild:
+ Previous fix for bug 256688 was a security risk, and was build-time
+ instead of runtime as well
*mozilla-firefox-3.5-r1 (02 Jul 2009)
1.1 www-client/mozilla-firefox/mozilla-firefox-3.5-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5-r2.ebuild?rev=1.1&content-type=text/plain
Index: mozilla-firefox-3.5-r2.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5-r2.ebuild,v 1.1 2009/07/02 16:06:25 nirbheek Exp $
EAPI="2"
WANT_AUTOCONF="2.1"
inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension
LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
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
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
ru si sk sl sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW"
NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
XUL_PV="1.9.1"
MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
MY_PV="${PV/_beta/b}" # Handle betas for SRC_URI
MY_PV="${PV/_/}" # Handle rcs for SRC_URI
MY_PV="${MY_PV/1.9.1/3.5}" # Why is this here?
PATCH="${PN}-${MAJ_PV}-patches-0.1"
DESCRIPTION="Firefox Web Browser"
HOMEPAGE="http://www.mozilla.com/firefox"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE="bindist iceweasel java mozdevelop restrict-javascript" # qt-experimental
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2
iceweasel? ( mirror://gentoo/iceweasel-icons-3.0.tar.bz2 )
mirror://gentoo/${PATCH}.tar.bz2"
for X in ${LANGS} ; do
if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
SRC_URI="${SRC_URI}
linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
fi
IUSE="${IUSE} linguas_${X/-/_}"
# english is handled internally
if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
if [ "${X}" != "en-US" ]; then
SRC_URI="${SRC_URI}
linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
fi
IUSE="${IUSE} linguas_${X%%-*}"
fi
done
# Not working.
# qt-experimental? (
# x11-libs/qt-gui
# x11-libs/qt-core )
# =net-libs/xulrunner-${XUL_PV}*[java=,qt-experimental=]
RDEPEND="
>=sys-devel/binutils-2.16.1
>=dev-libs/nss-3.12.2
>=dev-libs/nspr-4.7.3
>=dev-db/sqlite-3.6.7
>=app-text/hunspell-1.2
>=net-libs/xulrunner-${XUL_PV}[java=]
>=x11-libs/cairo-1.8.8[X]
x11-libs/pango[X]"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
S="${WORKDIR}/mozilla-${XUL_PV}"
# Needed by src_compile() and src_install().
# Would do in pkg_setup but that loses the export attribute, they
# become pure shell variables.
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
linguas() {
local LANG SLANG
for LANG in ${LINGUAS}; do
if has ${LANG} en en_US; then
has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
continue
elif has ${LANG} ${LANGS//-/_}; then
has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
continue
elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
for X in ${LANGS}; do
if [[ "${X}" == "${LANG}-"* ]] && \
[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
continue 2
fi
done
fi
ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
done
}
pkg_setup(){
if ! use bindist && ! use iceweasel; then
elog "You are enabling official branding. You may not redistribute this build"
elog "to any users on your network or the internet. Doing so puts yourself into"
elog "a legal problem with Mozilla Foundation"
elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
fi
elog
elog "libgnomebreakpad now works with firefox so you can debug crashes using bug-buddy"
elog "If you don't have bug-buddy installed, ignore the gtk-warning at startup"
}
src_unpack() {
unpack ${A}
if use iceweasel; then
unpack iceweasel-icons-3.0.tar.bz2
cp -r iceweaselicons/browser "${WORKDIR}"
fi
linguas
for X in ${linguas}; do
# FIXME: Add support for unpacking xpis to portage
[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
done
if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
einfo "Selected language packs (first will be default): ${linguas}"
fi
}
src_prepare() {
# Apply our patches
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
if use iceweasel; then
sed -i -e "s|Minefield|Iceweasel|" browser/locales/en-US/chrome/branding/brand.* \
browser/branding/nightly/configure.sh
fi
eautoreconf
cd js/src
eautoreconf
# We need to re-patch this because autoreconf overwrites it
# epatch "${WORKDIR}"/patch/000_flex-configure-LANG.patch
}
src_configure() {
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
MEXTENSIONS="default"
####################################
#
# mozconfig, CFLAGS and CXXFLAGS setup
#
####################################
mozconfig_init
mozconfig_config
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
mozconfig_annotate '' --enable-application=browser
mozconfig_annotate '' --disable-mailnews
mozconfig_annotate 'broken' --disable-crashreporter
mozconfig_annotate '' --enable-image-encoder=all
mozconfig_annotate '' --enable-canvas
# Bug 60668: Galeon doesn't build without oji enabled, so enable it
# regardless of java setting.
mozconfig_annotate '' --enable-oji --enable-mathml
mozconfig_annotate 'places' --enable-storage --enable-places
mozconfig_annotate '' --enable-safe-browsing
# System-wide install specs
mozconfig_annotate '' --disable-installer
mozconfig_annotate '' --disable-updater
mozconfig_annotate '' --disable-strip
mozconfig_annotate '' --disable-install-strip
# Use system libraries
mozconfig_annotate '' --enable-system-cairo
mozconfig_annotate '' --enable-system-hunspell
mozconfig_annotate '' --enable-system-sqlite
mozconfig_annotate '' --with-system-nspr
mozconfig_annotate '' --with-system-nss
mozconfig_annotate '' --enable-system-lcms
mozconfig_annotate '' --with-system-bz2
mozconfig_annotate '' --with-system-libxul
mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${XUL_PV}
# IUSE mozdevelop
mozconfig_use_enable mozdevelop jsd
mozconfig_use_enable mozdevelop xpctools
#mozconfig_use_extension mozdevelop venkman
# IUSE qt-experimental
# if use qt-experimental; then
# ewarn "You are enabling the EXPERIMENTAL qt toolkit"
# ewarn "Usage is at your own risk"
# ewarn "Known to be broken. DO NOT file bugs."
# mozconfig_annotate '' --disable-system-cairo
# mozconfig_annotate 'qt-experimental' --enable-default-toolkit=cairo-qt
# else
mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
# fi
# Other ff-specific settings
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
if ! use bindist && ! use iceweasel; then
mozconfig_annotate '' --enable-official-branding
fi
# Finalize and report settings
mozconfig_final
if [[ $(gcc-major-version) -lt 4 ]]; then
append-cxxflags -fno-stack-protector
fi
####################################
#
# Configure and build
#
####################################
CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
econf || die
}
src_compile() {
# Should the build use multiprocessing? Not enabled by default, as it tends to break
[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
emake ${jobs} || die
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
rm "${D}"/usr/bin/firefox
linguas
for X in ${linguas}; do
[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
done
cp "${FILESDIR}"/gentoo-default-prefs.js \
"${D}"${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js
local LANG=${linguas%% *}
if [[ -n ${LANG} && ${LANG} != "en" ]]; then
elog "Setting default locale to ${LANG}"
dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
${MOZILLA_FIVE_HOME}/defaults/preferences/firefox.js \
${MOZILLA_FIVE_HOME}/defaults/preferences/firefox-l10n.js || \
die "sed failed to change locale"
fi
# Install icon and .desktop for menu entry
if use iceweasel; then
newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
newmenu "${FILESDIR}"/icon/iceweasel.desktop \
${PN}-${MAJ_PV}.desktop
elif ! use bindist; then
newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
${PN}-${MAJ_PV}.desktop
else
newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png
newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
${PN}-${MAJ_PV}.desktop
sed -e "s/Bon Echo/Minefield/" \
-i "${D}"/usr/share/applications/${PN}-${MAJ_PV}.desktop
fi
# Create /usr/bin/firefox
cat <<EOF >"${D}"/usr/bin/firefox
#!/bin/sh
export LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}\${LD_LIBRARY_PATH+":\${LD_LIBRARY_PATH}"}"
exec "${MOZILLA_FIVE_HOME}"/firefox "\$@"
EOF
fperms 0755 /usr/bin/firefox
# Plugins dir
ln -s "${D}"/usr/$(get_libdir)/{nsbrowser,mozilla-firefox}/plugins
}
pkg_postinst() {
ewarn "All the packages built against ${PN} won't compile,"
ewarn "if after installing firefox 3.5 you get some blockers,"
ewarn "please add 'xulrunner' to your USE-flags."
elog
# Update mimedb for the new .desktop file
fdo-mime_desktop_database_update
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-07-02 16:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-02 16:06 [gentoo-commits] gentoo-x86 commit in www-client/mozilla-firefox: ChangeLog mozilla-firefox-3.5-r2.ebuild mozilla-firefox-3.5-r1.ebuild Nirbheek Chauhan (nirbheek)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox