Update to 1.7.5. Based on mozconfig.eclass.
authorBrad Laue <brad@gentoo.org>
Sat, 18 Dec 2004 19:37:49 +0000 (19:37 +0000)
committerBrad Laue <brad@gentoo.org>
Sat, 18 Dec 2004 19:37:49 +0000 (19:37 +0000)
net-www/mozilla/ChangeLog
net-www/mozilla/Manifest
net-www/mozilla/files/digest-mozilla-1.7.5 [new file with mode: 0644]
net-www/mozilla/mozilla-1.7.5.ebuild [new file with mode: 0644]

index a72aaaa396f5a2dfc0386ead00feadca95330ac9..ea07612acf3b2a26a62c74d0785e3ed76284eff4 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.211 2004/11/19 02:57:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.212 2004/12/18 19:37:49 brad Exp $
+
+*mozilla-1.7.5 (18 Dec 2004)
+
+  18 Dec 2004; Brad Laue <brad@gentoo.org> +mozilla-1.7.5.ebuild:
+  Update to 1.7.5. Myriad bugfixes listed in the changelog at
+  http://www.mozilla.org/releases/mozilla1.7.5/changelog.html.
 
   18 Nov 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7.3-r3.ebuild:
   Require recent xorg-x11 which provides xrender.pc #71504
index d0d92044710f2f20426614e156349e50c17367af..034d14140b88379dcc4183848de8b3d092a9a828 100644 (file)
@@ -1,18 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f4b18993ea4e902777640a7afe26b4de mozilla-1.7.3.ebuild 8822
 MD5 21fbce86f739b098e11b5225b58f452d mozilla-1.7-r1.ebuild 16620
 MD5 9320e2015bdfdecec9c9bcd3a6f65cfb mozilla-1.7.ebuild 16477
 MD5 7c90e1ccb807e874f4bfa5796d3c513d mozilla-1.6-r1.ebuild 16979
-MD5 4370477202723c1b000f026f1edabe7f mozilla-1.7.3-r3.ebuild 9977
 MD5 aa7166da0319e88d9ad909403631ab70 mozilla-1.7.2-r1.ebuild 8874
-MD5 a74a5ac4166ff6482742859333a43240 ChangeLog 36061
-MD5 1b86c01a90c75d55fc70099410d8cd0d mozilla-1.7.3-r2.ebuild 9947
+MD5 82a6a0da2eff971a9f184a20633955ad ChangeLog 36279
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 1b86c01a90c75d55fc70099410d8cd0d mozilla-1.7.3-r2.ebuild 9947
+MD5 4370477202723c1b000f026f1edabe7f mozilla-1.7.3-r3.ebuild 9977
+MD5 f42cf5fb59347af7a0d527ed8dd48c64 mozilla-1.7.5.ebuild 9983
 MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433
 MD5 a56a4dca744d428bef57871c21c54be7 files/digest-mozilla-1.7.3 281
-MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
 MD5 a5fb876c8ca4e8dbd0208db31897f39d files/ipc-1.0.7-nsPipeChannel.patch 445
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
@@ -30,11 +27,13 @@ MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
 MD5 01b356d7ff1afde7e091ed10b251b940 files/digest-mozilla-1.7.2-r1 204
-MD5 a56a4dca744d428bef57871c21c54be7 files/digest-mozilla-1.7.3-r2 281
-MD5 678261bd3948e6db546338bbc90f721f files/digest-mozilla-1.7.3-r3 203
 MD5 c3b63fbbf42894e19fff553092660af6 files/digest-mozilla-1.7 204
 MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
 MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
+MD5 a56a4dca744d428bef57871c21c54be7 files/digest-mozilla-1.7.3-r2 281
+MD5 678261bd3948e6db546338bbc90f721f files/digest-mozilla-1.7.3-r3 203
+MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
+MD5 b19c38da8865b9ee5555aeb826d1d360 files/digest-mozilla-1.7.5 203
 MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
 MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
@@ -53,10 +52,3 @@ MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpQZII1lqEGTUzyQRArOoAJ9j/wU6sQ4UYUxuyxfU4HnKS95bVQCgipzu
-yL9GGlsLsdMtDEYXnyysha0=
-=TJCQ
------END PGP SIGNATURE-----
diff --git a/net-www/mozilla/files/digest-mozilla-1.7.5 b/net-www/mozilla/files/digest-mozilla-1.7.5
new file mode 100644 (file)
index 0000000..6634da1
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 e5994f3e801cd834966367c6a12f8aeb mozilla-source-1.7.5.tar.bz2 30440393
+MD5 4aa272b46c8cbf167dcd49a6d74cf526 ipc-1.1.2.tar.gz 102663
+MD5 b916f90ff54830a91ef08dd70e77ed76 enigmail-0.89.6.tar.gz 354642
diff --git a/net-www/mozilla/mozilla-1.7.5.ebuild b/net-www/mozilla/mozilla-1.7.5.ebuild
new file mode 100644 (file)
index 0000000..f5fa3a8
--- /dev/null
@@ -0,0 +1,337 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.5.ebuild,v 1.1 2004/12/18 19:37:49 brad Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit
+
+IUSE="java crypt ssl moznomail"
+
+EMVER="0.89.6"
+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"
+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"
+
+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 logic error when using RAW target
+       # <azarah@gentoo.org> (23 Feb 2003)
+       epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.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
+
+       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_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/lib/mozilla
+       mozconfig_annotate '' --with-default-mozilla-five-home=/usr/lib/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
+
+       ####################################
+       #
+       #  Configure and build Mozilla
+       #
+       ####################################
+
+       # ./configure picks up the mozconfig stuff
+       ./configure || die "configure failed"
+
+       # This removes extraneous CFLAGS from the Makefiles to reduce RAM
+       # requirements while compiling
+       edit_makefiles
+
+       emake || 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 || die "make security headers failed"
+
+               cd ${S}/security/nss || die "cd nss failed"
+               emake -j1 moz_import || die "make moz_import failed"
+               emake -j1 || 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 || die "make ipc failed"
+
+               cd ${S}/extensions/enigmail || die "cd enigmail failed"
+               emake || die "make enigmail failed"
+       fi
+}
+
+src_install() {
+       # Install, don't create tarball
+       dodir /usr/lib
+       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/lib/mozilla
+
+       einfo "Installing includes and idl files..."
+       # Copy the include and idl files
+       dodir /usr/lib/mozilla/include/idl /usr/include
+       cd ${S}/dist
+       cp -LfR include/* ${D}/usr/lib/mozilla/include
+       cp -LfR idl/* ${D}/usr/lib/mozilla/include/idl
+       dosym /usr/lib/mozilla/include /usr/include/mozilla
+
+       # Install the development tools in /usr
+       dodir /usr/bin
+       mv ${D}/usr/lib/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/lib/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/lib/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/lib/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/lib/mozilla
+       doexe mozilla-config
+       # Fix pkgconfig files and install them
+       insinto /usr/lib/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/lib/mozilla/
+       doexe ${FILESDIR}/mozilla-rebuild-databases.pl
+
+       # Move plugins dir
+       src_mv_plugins /usr/lib/mozilla/plugins
+
+       # Update Google search plugin to use UTF8 charset ...
+       insinto /usr/lib/mozilla/searchplugins
+       doins ${FILESDIR}/google.src
+
+       if [[ -f "${WORKDIR}/.xft" ]]; then
+               # We are using Xft, so change the default font
+               insinto /usr/lib/mozilla/defaults/pref
+               doins ${FILESDIR}/xft.js
+       fi
+
+       # Fix icons to look the same everywhere
+       insinto /usr/lib/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/lib/mozilla
+       find ${D}/usr/lib/mozilla/ -type d -exec chmod 0755 {} \; || :
+}
+
+pkg_preinst() {
+       # Move old plugins dir
+       pkg_mv_plugins /usr/lib/mozilla/plugins
+
+       if true; then
+               # Remove entire installed instance to solve various problems,
+               # for example see bug 27719
+               rm -rf ${ROOT}/usr/lib/mozilla
+       else
+               # Stale components and chrome files break when unmerging old
+               rm -rf ${ROOT}/usr/lib/mozilla/components
+               rm -rf ${ROOT}/usr/lib/mozilla/chrome
+
+               # Remove stale component registry.
+               rm -f ${ROOT}/usr/lib/mozilla/component.reg
+               rm -f ${ROOT}/usr/lib/mozilla/components/compreg.dat
+
+               # Make sure these are removed.
+               rm -f ${ROOT}/usr/lib/mozilla/lib{Xft,Xrender}.so*
+       fi
+}
+
+pkg_postinst() {
+       export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/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/lib/mozilla/regxpcom ]]; then
+               export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/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
+}