diff options
Diffstat (limited to 'net-www/mozilla')
| -rw-r--r-- | net-www/mozilla/ChangeLog | 9 | ||||
| -rw-r--r-- | net-www/mozilla/Manifest | 10 | ||||
| -rw-r--r-- | net-www/mozilla/files/digest-mozilla-1.7_beta-r1 | 3 | ||||
| -rw-r--r-- | net-www/mozilla/files/digest-mozilla-1.7_rc1 | 3 | ||||
| -rw-r--r-- | net-www/mozilla/files/digest-mozilla-1.7_rc2 | 3 | ||||
| -rw-r--r-- | net-www/mozilla/files/ipc-1.0.6-nsPipeChannel.patch | 16 | ||||
| -rw-r--r-- | net-www/mozilla/mozilla-1.7_beta-r1.ebuild | 557 | ||||
| -rw-r--r-- | net-www/mozilla/mozilla-1.7_rc1-r1.ebuild | 20 | ||||
| -rw-r--r-- | net-www/mozilla/mozilla-1.7_rc2.ebuild (renamed from net-www/mozilla/mozilla-1.7_rc1.ebuild) | 321 |
9 files changed, 202 insertions, 740 deletions
diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog index c53ee3fda1c7..affc5a0b18c5 100644 --- a/net-www/mozilla/ChangeLog +++ b/net-www/mozilla/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-www/mozilla # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.169 2004/05/07 19:32:30 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.170 2004/06/09 19:21:18 agriffis Exp $ + +*mozilla-1.7_rc2 (09 Jun 2004) + + 09 Jun 2004; Aron Griffis <agriffis@gentoo.org> + +files/ipc-1.0.6-nsPipeChannel.patch, -mozilla-1.7_beta-r1.ebuild, + mozilla-1.7_rc1-r1.ebuild, -mozilla-1.7_rc1.ebuild, +mozilla-1.7_rc2.ebuild: + Update to 1.7_rc2. Trim older 1.7 versions 07 May 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7_beta-r1.ebuild, mozilla-1.7_rc1-r1.ebuild, mozilla-1.7_rc1.ebuild: diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest index 8a0d5f3e06df..ce5633e156e1 100644 --- a/net-www/mozilla/Manifest +++ b/net-www/mozilla/Manifest @@ -1,7 +1,8 @@ -MD5 57702cb88c58b1393c9e5b3b61005517 mozilla-1.7_rc1-r1.ebuild 15610 -MD5 dd6149781a4f9aa7b8312905da91369a mozilla-1.7_beta-r1.ebuild 15939 -MD5 c908bcb957951df24e164b510db5dd3c mozilla-1.6-r1.ebuild 17204 -MD5 a53c66772eaff3fa1c2e002b1822b05d mozilla-1.7_rc1.ebuild 16380 +MD5 8a6d6eeb9063c4381518e66d62d88ba6 mozilla-1.7_rc1-r1.ebuild 15609 +MD5 5ed70e54d2624900fb7ac9515967ef03 mozilla-1.7_beta-r1.ebuild 15938 +MD5 bf61a08dd26ef88fd571a31aaf3211b7 mozilla-1.7_rc2.ebuild 15609 +MD5 7379576ce2f1d449416cf3286c18200e mozilla-1.6-r1.ebuild 17203 +MD5 27773b07b3eef42009a34fd51e7b161c mozilla-1.7_rc1.ebuild 16379 MD5 1d4cefceb2cba7bb9b2a328baa2e6514 ChangeLog 29758 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 MD5 e816a98fb3581a6d4a050aa4cdf12905 files/mozilla-1.7-amd64.patch 25433 @@ -15,6 +16,7 @@ MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953 MD5 fd25ae9f126eecac401987c2c84fe136 files/digest-mozilla-1.7_rc1 204 +MD5 6ad8ad7f83c525040d7211ec7fc33d01 files/digest-mozilla-1.7_rc2 204 MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105 MD5 2e275ac9f0f12d670020e3b18a295dfb files/mozilla.sh 6688 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135 diff --git a/net-www/mozilla/files/digest-mozilla-1.7_beta-r1 b/net-www/mozilla/files/digest-mozilla-1.7_beta-r1 deleted file mode 100644 index d8585cdb1e64..000000000000 --- a/net-www/mozilla/files/digest-mozilla-1.7_beta-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ee564ecbc7f443f9e49eca1d9ff57296 mozilla-source-1.7b-source.tar.bz2 32081692 -MD5 7cc8c0fec5e670a93825670b16b01a3b enigmail-0.83.5.tar.gz 275010 -MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083 diff --git a/net-www/mozilla/files/digest-mozilla-1.7_rc1 b/net-www/mozilla/files/digest-mozilla-1.7_rc1 deleted file mode 100644 index f2bf277e0e87..000000000000 --- a/net-www/mozilla/files/digest-mozilla-1.7_rc1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a78b2e2dc2c8fa9b22c9e406e3cde808 mozilla-source-1.7rc1.tar.bz2 34162006 -MD5 fe851d3a95cb32a906a3e6cb6b4b5552 enigmail-0.83.6.tar.gz 281677 -MD5 457f8277b12f3e37defa71dc186f83b4 ipc-1.0.5.tar.gz 137083 diff --git a/net-www/mozilla/files/digest-mozilla-1.7_rc2 b/net-www/mozilla/files/digest-mozilla-1.7_rc2 new file mode 100644 index 000000000000..f5dff2ec1429 --- /dev/null +++ b/net-www/mozilla/files/digest-mozilla-1.7_rc2 @@ -0,0 +1,3 @@ +MD5 da2215a6281cc56bcf805fe0d5e4b6c0 mozilla-source-1.7rc2.tar.bz2 34321893 +MD5 437fa8f2aaeade178760acea20bc62b4 enigmail-0.84.1.tar.gz 309380 +MD5 e4c79a7bb5ac7428dfef767e835fc770 ipc-1.0.6.tar.gz 116519 diff --git a/net-www/mozilla/files/ipc-1.0.6-nsPipeChannel.patch b/net-www/mozilla/files/ipc-1.0.6-nsPipeChannel.patch new file mode 100644 index 000000000000..989ad6dae422 --- /dev/null +++ b/net-www/mozilla/files/ipc-1.0.6-nsPipeChannel.patch @@ -0,0 +1,16 @@ +This patch brings a critical line up to date from cvs so that +ipc-1.0.6 will compile (09 Jun 2004 agriffis) + +http://www.mozdev.org/source/browse/protozilla/ipc/ + +--- ipc/src/nsPipeChannel.cpp.agriffis 2004-05-17 02:44:43.000000000 -0400 ++++ ipc/src/nsPipeChannel.cpp 2004-06-09 13:48:51.146277360 -0400 +@@ -210,7 +210,7 @@ + if (NS_FAILED(rv)) return rv; + + nsXPIDLCString contentType; +- rv = MIMEService->GetTypeFromURI(url, contentType); ++ rv = MIMEService->GetTypeFromURI(url, getter_Copies(contentType)); + if (NS_SUCCEEDED(rv) && contentType) { + mContentType.Assign(contentType); + } diff --git a/net-www/mozilla/mozilla-1.7_beta-r1.ebuild b/net-www/mozilla/mozilla-1.7_beta-r1.ebuild deleted file mode 100644 index ae52b754f34f..000000000000 --- a/net-www/mozilla/mozilla-1.7_beta-r1.ebuild +++ /dev/null @@ -1,557 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_beta-r1.ebuild,v 1.9 2004/05/07 19:32:30 agriffis Exp $ - -IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama" -# Internal USE flags that I do not really want to advertise ... -IUSE="${IUSE} mozcalendar mozaccess mozxmlterm" -IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft" - -inherit flag-o-matic gcc eutils nsplugins - -# Strip over-aggressive CFLAGS - Mozilla supplies its own fine-tuned CFLAGS and shouldn't be interfered with -strip-flags - -# Strip flags which create more documented instability -filter-flags -fomit-frame-pointer -filter-flags -ffast-math -append-flags -s -fforce-addr - -# Merged ARCH stuff into a single case statement. But shouldn't this -# stuff go in src_compile? (18 Nov 2003 agriffis) -case "${ARCH}" in - alpha|ia64) - # Anything more than this causes segfaults on startup on 64-bit - # (bug 33767) - export CFLAGS="${CFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe" - export CXXFLAGS="${CXXFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe" - ;; - amd64) - # Anything more than this causes segfaults on startup on amd64 - # [Note: I think amd64 could use the same as above in the - # alpha/ia64 section, but I'll let the amd64 devs choose. -agriffis] - export CFLAGS="-O -Wall -fPIC -pipe" - export CXXFLAGS="${CFLAGS}" - ;; - ppc) - # Fix to avoid gcc-3.3.x micompilation issues. - if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then - append-flags -fno-strict-aliasing - fi - ;; - sparc) - # Sparc support ... - replace-sparc64-flags - ;; - *) - # We set -O in ./configure to -O1, as -O2 cause crashes on - # startup (bug 13287) - export CFLAGS="${CFLAGS//-O?}" - export CXXFLAGS="${CFLAGS//-O?}" - ;; -esac - -EMVER="0.83.5" -IPCVER="1.0.5" - -PATCH_VER="1.0" - -# 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 -S="${WORKDIR}/mozilla" -DESCRIPTION="The Mozilla Web Browser" -SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}-source.tar.bz2 - !moznomail? ( crypt? ( - http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz - http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz - ) )" -# mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" -HOMEPAGE="http://www.mozilla.org" - -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64" -SLOT="0" -LICENSE="MPL-1.1 NPL-1.1" - -RDEPEND="virtual/x11 - >=sys-libs/zlib-1.1.4 - >=media-libs/fontconfig-2.1 - !moznoxft ( virtual/xft ) - >=media-libs/jpeg-6b - >=media-libs/libpng-1.2.1 - >=sys-apps/portage-2.0.14 - dev-libs/expat - app-arch/zip - app-arch/unzip - gtk2? ( - >=x11-libs/gtk+-2.2.0 - >=dev-libs/glib-2.2.0 - >=x11-libs/pango-1.2.1 - >=dev-libs/libIDL-0.8.0 ) - !gtk2? ( - =x11-libs/gtk+-1.2* - =dev-libs/glib-1.2* - >=gnome-base/ORBit-0.5.10-r1 ) - java? ( virtual/jre ) - crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) ) - gnome? ( >=gnome-base/gnome-vfs-2.3.5 ) - >=net-www/mozilla-launcher-1.7-r1" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-lang/perl - java? ( >=dev-java/java-config-0.2.0 )" - - -moz_setup() { - # Set MAKEOPTS to have proper -j? option .. - get_number_of_jobs - - # This should enable parallel builds, I hope - export MAKE="emake" - - # needed by src_compile() and src_install() - export MOZILLA_OFFICIAL=1 - export BUILD_OFFICIAL=1 - - # make sure the nss module gets build (for NSS support) - if use ssl; then - export MOZ_PSM="1" - fi -} - -src_unpack() { - moz_setup - - unpack ${A} - - cd ${S} || die - - 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 - if [[ ${ARCH} == amd64 ]]; then - epatch ${FILESDIR}/${PN}-1.7-amd64.patch - fi - fi - - epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2 - - # Fix logic error when using RAW target - # <azarah@gentoo.org> (23 Feb 2003) - epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch - - WANT_AUTOCONF_2_1=1 autoconf &> /dev/null - - # Unpack the enigmail plugin - if use crypt && ! use moznomail; then - mv -f ${WORKDIR}/ipc ${S}/extensions/ - mv -f ${WORKDIR}/enigmail ${S}/extensions/ - cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile - cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile - fi -} - -src_compile() { - moz_setup - - local myconf - - # NOTE: QT and XLIB toolkit seems very unstable, leave disabled until - # tested ok -- azarah - if use gtk2; then - myconf="${myconf} - --enable-toolkit-gtk2 \ - --enable-default-toolkit=gtk2 \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --disable-toolkit-gtk" - else - myconf="${myconf} - --enable-toolkit-gtk \ - --enable-default-toolkit=gtk \ - --disable-toolkit-qt \ - --disable-toolkit-xlib \ - --disable-toolkit-gtk2" - fi - - if ! use debug; then - myconf="${myconf} \ - --enable-strip-libs \ - --disable-debug \ - --disable-tests \ - --enable-reorder \ - --enable-strip" -# --enable-cpp-rtti" - - # Currently --enable-elf-dynstr-gc only works for x86 and ppc, - # thanks to Jason Wever <weeve@gentoo.org> for the fix. - if use x86 || use ppc; then - myconf="${myconf} --enable-elf-dynstr-gc" - fi - fi - - # Check if we should enable Xft support ... - if ! use moznoxft; then - if 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 (bad pango)" - myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" - fi - else - ewarn "Building without Xft2.0 support (no pkg-config xft)" - 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 - else - einfo "Building without Xft2.0 support (moznoxft)" - myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" - fi - - # NB!!: Due to the fact that the non default extensions do not always - # compile properly, using them is considered unsupported, and - # is just here for completeness. Please do not use if you - # do not know what you are doing! - # - # The defaults are: - # cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix - # venkman inspector irc universalchardet typeaheadfind webservices - # spellcheck - # Non-defaults are: - # xmlterm access-builtin datetime finger cview - if use mozxmlterm || use mozaccess; then - ewarn "" - ewarn "The use of the non-default extensions is considered unsupported, and these" - ewarn "may not always compile properly." - ewarn "Please do not use if you do not know what you're doing!" - ewarn "" - sleep 3 - fi - - local myext="default" - use mozxmlterm && myext="${myext},xmlterm" - use mozaccess && myext="${myext},access-builtin" - use moznoirc && myext="${myext},-irc" - -# Disable SVG until it's properly implemented -# if use mozsvg; then -# export MOZ_INTERNAL_LIBART_LGPL="1" -# myconf="${myconf} --enable-svg" -# else -# myconf="${myconf} --disable-svg" -# fi - - if use moznomail && ! use mozcalendar; then - myconf="${myconf} --disable-mailnews" - fi - if use moznocompose && use moznomail; then - myconf="${myconf} --disable-composer" - fi - - if [[ $(gcc-major-version) -eq 3 ]]; then - # Currently gcc-3.2 or older do not work well if we specify "-march" - # and other optimizations for pentium4. - if [[ $(gcc-minor-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 - - if use alpha; then - # mozilla wont link with X11 on alpha, for some crazy reason. - # set it to link explicitly here. - sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \ - ${S}/gfx/src/gtk/Makefile.in - fi - - # Check for xinerama - closes #19369 - if use xinerama; then - myconf="${myconf} --enable-xinerama=yes" - else - myconf="${myconf} --enable-xinerama=no" - fi - - # ********************************************************************* - # - # Configure and build Mozilla - # - # ********************************************************************* - - export BUILD_MODULES=all - export BUILD_OPT=1 - - # Get it to work without warnings on gcc3 - export CXXFLAGS="${CXXFLAGS} -Wno-deprecated" - - # On 64-bit we statically set 'safe' CFLAGS. Use those only. - # using the standard -O2 will cause segfaults on startup - case "${ARCH}" in - alpha|amd64|ia64) - ENABLE_OPTIMIZE="${CFLAGS}" - ;; - *) - ENABLE_OPTIMIZE="-O2" - ;; - esac - - cd ${S} - einfo "Configuring Mozilla..." - ./configure --prefix=/usr/lib/mozilla \ - $(use_enable gnome gnomevfs) \ - $(use_enable ipv6) \ - $(use_enable ldap) \ - $(use_enable mozcalendar calendar) \ - --disable-pedantic \ - --disable-short-wchar \ - --disable-xprint \ - --enable-mathml \ - --without-system-nspr \ - --enable-nspr-autoconf \ - --with-system-zlib \ - --enable-xsl \ - --enable-crypto \ - --enable-extensions="${myext}" \ - --enable-optimize="${ENABLE_OPTIMIZE}" \ - --with-default-mozilla-five-home=/usr/lib/mozilla \ - ${myconf} || die - - einfo "Building Mozilla..." - make WORKDIR="${WORKDIR}" || die - - # ********************************************************************* - # - # Build Mozilla NSS - # - # ********************************************************************* - - # Build the NSS/SSL support - if use ssl; then - einfo "Building Mozilla NSS..." - cd ${S}/security/coreconf - - # Fix #include problem - cp headers.mk headers.mk.orig - echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ - >>headers.mk - - # Disable jobserver here ... - make MAKE="make" || die - - cd ${S}/security/nss - - # Disable jobserver here ... - make MAKE="make" moz_import || die - make MAKE="make" || die - cd ${S} - fi - - # ********************************************************************* - # - # Build Enigmail plugin - # - # ********************************************************************* - - # Build the enigmail plugin - if use crypt && ! use moznomail; then - einfo "Building Enigmail plugin..." - cd ${S}/extensions/ipc - make || die - - cd ${S}/extensions/enigmail - make || die - fi -} - -src_install() { - moz_setup - - # 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 - 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 BUILD_OPT=1 - export SOURCE_BIN_DIR=${WORKDIR}/nss/bin - export SOURCE_LIB_DIR=${WORKDIR}/nss/lib - - make install || die - # 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 - if use gnome; then - insinto /usr/share/pixmaps - doins ${FILESDIR}/icon/mozilla-icon.png - - insinto /usr/share/gnome/apps/Internet - doins ${FILESDIR}/icon/mozilla.desktop - fi - - # 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() { - # 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* - - # Move old plugins dir - pkg_mv_plugins /usr/lib/mozilla/plugins -} - -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 {} \; || : - - echo - ewarn "Please unmerge old versions of mozilla, as the header" - ewarn "layout in /usr/lib/mozilla/include have changed and will" - ewarn "result in compile errors when compiling programs that need" - ewarn "mozilla headers and libs (galeon, nautilus, ...)" -} - -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 -} diff --git a/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild b/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild index a8e416a5dafd..cbede63cdea8 100644 --- a/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild +++ b/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild,v 1.6 2004/05/08 23:20:24 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc1-r1.ebuild,v 1.7 2004/06/09 19:21:18 agriffis Exp $ IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint" # Internal USE flags that I do not really want to advertise ... @@ -61,7 +61,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/mozilla" -moz_setup() { +pkg_setup() { # Set MAKEOPTS to have proper -j? option .. get_number_of_jobs @@ -76,8 +76,6 @@ moz_setup() { } src_unpack() { - moz_setup - unpack ${A} || die "unpack failed" cd ${S} || die @@ -98,10 +96,14 @@ src_unpack() { epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch # Fix incorrect version in milestone.txt (1.7rc1 claims 1.7b) + # If 1.7rc2 is anything to go by, then milestone.txt should report + # the upcoming version number, e.g. 1.7 local old_milestone=$(grep '^[0-9]' config/milestone.txt) - einfo "Updating milestone.txt from ${old_milestone} to ${MY_PV}" - sed -i -ne '/^#/p' config/milestone.txt # maintain comments - echo "${MY_PV}" >> config/milestone.txt # add version line + if [[ ${old_milestone} != ${PV%_*} ]]; then + einfo "Updating milestone.txt from ${old_milestone} to ${PV%_*}" + sed -i -ne '/^#/p' config/milestone.txt # maintain comments + echo "${PV%_*}" >> config/milestone.txt # add version line + fi WANT_AUTOCONF_2_1=1 autoconf &> /dev/null @@ -115,8 +117,6 @@ src_unpack() { } src_compile() { - moz_setup - #################################### # # myconf setup @@ -383,8 +383,6 @@ src_compile() { } src_install() { - moz_setup - # Install, don't create tarball dodir /usr/lib cd ${S}/xpinstall/packager diff --git a/net-www/mozilla/mozilla-1.7_rc1.ebuild b/net-www/mozilla/mozilla-1.7_rc2.ebuild index f12375e2f734..88b9fbfd9920 100644 --- a/net-www/mozilla/mozilla-1.7_rc1.ebuild +++ b/net-www/mozilla/mozilla-1.7_rc2.ebuild @@ -1,75 +1,30 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc1.ebuild,v 1.8 2004/05/07 21:38:11 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7_rc2.ebuild,v 1.1 2004/06/09 19:21:18 agriffis Exp $ -IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama" +IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug xinerama xprint" # Internal USE flags that I do not really want to advertise ... -IUSE="${IUSE} mozcalendar mozaccess mozxmlterm" +IUSE="${IUSE} mozcalendar mozaccess mozxmlterm mozsvg" IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft" +unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 inherit flag-o-matic gcc eutils nsplugins -# Strip over-aggressive CFLAGS - Mozilla supplies its own fine-tuned CFLAGS and shouldn't be interfered with -strip-flags - -# Strip flags which create more documented instability -filter-flags -fstack-protector # see bug 45671 -filter-flags -fomit-frame-pointer -filter-flags -ffast-math -append-flags -s -fforce-addr - -# Merged ARCH stuff into a single case statement. But shouldn't this -# stuff go in src_compile? (18 Nov 2003 agriffis) -case "${ARCH}" in - alpha|ia64) - # Anything more than this causes segfaults on startup on 64-bit - # (bug 33767) - export CFLAGS="${CFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe" - export CXXFLAGS="${CXXFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe" - ;; - amd64) - # Anything more than this causes segfaults on startup on amd64 - # [Note: I think amd64 could use the same as above in the - # alpha/ia64 section, but I'll let the amd64 devs choose. -agriffis] - export CFLAGS="-O -Wall -fPIC -pipe" - export CXXFLAGS="${CFLAGS}" - ;; - ppc) - # Fix to avoid gcc-3.3.x micompilation issues. - if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then - append-flags -fno-strict-aliasing - fi - ;; - sparc) - # Sparc support ... - replace-sparc64-flags - ;; - *) - # We set -O in ./configure to -O1, as -O2 cause crashes on - # startup (bug 13287) - export CFLAGS="${CFLAGS//-O?}" - export CXXFLAGS="${CFLAGS//-O?}" - ;; -esac - -EMVER="0.83.6" -IPCVER="1.0.5" - -PATCH_VER="1.0" +EMVER="0.84.1" +IPCVER="1.0.6" # 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 -S="${WORKDIR}/mozilla" + DESCRIPTION="The Mozilla Web Browser" +HOMEPAGE="http://www.mozilla.org" SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/src/${PN}-source-${MY_PV}.tar.bz2 crypt? ( !moznomail? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz http://downloads.mozdev.org/enigmail/src/ipc-${IPCVER}.tar.gz ) )" -# mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" -HOMEPAGE="http://www.mozilla.org" KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64" SLOT="0" @@ -104,14 +59,12 @@ DEPEND="${RDEPEND} dev-lang/perl java? ( >=dev-java/java-config-0.2.0 )" +S="${WORKDIR}/mozilla" -moz_setup() { +pkg_setup() { # Set MAKEOPTS to have proper -j? option .. get_number_of_jobs - # This should enable parallel builds, I hope - export MAKE="emake" - # needed by src_compile() and src_install() export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 @@ -122,11 +75,21 @@ moz_setup() { fi } -src_unpack() { - moz_setup +# Simulate the silly csh makemake script +makemake() { + typeset m topdir + + for m in $(find . -name Makefile.in); do + topdir=$(echo "$m" | sed -r 's:[^/]+:..:g') + sed -e "s:@srcdir@:.:g" -e "s:@top_srcdir@:${topdir}:g" \ + < ${m} > ${m%.in} || die "sed ${m} failed" + done +} - unpack ${A} +src_unpack() { + typeset x + unpack ${A} || die "unpack failed" cd ${S} || die if [[ $(gcc-major-version) -eq 3 ]]; then @@ -146,23 +109,38 @@ src_unpack() { epatch ${FILESDIR}/1.3/${PN}-1.3-fix-RAW-target.patch # Fix incorrect version in milestone.txt (1.7rc1 claims 1.7b) - einfo "Updating milestone.txt to ${MY_PV}" - sed -i -ne '/^#/p' config/milestone.txt # maintain comments - echo "${MY_PV}" >> config/milestone.txt # add version line + # If 1.7rc2 is anything to go by, then milestone.txt should report + # the upcoming version number, e.g. 1.7 + local old_milestone=$(grep '^[0-9]' config/milestone.txt) + if [[ ${old_milestone} != ${PV%_*} ]]; then + einfo "Updating milestone.txt from ${old_milestone} to ${PV%_*}" + sed -i -ne '/^#/p' config/milestone.txt # maintain comments + echo "${PV%_*}" >> config/milestone.txt # add version line + fi WANT_AUTOCONF_2_1=1 autoconf &> /dev/null # Unpack the enigmail plugin if use crypt && ! use moznomail; then - mv -f ${WORKDIR}/ipc ${S}/extensions/ - mv -f ${WORKDIR}/enigmail ${S}/extensions/ - cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile - cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile + for x in ipc enigmail; do + mv ${WORKDIR}/${x} ${S}/extensions || die + cd ${S}/extensions/${x} || die + makemake # see function above + done + + # Fix ipc-1.0.6 compilation problem by updating line from cvs + # (09 Jun 2004 agriffis) + cd ${S}/extensions/ipc + epatch ${FILESDIR}/ipc-1.0.6-nsPipeChannel.patch fi } src_compile() { - moz_setup + #################################### + # + # myconf setup + # + #################################### local myconf @@ -186,11 +164,11 @@ src_compile() { if ! use debug; then myconf="${myconf} \ - --enable-strip-libs \ --disable-debug \ --disable-tests \ --enable-reorder \ - --enable-strip" + --enable-strip \ + --enable-strip-libs" # --enable-cpp-rtti" # Currently --enable-elf-dynstr-gc only works for x86 and ppc, @@ -233,21 +211,37 @@ src_compile() { myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" fi - # NB!!: Due to the fact that the non default extensions do not always - # compile properly, using them is considered unsupported, and - # is just here for completeness. Please do not use if you - # do not know what you are doing! + # Re-enabled per bug 24522 (28 Apr 2004 agriffis) + if use mozsvg; then + export MOZ_INTERNAL_LIBART_LGPL=1 + myconf="${myconf} --enable-svg --enable-svg-renderer-libart" + else + myconf="${myconf} --disable-svg" + fi + + if use moznomail && ! use mozcalendar; then + myconf="${myconf} --disable-mailnews" + fi + if use moznocompose && use moznomail; then + myconf="${myconf} --disable-composer" + fi + + #################################### + # + # myext setup # + #################################### + # The defaults are: - # cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix - # venkman inspector irc universalchardet typeaheadfind webservices - # spellcheck + # cookie wallet content-packs xml-rpc xmlextras help p3p pref + # transformiix venkman inspector irc universalchardet + # typeaheadfind webservices spellcheck # Non-defaults are: # xmlterm access-builtin datetime finger cview if use mozxmlterm || use mozaccess; then ewarn "" - ewarn "The use of the non-default extensions is considered unsupported, and these" - ewarn "may not always compile properly." + ewarn "NB!!: The use of the non-default extensions is considered" + ewarn "unsupported, and these may not always compile properly." ewarn "Please do not use if you do not know what you're doing!" ewarn "" sleep 3 @@ -258,144 +252,156 @@ src_compile() { use mozaccess && myext="${myext},access-builtin" use moznoirc && myext="${myext},-irc" -# Disable SVG until it's properly implemented -# if use mozsvg; then -# export MOZ_INTERNAL_LIBART_LGPL="1" -# myconf="${myconf} --enable-svg" -# else -# myconf="${myconf} --disable-svg" -# fi + #################################### + # + # CFLAGS setup and ARCH support + # + #################################### - if use moznomail && ! use mozcalendar; then - myconf="${myconf} --disable-mailnews" - fi - if use moznocompose && use moznomail; then - myconf="${myconf} --disable-composer" + # Set optimization level based on CFLAGS + if is-flag -O0; then + enable_optimize=-O0 + elif [[ ${ARCH} == alpha || ${ARCH} == amd64 || ${ARCH} == ia64 ]]; then + # Anything more than this causes segfaults on startup on 64-bit + # (bug 33767) + enable_optimize=-O1 + append-flags -fPIC + elif is-flag -O1; then + enable_optimize=-O1 + else + enable_optimize=-O2 fi - 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 + # Now strip optimization from CFLAGS so it doesn't end up in the + # compile string + filter-flags '-O*' - # 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 + # Strip over-aggressive CFLAGS - Mozilla supplies its own + # fine-tuned CFLAGS and shouldn't be interfered with.. Do this + # AFTER setting optimization above since strip-flags only allows + # -O -O1 and -O2 + strip-flags + + # Who added the following line and why? It doesn't really hurt + # anything, but is it necessary?? (28 Apr 2004 agriffis) + append-flags -fforce-addr - if use alpha; then - # mozilla wont link with X11 on alpha, for some crazy reason. + # Additional ARCH support + case "${ARCH}" in + alpha) + # Mozilla won't link with X11 on alpha, for some crazy reason. # set it to link explicitly here. sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \ ${S}/gfx/src/gtk/Makefile.in - fi + ;; - # Check for xinerama - closes #19369 - if use xinerama; then - myconf="${myconf} --enable-xinerama=yes" - else - myconf="${myconf} --enable-xinerama=no" - fi + ppc) + # Fix to avoid gcc-3.3.x micompilation issues. + if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then + append-flags -fno-strict-aliasing + fi + ;; - # ********************************************************************* + sparc) + # Sparc support ... + replace-sparc64-flags + ;; + + x86) + if [[ $(gcc-major-version) -eq 3 ]]; then + # gcc-3 prior to 3.2.3 doesn't work well for pentium4 + # see bug 25332 + 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 + myconf="${myconf} --enable-old-abi-compat-wrappers" + fi + ;; + esac + + # Needed to build without warnings on gcc-3 + CXXFLAGS="${CXXFLAGS} -Wno-deprecated" + + #################################### # # Configure and build Mozilla # - # ********************************************************************* + #################################### export BUILD_MODULES=all export BUILD_OPT=1 - # Get it to work without warnings on gcc3 - export CXXFLAGS="${CXXFLAGS} -Wno-deprecated" - - # On 64-bit we statically set 'safe' CFLAGS. Use those only. - # using the standard -O2 will cause segfaults on startup - case "${ARCH}" in - alpha|amd64|ia64) - ENABLE_OPTIMIZE="${CFLAGS}" - ;; - *) - ENABLE_OPTIMIZE="-O2" - ;; - esac - cd ${S} einfo "Configuring Mozilla..." ./configure --prefix=/usr/lib/mozilla \ + --with-system-jpeg \ + --with-system-mng \ + --with-system-png \ + --with-system-zlib \ $(use_enable gnome gnomevfs) \ $(use_enable ipv6) \ $(use_enable ldap) \ $(use_enable mozcalendar calendar) \ + $(use_enable xprint) \ + $(use_enable xinerama) \ --disable-pedantic \ --disable-short-wchar \ - --disable-xprint \ --enable-mathml \ --without-system-nspr \ --enable-nspr-autoconf \ - --with-system-zlib \ --enable-xsl \ --enable-crypto \ --enable-extensions="${myext}" \ - --enable-optimize="${ENABLE_OPTIMIZE}" \ + --enable-optimize="${enable_optimize}" \ --with-default-mozilla-five-home=/usr/lib/mozilla \ ${myconf} || die einfo "Building Mozilla..." - make WORKDIR="${WORKDIR}" || die + make MAKE="emake" WORKDIR="${WORKDIR}" || die - # ********************************************************************* + #################################### # # Build Mozilla NSS # - # ********************************************************************* + #################################### # Build the NSS/SSL support if use ssl; then einfo "Building Mozilla NSS..." - cd ${S}/security/coreconf # Fix #include problem - cp headers.mk headers.mk.orig + cd ${S}/security/coreconf || die "cd coreconf failed" echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ >>headers.mk + make || die "make security headers failed" - # Disable jobserver here ... - make MAKE="make" || die - - cd ${S}/security/nss - - # Disable jobserver here ... - make MAKE="make" moz_import || die - make MAKE="make" || die - cd ${S} + cd ${S}/security/nss || die "cd nss failed" + make moz_import || die "make moz_import failed" + make || 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 - make || die + cd ${S}/extensions/ipc || die "cd ipc failed" + make || die "make ipc failed" - cd ${S}/extensions/enigmail - make || die + cd ${S}/extensions/enigmail || die "cd enigmail failed" + make || die "make enigmail failed" fi } src_install() { - moz_setup - # Install, don't create tarball dodir /usr/lib cd ${S}/xpinstall/packager @@ -546,12 +552,6 @@ pkg_postinst() { # Fix permissions on chrome files find ${MOZILLA_FIVE_HOME}/chrome/ -name '*.rdf' -exec chmod 0644 {} \; || : - - echo - ewarn "Please unmerge old versions of mozilla, as the header" - ewarn "layout in /usr/lib/mozilla/include have changed and will" - ewarn "result in compile errors when compiling programs that need" - ewarn "mozilla headers and libs (galeon, nautilus, ...)" } pkg_postrm() { @@ -568,4 +568,3 @@ pkg_postrm() { fi fi } - |