diff options
author | Aron Griffis <agriffis@gentoo.org> | 2004-06-30 00:38:25 +0000 |
---|---|---|
committer | Aron Griffis <agriffis@gentoo.org> | 2004-06-30 00:38:25 +0000 |
commit | 6d3a2fac9aadb0a010f24d4a98153f781a628ff4 (patch) | |
tree | 628a2477785629d8ea650dfe745615a504f0e3a4 /net-www | |
parent | new release (Manifest recommit) (diff) | |
download | gentoo-2-6d3a2fac9aadb0a010f24d4a98153f781a628ff4.tar.gz gentoo-2-6d3a2fac9aadb0a010f24d4a98153f781a628ff4.tar.bz2 gentoo-2-6d3a2fac9aadb0a010f24d4a98153f781a628ff4.zip |
Version bump to 0.9.1. The 0.9 init files seem to work so use them directly. Mark 0.8-r3 stable on x86, alpha and ia64.
Diffstat (limited to 'net-www')
-rw-r--r-- | net-www/mozilla-firefox/ChangeLog | 9 | ||||
-rw-r--r-- | net-www/mozilla-firefox/Manifest | 5 | ||||
-rw-r--r-- | net-www/mozilla-firefox/files/digest-mozilla-firefox-0.9.1 | 1 | ||||
-rw-r--r-- | net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild | 4 | ||||
-rw-r--r-- | net-www/mozilla-firefox/mozilla-firefox-0.9.1.ebuild | 287 |
5 files changed, 302 insertions, 4 deletions
diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog index 3b6d1cdb3fb7..c6b2b90aeb80 100644 --- a/net-www/mozilla-firefox/ChangeLog +++ b/net-www/mozilla-firefox/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-www/mozilla-firefox # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.45 2004/06/25 01:05:42 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.46 2004/06/30 00:38:24 agriffis Exp $ + +*mozilla-firefox-0.9.1 (29 Jun 2004) + + 29 Jun 2004; Aron Griffis <agriffis@gentoo.org> + mozilla-firefox-0.8-r3.ebuild, +mozilla-firefox-0.9.1.ebuild: + Version bump to 0.9.1. The 0.9 init files seem to work so use them directly. + Mark 0.8-r3 stable on x86, alpha and ia64. 18 Jun 2004; Aron Griffis <agriffis@gentoo.org> +files/icon/mozillafirefox.desktop, mozilla-firefox-0.9-r1.ebuild: diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest index 7d57cf72f13c..d39b23bad2fc 100644 --- a/net-www/mozilla-firefox/Manifest +++ b/net-www/mozilla-firefox/Manifest @@ -1,13 +1,15 @@ MD5 19a6fec97e93eb55c5680757c579f4a7 mozilla-firefox-0.8-r2.ebuild 7676 MD5 fcb5b44271270dd2265be0e2281d8225 mozilla-firefox-0.8.ebuild 7611 MD5 105a4120c8f91ccffe81b3720d4716a9 mozilla-firefox-0.9-r1.ebuild 8328 +MD5 d7bb10f944e3caa5079f91199d352b5e mozilla-firefox-0.9.1.ebuild 8330 MD5 20e0d68ddf754f4f3458c1f2e0cc98d9 mozilla-firefox-0.8-r1.ebuild 7585 MD5 ccf1409ac4be90fd8e0e17bee48e3447 mozilla-firefox-0.8-r3.ebuild 8520 MD5 696f5126e2268494ca453002fe497042 ChangeLog 7739 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8 73 +MD5 91fb197b04b4e0d536270123dbd5ae04 files/digest-mozilla-firefox-0.9.1 75 MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099 -MD5 3ae7ae287b09b5e0c8f54254484f7444 files/firefox 4226 +MD5 0d736b3e74f9a70202a80b22d6bdf8fc files/firefox 4227 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322 MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31 @@ -17,5 +19,6 @@ MD5 507a3d1338e85acc8828cec7c91d22df files/digest-mozilla-firefox-0.8-r3 73 MD5 1616bcd357c0cbe601722dd6279bd21f files/digest-mozilla-firefox-0.9-r1 73 MD5 3ad7410bd680964096c84eee3fa21abf files/firefox-0.8-gcc-3.4.patch 460 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052 +MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9.1-init.tar.bz2 3322 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979 diff --git a/net-www/mozilla-firefox/files/digest-mozilla-firefox-0.9.1 b/net-www/mozilla-firefox/files/digest-mozilla-firefox-0.9.1 new file mode 100644 index 000000000000..44b99b6cadde --- /dev/null +++ b/net-www/mozilla-firefox/files/digest-mozilla-firefox-0.9.1 @@ -0,0 +1 @@ +MD5 3df6fe17a5d400c1fc154df3c7a8dbb4 firefox-0.9.1-source.tar.bz2 33960883 diff --git a/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild b/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild index 2bdced08eac1..8dbdfc28ac0d 100644 --- a/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild +++ b/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild,v 1.13 2004/06/25 01:05:42 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-0.8-r3.ebuild,v 1.14 2004/06/30 00:38:24 agriffis Exp $ inherit makeedit flag-o-matic gcc nsplugins eutils mozilla-launcher @@ -10,7 +10,7 @@ DESCRIPTION="The Mozilla Firefox Web Browser" HOMEPAGE="http://www.mozilla.org/projects/firefox/" SRC_URI="http://ftp.mozilla.org/pub/firefox/releases/${PV}/firefox-source-${PV}.tar.bz2" -KEYWORDS="~x86 ~ppc ~sparc ~alpha amd64 ~ia64" +KEYWORDS="x86 ~ppc ~sparc alpha amd64 ia64" SLOT="0" LICENSE="MPL-1.1 | NPL-1.1" IUSE="java gtk2 ipv6 gnome moznoxft truetype xinerama" diff --git a/net-www/mozilla-firefox/mozilla-firefox-0.9.1.ebuild b/net-www/mozilla-firefox/mozilla-firefox-0.9.1.ebuild new file mode 100644 index 000000000000..a43d87a68cd3 --- /dev/null +++ b/net-www/mozilla-firefox/mozilla-firefox-0.9.1.ebuild @@ -0,0 +1,287 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-0.9.1.ebuild,v 1.1 2004/06/30 00:38:24 agriffis Exp $ + +inherit makeedit flag-o-matic gcc nsplugins eutils mozilla-launcher + +S=${WORKDIR}/mozilla + +DESCRIPTION="The Mozilla Firefox Web Browser" +HOMEPAGE="http://www.mozilla.org/projects/firefox/" +# Mirrors have it in one of the following places, depending on what +# mirror you check and when you check it... :-( +SRC_URI=" + http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/firefox-${PV}-source.tar.bz2 + http://ftp.mozilla.org/pub/firefox/releases/${PV}/firefox-${PV}-source.tar.bz2" + +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64" +SLOT="0" +LICENSE="MPL-1.1 | NPL-1.1" +IUSE="java gtk2 ipv6 gnome moznoxft truetype xinerama" + +RDEPEND="virtual/x11 + !moznoxft ( virtual/xft ) + >=sys-libs/zlib-1.1.4 + >=media-libs/jpeg-6b + >=media-libs/libmng-1.0.0 + >=media-libs/libpng-1.2.1 + >=sys-apps/portage-2.0.36 + dev-libs/expat + app-arch/zip + app-arch/unzip + gtk2? ( >=x11-libs/gtk+-2.1.1 >=dev-libs/libIDL-0.8.0 ) + !gtk2? ( =x11-libs/gtk+-1.2* >=gnome-base/ORBit-0.5.10-r1 ) + java? ( virtual/jre ) + >=net-www/mozilla-launcher-1.7-r1" + +DEPEND="${RDEPEND} + virtual/glibc + dev-util/pkgconfig + java? ( >=dev-java/java-config-0.2.0 )" + +# needed by src_compile() and src_install() +export MOZ_PHOENIX=1 +export MOZ_CALENDAR=0 +export MOZ_ENABLE_XFT=1 + +src_unpack() { + unpack firefox-${PV}-source.tar.bz2 || die "unpack failed" + cd ${S} || die "cd failed" + + # alpha stubs patch from lfs project. + # <taviso@gentoo.org> (26 Jun 2003) + use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch +} + +src_compile() { + local enable_optimize + local myconf="--disable-composer \ + --with-x \ + --with-system-jpeg \ + --with-system-zlib \ + --with-system-png \ + --with-system-mng \ + --disable-mailnews \ + --disable-calendar \ + --disable-pedantic \ + --disable-svg \ + --enable-mathml \ + --without-system-nspr \ + --enable-nspr-autoconf \ + --enable-xsl \ + $(use_enable ipv6) \ + --enable-crypto \ + --with-java-supplement \ + --with-pthreads \ + --with-default-mozilla-five-home=/usr/lib/MozillaFirefox \ + --with-user-appdir=.phoenix \ + --disable-jsd \ + --disable-accessibility \ + --disable-tests \ + --disable-debug \ + --disable-dtd-debug \ + --disable-logging \ + --enable-reorder \ + --enable-strip \ + --enable-strip-libs \ + --enable-cpp-rtti \ + --enable-xterm-updates \ + --disable-ldap \ + --disable-toolkit-qt \ + --disable-toolkit-xlib \ + --enable-extensions=default,-irc,-venkman,-content-packs,-help" + + if use gtk2; then + myconf="${myconf} \ + --enable-toolkit-gtk2 \ + --enable-default-toolkit=gtk2 \ + --disable-toolkit-gtk" + else + myconf="${myconf} \ + --enable-toolkit-gtk \ + --enable-default-toolkit=gtk \ + --disable-toolkit-gtk2" + fi + + if use moznoxft; then + myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" + elif use gtk2; then + local pango_version + + # We need Xft2.0 localy installed + if [[ -x /usr/bin/pkg-config ]] && pkg-config xft; then + pango_version="$(pkg-config --modversion pango | cut -d. -f1,2)" + + # We also need pango-1.1, else Mozilla links to both + # Xft1.1 *and* Xft2.0, and segfault... + if [[ ${pango_version//.} -gt 10 ]]; then + einfo "Building with Xft2.0 (Gtk+-2.0) support!" + myconf="${myconf} --enable-xft --disable-freetype2" + touch ${WORKDIR}/.xft + else + ewarn "Building without Xft2.0 support!" + myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" + fi + else + ewarn "Building without Xft2.0 support!" + myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" + fi + else + einfo "Building with Xft2.0 (Gtk+-1.0) support!" + myconf="${myconf} --enable-xft --disable-freetype2" + touch ${WORKDIR}/.xft + fi + + # Check for xinerama - closes #19369 + if use xinerama; then + myconf="${myconf} --enable-xinerama=yes" + else + myconf="${myconf} --enable-xinerama=no" + fi + + # Per-architecture flags + case "${ARCH}" in + alpha|amd64|ia64) + # 64-bit needs -fPIC + append-flags -fPIC + ;; + sparc) + # Added to get MozillaFirebird to compile on sparc + replace-sparc64-flags + ;; + ppc) + # Fix to avoid gcc-3.3.x miscompilation issues. + if [[ "$(gcc-major-version).$(gcc-minor-version)" == 3.3 ]]; then + append-flags -fno-strict-aliasing + fi + ;; + esac + + # 32-bit vs. 64-bit optimization + case "${ARCH}" in + alpha|amd64|ia64) + # Allow -O0 or -O1: Anything more than this causes + # segfaults on startup on 64-bit (bug 33767) + enable_optimize=$(echo "$CFLAGS" | grep -Eoe '-O[01]|-O\>') + enable_optimize=${enable_optimize:--O1} + filter-flags -O -O? + ;; + *) + # -O2 and below allowed on 32-bit + enable_optimize=$(echo "$CFLAGS" | grep -Eoe '-O[012]|-O\>') + enable_optimize=${enable_optimize:--O2} + filter-flags -O -O? + ;; + esac + + # Crashes on start when compiled with -fomit-frame-pointer + filter-flags -fno-default-inline # see bug 42488 + filter-flags -fstack-protector # see bug 45671 + filter-flags -fomit-frame-pointer -mpowerpc-gfxopt + filter-flags -ffast-math + append-flags -s -fforce-addr + + if [[ $(gcc-major-version) -eq 3 ]]; then + # gcc-3 prior to 3.2.3 doesn't work well for pentium4 + if [[ $(gcc-minor-version) -lt 2 || + ( $(gcc-minor-version) -eq 2 && $(gcc-micro-version) -lt 3 ) ]] + then + replace-flags -march=pentium4 -march=pentium3 + filter-flags -msse2 + fi + + # Enable us to use flash, etc plugins compiled with gcc-2.95.3 + if [[ ${ARCH} == x86 ]]; then + myconf="${myconf} --enable-old-abi-compat-wrappers" + fi + fi + + econf --enable-optimize="${enable_optimize}" ${myconf} || die + + edit_makefiles + emake MOZ_PHOENIX=1 || die +} + +src_install() { + # Plugin path creation + PLUGIN_DIR="/usr/lib/nsbrowser/plugins" + dodir ${PLUGIN_DIR} + + dodir /usr/lib + dodir /usr/lib/MozillaFirefox + cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirefox + + #fix permissions + chown -R root:root ${D}/usr/lib/MozillaFirefox + + # Plugin path setup (rescuing the existent plugins) + src_mv_plugins /usr/lib/MozillaFirefox/plugins + + dodir /usr/bin + dosym /usr/libexec/mozilla-launcher /usr/bin/firefox + insinto /etc/env.d + doins ${FILESDIR}/10MozillaFirefox + + # Fix icons to look the same everywhere + insinto /usr/lib/MozillaFirefox/icons + doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm + doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm + + # Install icon and .desktop for menu entry + if use gnome; then + insinto /usr/share/pixmaps + doins ${FILESDIR}/icon/firefox-icon.png + # Fix bug 54179: Install .desktop file into /usr/share/applications + # instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis) + insinto /usr/share/applications + doins ${FILESDIR}/icon/mozillafirefox.desktop + fi + + # Normally firefox-0.9 must be run as root once before it can be + # run as a normal user. Drop in some initialized files to avoid + # this. + einfo "Extracting firefox-${PV} initialization files" + tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/lib/MozillaFirefox +} + +pkg_preinst() { + export MOZILLA_FIVE_HOME=${ROOT}/usr/lib/MozillaFirefox + + # Remove the old plugins dir + pkg_mv_plugins /usr/lib/MozillaFirefox/plugins + + # Remove entire installed instance to prevent all kinds of + # problems... see bug 44772 for example + rm -rf "${MOZILLA_FIVE_HOME}" +} + +pkg_postinst() { + export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaFirefox" + + # Needed to update the run time bindings for REGXPCOM + # (do not remove next line!) + env-update + + # Register Components and Chrome + einfo "Registering Components and Chrome..." + LD_LIBRARY_PATH=/usr/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regxpcom + LD_LIBRARY_PATH=/usr/lib/MozillaFirefox ${MOZILLA_FIVE_HOME}/regchrome + + # Fix permissions of component registry + chmod 0644 ${MOZILLA_FIVE_HOME}/components/compreg.dat + + # Fix directory permissions + find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 0755 {} \; || : + + # Fix permissions on chrome files + find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || : + + # This should be called in the postinst and postrm of all the + # mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and + # thunderbird-bin ebuilds. + update_mozilla_launcher_symlinks +} + +pkg_postrm() { + update_mozilla_launcher_symlinks +} |