From 32cc3ebb4bdbe2aed390613774420767284199bf Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Tue, 2 Aug 2005 12:48:47 +0000 Subject: Update to v2 of the nsplugins patch, which actually works (even on multilib systems). Define GENTOO_NSPLUGINS_DIR and GENTOO_NSBROWSER_PLUGINS_DIR in the ebuild prior to emake, rather than in the eclass prior to econf, since ./configure chokes on the definitions (Portage version: 2.0.51.22-r2) --- www-client/mozilla-firefox/ChangeLog | 11 +- www-client/mozilla-firefox/Manifest | 27 +- .../files/digest-mozilla-firefox-1.0.6-r4 | 6 + .../mozilla-firefox-1.0.6-r4.ebuild | 288 +++++++++++++++++++++ 4 files changed, 319 insertions(+), 13 deletions(-) create mode 100644 www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.6-r4 create mode 100644 www-client/mozilla-firefox/mozilla-firefox-1.0.6-r4.ebuild (limited to 'www-client/mozilla-firefox') diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index cee9bab27764..8cd6ddb9ea91 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.59 2005/07/27 00:38:06 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.60 2005/08/02 12:48:13 agriffis Exp $ + +*mozilla-firefox-1.0.6-r4 (02 Aug 2005) + + 02 Aug 2005; Aron Griffis + +mozilla-firefox-1.0.6-r4.ebuild: + Update to v2 of the nsplugins patch, which actually works (even on multilib + systems). Define GENTOO_NSPLUGINS_DIR and GENTOO_NSBROWSER_PLUGINS_DIR in + the ebuild prior to emake, rather than in the eclass prior to econf, since + ./configure chokes on the definitions 27 Jul 2005; Jory A. Pratt +files/mozilla-firefox-1.0.6-gcc4.patch, mozilla-firefox-1.0.6-r3.ebuild: diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest index 970cc2b32f25..1873d4ef5d86 100644 --- a/www-client/mozilla-firefox/Manifest +++ b/www-client/mozilla-firefox/Manifest @@ -1,23 +1,26 @@ +MD5 ea3489681e73580095c04e171d720170 mozilla-firefox-1.0.6-r4.ebuild 9717 +MD5 36bae860ac489e572ee93bd8410d62e9 .mozilla-firefox-1.0.6-r4.ebuild.swp 24576 +MD5 0d28790dd4cc7dc7939f720cd3890c52 mozilla-firefox-1.0.6-r3.ebuild 9175 +MD5 7bb0189d2dc2b0b7015314255ec51318 mozilla-firefox-1.0.5-r1.ebuild 8796 MD5 66f918071751c8879db39154f46e3969 ChangeLog 27568 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 -MD5 7bb0189d2dc2b0b7015314255ec51318 mozilla-firefox-1.0.5-r1.ebuild 8796 MD5 9301706e1ba870836aaddcefa86e502a mozilla-firefox-1.0.6-r2.ebuild 8338 -MD5 0d28790dd4cc7dc7939f720cd3890c52 mozilla-firefox-1.0.6-r3.ebuild 9175 -MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32 +MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444 +MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520 +MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131 MD5 8b34a3a356586c0dfc62afb61479b65b files/digest-mozilla-firefox-1.0.5-r1 302 MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382 MD5 6da2b9dec8c7fbe104122a424727fb39 files/digest-mozilla-firefox-1.0.6-r3 451 -MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548 -MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322 -MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520 -MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308 +MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r4 447 +MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646 -MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444 +MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322 +MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32 MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406 -MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 -MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101 +MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548 MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 +MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308 +MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818 -MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131 -MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168 +MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979 diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.6-r4 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.6-r4 new file mode 100644 index 000000000000..fee491043da3 --- /dev/null +++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.6-r4 @@ -0,0 +1,6 @@ +MD5 7b4c1d10d478dcb4c52fbbe3e41745d9 firefox-1.0.6-source.tar.bz2 32782840 +MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601 +MD5 39c7b08477b68fe0cb3fba75970c8125 mozilla-firefox-1.0.3-ia64.patch.bz2 2531 +MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625 +MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968 +MD5 e0442e619add9045d0d04e97c274bc85 embed-typeaheadfind.patch 41038 diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r4.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r4.ebuild new file mode 100644 index 000000000000..96491baa79ad --- /dev/null +++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r4.ebuild @@ -0,0 +1,288 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r4.ebuild,v 1.1 2005/08/02 12:48:13 agriffis Exp $ + +unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 +inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib + +DESCRIPTION="Firefox Web Browser" +HOMEPAGE="http://www.mozilla.org/projects/firefox/" +SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 + mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2 + mirror://gentoo/mozilla-firefox-1.0.3-ia64.patch.bz2 + mirror://gentoo/mozilla-jslibmath-alpha.patch + mirror://gentoo/mozilla-1.7.10-nsplugins-v2.patch + http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch + mirror://gentoo/embed-typeaheadfind.patch + http://dev.gentoo.org/~anarchy/dist/embed-typeaheadfind.patch" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86" +SLOT="0" +LICENSE="MPL-1.1 NPL-1.1" +IUSE="gnome java mozdevelop mozsvg mozcalendar" + +# 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 ) + >=media-libs/libmng-1.0.0 + mozsvg? ( + >=x11-base/xorg-x11-6.7.0-r2 + x11-libs/cairo + ) + >=www-client/mozilla-launcher-1.39" + +DEPEND="${RDEPEND} + java? ( >=dev-java/java-config-0.2.0 )" + +S=${WORKDIR}/mozilla + +# 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 +export MOZ_PHOENIX=1 + +src_unpack() { + declare x + + for x in ${A}; do + [[ $x == *.tar.* ]] || continue + unpack $x || die "unpack failed" + done + cd ${S} || die "cd failed" + + #################################### + # + # architecture patches + # + #################################### + + # alpha stubs patch from lfs project. + # (26 Jun 2003) + use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch + + # hppa patches from Ivar + # (22 Dec 2004) + epatch ${FILESDIR}/mozilla-hppa.patch + + # patch to solve segfaults on ia64, from Debian, originally from David + # Mosberger + epatch ${DISTDIR}/mozilla-firefox-1.0.3-ia64.patch.bz2 + + # patch to fix math operations on alpha, makes maps.google.com work! + epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch + + #################################### + # + # general compilation and run-time fixes + # + #################################### + + # GCC4 compile fix, bug #87800 + epatch ${FILESDIR}/${P}-gcc4.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 ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2 + + # Patch for newer versions of cairo #80301 + if has_version '>=x11-libs/cairo-0.3.0'; then + epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch + fi + + #################################### + # + # behavioral fixes + # + #################################### + + # patch to fix separate character on euro keyboards, bug 68995 + epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch + + # some patches from Debian to set default preferences: + # - inherit LANG from env + # - shut off SSLv2 and 40-bit ciphers by default + # - disable application auto-updating + epatch ${FILESDIR}/mozilla-firefox-1.0.3-prefs.patch + + # look in /usr/lib/nsplugins for plugins, in addition to the usual places + epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch + + # patch to fix crash in GtkPromptService::Prompt + # https://bugzilla.mozilla.org/show_bug.cgi?id=265599 + epatch ${FILESDIR}/gtk-prompt-service.patch + + # patch to make prompts window modal instead of application modal + # https://bugzilla.mozilla.org/show_bug.cgi?id=224454 + epatch ${FILESDIR}/embedprompter-modal.patch + + # patch to fix typeahead find for browsers which embed Firefox + # http://bugzilla.gnome.org/show_bug.cgi?id=157435 + epatch ${DISTDIR}/embed-typeaheadfind.patch + + # patch to make the interface requestor give out its nsIDOMWindow + # https://bugzilla.mozilla.org/show_bug.cgi?id=277587 + epatch ${FILESDIR}/securebrowserui-iirq.patch + + # patch to add border to tooltips + # https://bugzilla.mozilla.org/show_bug.cgi?id=238052 + epatch ${FILESDIR}/gtk-tooltips.patch +} + +src_compile() { + declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} + + #################################### + # + # 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 --enable-extensions=typeaheadfind + + # Other ff-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_enable mozcalendar calendar + mozconfig_use_enable mozsvg svg + mozconfig_use_enable mozsvg svg-renderer-cairo + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + #mozconfig_annotate '' --with-user-appdir=.firefox + + # Finalize and report settings + mozconfig_final + + # hardened GCC uses -fstack-protector-all by default, which breaks us + has_hardened && append-flags -fno-stack-protector-all + replace-flags -fstack-protector-all -fstack-protector + + #################################### + # + # Configure and build + # + #################################### + + CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ + econf || die + + # It would be great if we could pass these in via CPPFLAGS or CFLAGS prior + # to econf, but the quotes cause configure to fail. + grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \ + 's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' + + # This removes extraneous CFLAGS from the Makefiles to reduce RAM + # requirements while compiling + edit_makefiles + + emake || die +} + +src_install() { + declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} + + # Most of the installation happens here + dodir ${MOZILLA_FIVE_HOME} + cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME} + + # Create directory structure to support portage-installed extensions. + # See update_chrome() in mozilla-launcher + keepdir ${MOZILLA_FIVE_HOME}/chrome.d + keepdir ${MOZILLA_FIVE_HOME}/extensions.d + cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \ + ${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt + + # Create /usr/bin/firefox + install_mozilla_launcher_stub firefox ${MOZILLA_FIVE_HOME} + + # Install icon and .desktop for menu entry + 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 + + # Fix icons to look the same everywhere + insinto ${MOZILLA_FIVE_HOME}/icons + doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm + doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm + + #################################### + # + # Install files necessary for applications to build against firefox + # + #################################### + + einfo "Installing includes and idl files..." + dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include + cd ${S}/dist + cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include + cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl + + # Dirty hack to get some applications using this header running + dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \ + /usr/lib/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h + + # Compatibility symlink so that applications can still build against firefox + # even though it has moved. To remove this symlink, grep -r MozillaFirefox + # /usr/portage and fix those ebuilds + dosym ${MOZILLA_FIVE_HOME##*/} ${MOZILLA_FIVE_HOME%/*}/MozillaFirefox + + # Fix firefox-config and install it + sed -i -e "s|/usr/lib/firefox-${PV}|${MOZILLA_FIVE_HOME}|g + s|/usr/include/firefox-${PV}|${MOZILLA_FIVE_HOME}/include|g" \ + ${S}/build/unix/firefox-config + exeinto ${MOZILLA_FIVE_HOME} + doexe ${S}/build/unix/firefox-config + + # Fix pkgconfig files and install them + insinto /usr/$(get_libdir)/pkgconfig + for x in ${S}/build/unix/*.pc; do + sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}| + s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x} + doins ${x} + done + + # Install env.d snippet, which isn't necessary for running firefox, but + # might be necessary for programs linked against firefox + insinto /etc/env.d + doins ${FILESDIR}/10MozillaFirefox + dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10MozillaFirefox + + # Install docs + dodoc LEGAL LICENSE +} + +pkg_postinst() { + declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} + + # Update the component registry + MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \ + /usr/libexec/mozilla-launcher -register + + # 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() { + declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN} + + # Update the component registry + MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \ + /usr/libexec/mozilla-launcher -register + + update_mozilla_launcher_symlinks +} -- cgit v1.2.3-65-gdbad