diff options
author | Jory Pratt <anarchy@gentoo.org> | 2009-08-30 14:59:52 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2009-08-30 14:59:52 +0000 |
commit | f6895514c3138d8de44e6645cd13fb0b0caba123 (patch) | |
tree | 25e1e244d875460c2019e0f5f353bd878c58d7b7 /www-client | |
parent | Version bump. 5 new cameras IDs, translation updates, bugfixes, bug #283133 (diff) | |
download | gentoo-2-f6895514c3138d8de44e6645cd13fb0b0caba123.tar.gz gentoo-2-f6895514c3138d8de44e6645cd13fb0b0caba123.tar.bz2 gentoo-2-f6895514c3138d8de44e6645cd13fb0b0caba123.zip |
drop system sqlite support until segv is fixed
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/mozilla-firefox/ChangeLog | 13 | ||||
-rw-r--r-- | www-client/mozilla-firefox/mozilla-firefox-3.5.2-r2.ebuild (renamed from www-client/mozilla-firefox/mozilla-firefox-3.5.2-r1.ebuild) | 5 | ||||
-rw-r--r-- | www-client/mozilla-firefox/mozilla-firefox-3.5.2.ebuild | 308 |
3 files changed, 14 insertions, 312 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index 4b7e18a66b46..ecb9dde24086 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,17 @@ # 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.540 2009/08/26 16:11:21 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.541 2009/08/30 14:59:52 anarchy Exp $ + + 30 Aug 2009; Jory A. Pratt <anarchy@gentoo.org> + -mozilla-firefox-3.5.2.ebuild, -mozilla-firefox-3.5.2-r1.ebuild, + +mozilla-firefox-3.5.2-r2.ebuild: + remove unsupported 3.5.x ebuilds + +*mozilla-firefox-3.5.2-r2 (30 Aug 2009) + + 30 Aug 2009; Jory A. Pratt <anarchy@gentoo.org> + -mozilla-firefox-3.5.2-r1.ebuild, +mozilla-firefox-3.5.2-r2.ebuild: + drop system sqlite support in 3.5.x until segv fixed. 26 Aug 2009; Raúl Porcel <armin76@gentoo.org> mozilla-firefox-3.0.13.ebuild: diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r2.ebuild index e0304cd63ff4..38a0abb5adb4 100644 --- a/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r1.ebuild +++ b/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r2.ebuild @@ -1,6 +1,6 @@ # 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.2-r1.ebuild,v 1.6 2009/08/25 14:14:55 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.5.2-r2.ebuild,v 1.1 2009/08/30 14:59:52 anarchy Exp $ EAPI="2" WANT_AUTOCONF="2.1" @@ -58,7 +58,6 @@ 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 alsa? ( media-libs/alsa-lib ) >=net-libs/xulrunner-${XUL_PV}[java=] @@ -185,7 +184,7 @@ src_configure() { # Use system libraries mozconfig_annotate '' --enable-system-cairo mozconfig_annotate '' --enable-system-hunspell - mozconfig_annotate '' --enable-system-sqlite + # mozconfig_annotate '' --enable-system-sqlite mozconfig_annotate '' --with-system-nspr mozconfig_annotate '' --with-system-nss mozconfig_annotate '' --enable-system-lcms diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.5.2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.5.2.ebuild deleted file mode 100644 index 440ffca1c2de..000000000000 --- a/www-client/mozilla-firefox/mozilla-firefox-3.5.2.ebuild +++ /dev/null @@ -1,308 +0,0 @@ -# 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.2.ebuild,v 1.4 2009/08/25 14:14:55 armin76 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.2" -MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff -DESKTOP_PV="3.5" -MY_PV="${PV/_beta/b}" # Handle betas for SRC_URI -MY_PV="${PV/_/}" # Handle rcs for SRC_URI -PATCH="${PN}-3.5-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="+alsa bindist hardened 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 - alsa? ( media-libs/alsa-lib ) - >=net-libs/xulrunner-${XUL_PV}[hardened=,java=] - >=x11-libs/cairo-1.8.8[X] - x11-libs/pango[X]" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -PDEPEND="restrict-javascript? ( >=www-plugins/noscript-1.8.7 )" - -S="${WORKDIR}/mozilla-1.9.1" - -# 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 -} - -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 || die "iceweasel sed failed!" - fi - - eautoreconf - - cd js/src - eautoreconf - - # We need to re-patch this because autoreconf overwrites it - epatch "${FILESDIR}/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} - - # Enable/Disable audio in firefox - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave - - if ! use bindist && ! use iceweasel ; then - mozconfig_annotate '' --enable-official-branding - fi - - # Bug #278698 - if use hardened ; then - mozconfig_annotate 'hardened' --disable-jemalloc - 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 -} - -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() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - 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 - - # 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}-${DESKTOP_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}-${DESKTOP_PV}.desktop - else - newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png - newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \ - ${PN}-${DESKTOP_PV}.desktop - sed -i -e "s:Bon Echo:Minefield:" \ - "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "sed failed!" - fi - - # Add StartupNotify=true bug 237317 - if use startup-notification ; then - echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_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 - - # Enable very specific settings not inherited from xulrunner - cp "${FILESDIR}"/firefox-default-prefs.js \ - "${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ - die "failed to cp xulrunner-default-prefs.js" - - # 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 "any package that fails to build warrants a bug report." - elog - - # Update mimedb for the new .desktop file - fdo-mime_desktop_database_update -} |