summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Laue <brad@gentoo.org>2005-03-23 07:47:15 +0000
committerBrad Laue <brad@gentoo.org>2005-03-23 07:47:15 +0000
commitc1e061989a1c903540e35f9fff580f2e95dd46c7 (patch)
tree4800e67e65d424fbd94407d1c51f944b5429482a /net-www/mozilla
parentmark stable (diff)
downloadgentoo-2-c1e061989a1c903540e35f9fff580f2e95dd46c7.tar.gz
gentoo-2-c1e061989a1c903540e35f9fff580f2e95dd46c7.tar.bz2
gentoo-2-c1e061989a1c903540e35f9fff580f2e95dd46c7.zip
Manual commit. Manifest update shortly.
Diffstat (limited to 'net-www/mozilla')
-rw-r--r--net-www/mozilla/ChangeLog7
-rw-r--r--net-www/mozilla/Manifest29
-rw-r--r--net-www/mozilla/files/digest-mozilla-1.7.63
-rw-r--r--net-www/mozilla/mozilla-1.7.6.ebuild360
4 files changed, 380 insertions, 19 deletions
diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 0f3884ec38c9..716dea65d36d 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-www/mozilla
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.226 2005/03/23 07:33:49 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.227 2005/03/23 07:47:14 brad Exp $
+
+*mozilla-1.7.6 (23 Mar 2005)
+
+ 23 Mar 2005; Brad Laue <brad@gentoo.org> +mozilla-1.7.6.ebuild:
+ Bump to 1.7.6. Security fixes detailed in bug #84074.
23 Mar 2005; Brad Laue <brad@gentoo.org> +files/mozilla-stackgrowth.patch,
mozilla-1.7.5-r1.ebuild, mozilla-1.7.5.ebuild:
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 58f2151d7bd5..4361c69a79b1 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,28 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b0f5de9797cf1f7956981530a8207a92 ChangeLog 39013
+MD5 fb681299281f72dc4acffb0d6311fb50 mozilla-1.7.5.ebuild 10331
+MD5 8a165e3696bf1660e310e33174fb66ae mozilla-1.7.5-r1.ebuild 11280
+MD5 c0cb641754ccbdf2d69b0c7e8d712a98 ChangeLog 39190
MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 8774021d7d80b7f1ba040d7d2a771c57 mozilla-1.7.5.ebuild 10330
-MD5 213fc7c82eaaaabc314c236a696482bb mozilla-1.7.5-r1.ebuild 11285
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 270f3e7040a48b49d9430d96d73e4c39 mozilla-1.7.6.ebuild 11280
MD5 b19c38da8865b9ee5555aeb826d1d360 files/digest-mozilla-1.7.5 203
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+MD5 0172084e349ca0f03d8cbe294054223e files/digest-mozilla-1.7.6 203
MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
-MD5 278524216669b594ea5b6468a180ed73 files/mozilla-1.7.5-stackgrowth.patch 931
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
MD5 5496222980a6faf8261066f43cd4c6a5 files/mozilla-hppa.patch 7785
+MD5 278524216669b594ea5b6468a180ed73 files/mozilla-1.7.5-stackgrowth.patch 931
MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
MD5 b19c38da8865b9ee5555aeb826d1d360 files/digest-mozilla-1.7.5-r1 203
-MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCN9HqArHZZzCEUG0RAi/cAJsFOwfcSVL3vIgsinKabDn+ZXbG2wCggv73
-lthmxrCZhXod5JCzaKMKNJY=
-=hkZs
------END PGP SIGNATURE-----
diff --git a/net-www/mozilla/files/digest-mozilla-1.7.6 b/net-www/mozilla/files/digest-mozilla-1.7.6
new file mode 100644
index 000000000000..c60cf531b3c4
--- /dev/null
+++ b/net-www/mozilla/files/digest-mozilla-1.7.6
@@ -0,0 +1,3 @@
+MD5 09c78e9e51d8b11b2d3059987ef42fd0 mozilla-source-1.7.6.tar.bz2 30448120
+MD5 4aa272b46c8cbf167dcd49a6d74cf526 ipc-1.1.2.tar.gz 102663
+MD5 920f0e43e620d2c89934bd9bbf9b5d02 enigmail-0.90.2.tar.gz 340488
diff --git a/net-www/mozilla/mozilla-1.7.6.ebuild b/net-www/mozilla/mozilla-1.7.6.ebuild
new file mode 100644
index 000000000000..c7ff842eb2f5
--- /dev/null
+++ b/net-www/mozilla/mozilla-1.7.6.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.6.ebuild,v 1.1 2005/03/23 07:47:15 brad Exp $
+
+unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit multilib
+
+IUSE="java crypt ssl moznomail postgres"
+
+EMVER="0.90.2"
+IPCVER="1.1.2"
+
+# handle _rc versions
+MY_PV=${PV/_alpha/a} # handle alpha
+MY_PV=${MY_PV/_beta/b} # handle beta
+MY_PV=${MY_PV/_rc/rc} # handle rc
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-source-${MY_PV}.tar.bz2
+ crypt? ( !moznomail? (
+ http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
+ http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
+ ) )"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~hppa"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
+# and is required to build with support for cairo. #71504
+RDEPEND="java? ( virtual/jre )
+ mozsvg? (
+ >=x11-base/xorg-x11-6.7.0-r2
+ x11-libs/cairo
+ )
+ crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )"
+
+DEPEND="${RDEPEND}
+ java? ( >=dev-java/java-config-0.2.0 )
+ dev-lang/perl
+ pgsql? ( >=dev-db/postgresql-7.2.0 )"
+
+S="${WORKDIR}/mozilla"
+
+src_unpack() {
+ typeset x
+
+ unpack ${A} || die "unpack failed"
+ cd ${S} || die "cd failed"
+
+ if [[ $(gcc-major-version) -eq 3 ]]; then
+ # ABI Patch for alpha/xpcom for gcc-3.x
+ if [[ ${ARCH} == alpha ]]; then
+ epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
+ fi
+ fi
+
+ # Fix stack growth logic
+ epatch ${FILESDIR}/${PN}-stackgrowth.patch
+
+ # Fix logic error when using RAW target
+ # <azarah@gentoo.org> (23 Feb 2003)
+ epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch
+
+ # HPPA patches from Ivar <orskaug@stud.ntnu.no>
+ # <gmsoft@gentoo.org> (22 Dec 2004)
+ epatch ${FILESDIR}/mozilla-hppa.patch
+
+ # patch out ft caching code since the API changed between releases of
+ # freetype; this enables freetype-2.1.8+ compat.
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
+ epatch ${FILESDIR}/mozilla-1.7.3-4ft2.patch
+
+ # Patch for newer versions of cairo ( bug #80301)
+ if has_version '>=x11-libs/cairo-0.3.0'; then
+ epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
+ fi
+
+ WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
+
+ # Unpack the enigmail plugin
+ if use crypt && ! use moznomail; then
+ for x in ipc enigmail; do
+ mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed"
+ cd ${S}/extensions/${x} || die "cd failed"
+ makemake # from mozilla.eclass
+ done
+ fi
+}
+
+src_compile() {
+ ####################################
+ #
+ # mozconfig, CFLAGS and CXXFLAGS setup
+ #
+ ####################################
+
+ mozconfig_init
+
+ # Bug 60668: Galeon doesn't build without oji enabled, so enable it
+ # regardless of java setting.
+ mozconfig_annotate '' --enable-oji --enable-mathml
+
+ # Other moz-specific settings
+ mozconfig_use_enable mozdevelop jsd
+ mozconfig_use_enable mozdevelop xpctools
+ mozconfig_use_extension mozdevelop venkman
+ mozconfig_use_enable gnome gnomevfs
+ mozconfig_use_extension gnome gnomevfs
+ mozconfig_use_extension !moznoirc irc
+ mozconfig_use_extension mozxmlterm xmlterm
+ mozconfig_use_extension postgres sql
+ mozconfig_use_enable mozcalendar calendar
+ mozconfig_use_enable ldap
+ mozconfig_use_enable ldap ldap-experimental
+ mozconfig_use_enable mozsvg svg
+ mozconfig_use_enable mozsvg svg-renderer-cairo
+ mozconfig_annotate '' --prefix=/usr/$(get_libdir)/mozilla
+ mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/mozilla
+
+ if use moznomail && ! use mozcalendar; then
+ mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
+ fi
+ if use moznocompose && use moznomail; then
+ mozconfig_annotate "+moznocompose +moznomail" --disable-composer
+ fi
+
+ # Finalize and report settings
+ mozconfig_final
+
+ if use postgres ; then
+ export MOZ_ENABLE_PGSQL=1
+ export MOZ_PGSQL_INCLUDES=/usr/include
+ export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
+ fi
+
+ ####################################
+ #
+ # Configure and build Mozilla
+ #
+ ####################################
+
+ # ./configure picks up the mozconfig stuff
+ export LD="$(tc-getLD)"
+ export CC="$(tc-getCC)"
+ export CXX="$(tc-getCXX)"
+ ./configure || die "configure failed"
+
+ # This removes extraneous CFLAGS from the Makefiles to reduce RAM
+ # requirements while compiling
+ edit_makefiles
+
+ emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "emake failed"
+
+ ####################################
+ #
+ # Build Mozilla NSS
+ #
+ ####################################
+
+ # Build the NSS/SSL support
+ if use ssl; then
+ einfo "Building Mozilla NSS..."
+
+ # Fix #include problem
+ cd ${S}/security/coreconf || die "cd coreconf failed"
+ echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
+ >>headers.mk
+ emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make security headers failed"
+
+ cd ${S}/security/nss || die "cd nss failed"
+ emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" moz_import || die "make moz_import failed"
+ emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make nss failed"
+ fi
+
+ ####################################
+ #
+ # Build Enigmail plugin
+ #
+ ####################################
+
+ # Build the enigmail plugin
+ if use crypt && ! use moznomail; then
+ einfo "Building Enigmail plugin..."
+ cd ${S}/extensions/ipc || die "cd ipc failed"
+ emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make ipc failed"
+
+ cd ${S}/extensions/enigmail || die "cd enigmail failed"
+ emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make enigmail failed"
+ fi
+}
+
+src_install() {
+ # Install, don't create tarball
+ dodir /usr/$(get_libdir)
+ cd ${S}/xpinstall/packager
+ einfo "Installing mozilla into build root..."
+ make MOZ_PKG_FORMAT="RAW" TAR_CREATE_FLAGS="-chf" > /dev/null || die "make failed"
+ mv -f ${S}/dist/mozilla ${D}/usr/$(get_libdir)/mozilla
+
+ einfo "Installing includes and idl files..."
+ # Copy the include and idl files
+ dodir /usr/$(get_libdir)/mozilla/include/idl /usr/include
+ cd ${S}/dist
+ cp -LfR include/* ${D}/usr/$(get_libdir)/mozilla/include
+ cp -LfR idl/* ${D}/usr/$(get_libdir)/mozilla/include/idl
+ dosym /usr/$(get_libdir)/mozilla/include /usr/include/mozilla
+
+ # Install the development tools in /usr
+ dodir /usr/bin
+ mv ${D}/usr/$(get_libdir)/mozilla/{xpcshell,xpidl,xpt_dump,xpt_link} ${D}/usr/bin
+
+ # Install the NSS/SSL libs, headers and tools
+ if use ssl; then
+ einfo "Installing Mozilla NSS..."
+ # Install the headers ('make install' do not work for headers ...)
+ insinto /usr/$(get_libdir)/mozilla/include/nss
+ [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
+ [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
+ [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
+ # These come with zlib ...
+ rm -f ${D}/usr/$(get_libdir)/mozilla/include/nss/{zconf.h,zlib.h}
+
+ cd ${S}/security/nss
+
+ mkdir -p ${WORKDIR}/nss/{bin,lib}
+ export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
+ export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
+
+ make install || die "make failed"
+ # Gets installed as symbolic links ...
+ cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+ cp -Lf ${WORKDIR}/nss/lib/* ${D}/usr/$(get_libdir)/mozilla
+
+ # Need to unset these incase we want to rebuild, else the build
+ # gets newked.
+ unset SOURCE_LIB_DIR
+ unset SOURCE_BIN_DIR
+ fi
+
+ cd ${S}/build/unix
+ # Fix mozilla-config and install it
+ perl -pi -e "s:/lib/mozilla-${MY_PV}::g" mozilla-config
+ perl -pi -e "s:/mozilla-${MY_PV}::g" mozilla-config
+ exeinto /usr/$(get_libdir)/mozilla
+ doexe mozilla-config
+ # Fix pkgconfig files and install them
+ insinto /usr/$(get_libdir)/pkgconfig
+ for x in *.pc; do
+ if [[ -f ${x} ]]; then
+ perl -pi -e "s:/lib/mozilla-${MY_PV}::g" ${x}
+ perl -pi -e "s:/mozilla-${MY_PV}::g" ${x}
+ doins ${x}
+ fi
+ done
+ cd ${S}
+
+ dodir /usr/bin
+ dosym /usr/libexec/mozilla-launcher /usr/bin/mozilla
+ insinto /etc/env.d
+ doins ${FILESDIR}/10mozilla
+ dodoc LEGAL LICENSE README/mozilla/README*
+
+ # Install rebuild script
+ exeinto /usr/$(get_libdir)/mozilla/
+ doexe ${FILESDIR}/mozilla-rebuild-databases.pl
+
+ # Move plugins dir
+ src_mv_plugins /usr/$(get_libdir)/mozilla/plugins
+
+ # Update Google search plugin to use UTF8 charset ...
+ insinto /usr/$(get_libdir)/mozilla/searchplugins
+ doins ${FILESDIR}/google.src
+
+ if [[ -f "${WORKDIR}/.xft" ]]; then
+ # We are using Xft, so change the default font
+ insinto /usr/$(get_libdir)/mozilla/defaults/pref
+ doins ${FILESDIR}/xft.js
+ fi
+
+ # Fix icons to look the same everywhere
+ insinto /usr/$(get_libdir)/mozilla/icons
+ doins ${S}/widget/src/gtk/mozicon16.xpm
+ doins ${S}/widget/src/gtk/mozicon50.xpm
+
+ # Install icon and .desktop for menu entry
+ insinto /usr/share/pixmaps
+ doins ${FILESDIR}/icon/mozilla-icon.png
+ insinto /usr/share/applications
+ doins ${FILESDIR}/icon/mozilla.desktop
+
+ # Take care of non root execution
+ # (seems the problem is that not all files are readible by the user)
+ einfo "Fixing Permissions..."
+ chmod -R g+r,o+r ${D}/usr/$(get_libdir)/mozilla
+ find ${D}/usr/$(get_libdir)/mozilla/ -type d -exec chmod 0755 {} \; || :
+}
+
+pkg_preinst() {
+ # Move old plugins dir
+ pkg_mv_plugins /usr/$(get_libdir)/mozilla/plugins
+
+ if true; then
+ # Remove entire installed instance to solve various problems,
+ # for example see bug 27719
+ rm -rf ${ROOT}/usr/$(get_libdir)/mozilla
+ else
+ # Stale components and chrome files break when unmerging old
+ rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/components
+ rm -rf ${ROOT}/usr/$(get_libdir)/mozilla/chrome
+
+ # Remove stale component registry.
+ rm -f ${ROOT}/usr/$(get_libdir)/mozilla/component.reg
+ rm -f ${ROOT}/usr/$(get_libdir)/mozilla/components/compreg.dat
+
+ # Make sure these are removed.
+ rm -f ${ROOT}/usr/$(get_libdir)/mozilla/lib{Xft,Xrender}.so*
+ fi
+}
+
+pkg_postinst() {
+ export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
+
+ # 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..."
+ ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+
+ # 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 {} \;
+
+ update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+ # Regenerate component.reg in case some things changed
+ if [[ -e ${ROOT}/usr/$(get_libdir)/mozilla/regxpcom ]]; then
+ export MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/mozilla"
+
+ if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
+ ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
+ # Fix directory permissions
+ find ${MOZILLA_FIVE_HOME}/ -type d -perm 0700 -exec chmod 755 {} \;
+ # Fix permissions on chrome files
+ find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \;
+ fi
+ fi
+
+ update_mozilla_launcher_symlinks
+}