diff options
7 files changed, 468 insertions, 64 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index 4524ac6665fb..a69efbf614dd 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,14 @@ # 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.83 2005/09/26 20:43:43 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.84 2005/09/26 22:08:12 azarah Exp $ + +*mozilla-firefox-1.0.7-r1 (26 Sep 2005) + + 26 Sep 2005; Martin Schlemmer <azarah@gentoo.org> + +files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch, + +files/mozilla-1.7.12-rpath.patch, +mozilla-firefox-1.0.7-r1.ebuild: + Add rpath stuff, bug #100597. Fix epiphany/galeon/etc segfaulting at + startup. Fix firefox segfaulting at first startup, bug #107233. 26 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> mozilla-firefox-1.0.7.ebuild: diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest index 0bb9750bef3d..d973fdf4dab5 100644 --- a/www-client/mozilla-firefox/Manifest +++ b/www-client/mozilla-firefox/Manifest @@ -1,47 +1,51 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 8a30120dc035d60c58db0a9dc8c3b91b mozilla-firefox-1.0.6-r7.ebuild 9771 -MD5 22e53c745e3052a163329c6eb22f16c9 ChangeLog 31439 -MD5 d8c6c3085e4fc8d06ef878579dddf116 mozilla-firefox-1.0.6-r6.ebuild 11233 -MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 MD5 27212c3bfc3d15dc4bb42454380c533b mozilla-firefox-1.0.6-r5.ebuild 9631 -MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154 MD5 7f073b544e7967d3453ab8579292ef3e mozilla-firefox-1.0.6-r4.ebuild 9543 +MD5 722de3d81a6bf50a4b21d1ff5815dff3 mozilla-firefox-1.0.7-r1.ebuild 11097 +MD5 690ce27c17735b4ae769f45835d6ffdd ChangeLog 31803 +MD5 8a30120dc035d60c58db0a9dc8c3b91b mozilla-firefox-1.0.6-r7.ebuild 9771 +MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154 MD5 6d3af6331c1b75d7991a5680fc9602c7 mozilla-firefox-1.0.6-r2.ebuild 8318 +MD5 d8c6c3085e4fc8d06ef878579dddf116 mozilla-firefox-1.0.6-r6.ebuild 11233 +MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 MD5 da371c50fb628c1e06ba1d5dfe24e880 mozilla-firefox-1.0.7.ebuild 10468 +MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131 MD5 6da2b9dec8c7fbe104122a424727fb39 files/digest-mozilla-firefox-1.0.6-r3 451 -MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444 -MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646 -MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382 -MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r6 447 MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32 -MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 -MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308 -MD5 787437939618daf271673626f6414b15 files/mozilla-firefox-1.0.6-GLSA105396.patch 4049 -MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465 -MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 -MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818 +MD5 f8e76316e656f43d103616a3045b4961 files/digest-mozilla-firefox-1.0.7-r1 523 +MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382 +MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101 MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412 -MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406 MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r5 447 -MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101 -MD5 f8e76316e656f43d103616a3045b4961 files/digest-mozilla-firefox-1.0.7 523 MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r7 447 -MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520 -MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548 -MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131 -MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818 -MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716 -MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020 +MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322 +MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 +MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818 MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r4 447 -MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168 +MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465 +MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444 +MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620 +MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716 +MD5 f8e76316e656f43d103616a3045b4961 files/digest-mozilla-firefox-1.0.7 523 +MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020 +MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818 +MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406 +MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r6 447 +MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520 +MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548 +MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308 +MD5 787437939618daf271673626f6414b15 files/mozilla-firefox-1.0.6-GLSA105396.patch 4049 +MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646 +MD5 730bebc28f073d8c08d32c78252445d5 files/mozilla-1.7.12-rpath.patch 1752 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979 +MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDOF27KRy60XGEcJIRAo9RAJ9foDfeLEy1MtcfxlbmVRjI3ZjYwACfTjyK -ufuVJuXd2g0bKf/tqehwkAU= -=v4Ph +iD8DBQFDOHG61ZcsMnZjRyIRAo+xAJ9WqPJM2H0qj+UFEXERFrxqjg66PQCeJ0Xe +dK0QSrn6G4Nae7ms9m7Bvbw= +=8TXw -----END PGP SIGNATURE----- diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r1 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r1 new file mode 100644 index 000000000000..ec39071d00a8 --- /dev/null +++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.7-r1 @@ -0,0 +1,7 @@ +MD5 5704a8c36de84b408e069afb0c5bc1df firefox-1.0.7-source.tar.bz2 32793876 +MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063 +MD5 855fcb4f3e40bbcc608113ceb11e2ceb mozilla-1.7.12-gtk2xft.patch.bz2 40416 +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/files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch new file mode 100644 index 000000000000..43fd152a745d --- /dev/null +++ b/www-client/mozilla-firefox/files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch @@ -0,0 +1,19 @@ +--- mozilla/gfx/src/gtk/nsFontMetricsXft.cpp 2005-09-26 20:39:02.000000000 +0200 ++++ mozilla.az/gfx/src/gtk/nsFontMetricsXft.cpp 2005-09-26 20:34:34.000000000 +0200 +@@ -2775,10 +2779,14 @@ FreeGlobals(void) + NS_IF_RELEASE(gFontEncodingProperties); + NS_IF_RELEASE(gCharsetManager); + gCTLEnabled = PR_FALSE; +- if (gPangoContext) ++ if (gPangoContext) { + g_object_unref(gPangoContext); +- if (gPangoAttrList) ++ gPangoContext = nsnull; ++ } ++ if (gPangoAttrList) { + pango_attr_list_unref(gPangoAttrList); ++ gPangoAttrList = nsnull; ++ } + + gFontXftMaps.Clear(); + diff --git a/www-client/mozilla-firefox/files/mozilla-1.7.12-rpath.patch b/www-client/mozilla-firefox/files/mozilla-1.7.12-rpath.patch new file mode 100644 index 000000000000..405339578f8b --- /dev/null +++ b/www-client/mozilla-firefox/files/mozilla-1.7.12-rpath.patch @@ -0,0 +1,47 @@ +--- 1/config/rules.mk 2005-07-28 01:45:18.000000000 +0000 ++++ 2/config/rules.mk 2005-07-28 01:45:21.000000000 +0000 +@@ -507,5 +507,10 @@ + # + ifeq ($(OS_ARCH),Linux) + ifdef IS_COMPONENT ++DSO_LDOPTS += -Wl,-rpath,#RPATH_FIXER ++OS_LDFLAGS += -Wl,-rpath,#RPATH_FIXER + EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic ++else ++DSO_LDOPTS += -Wl,-rpath,#RPATH_FIXER ++OS_LDFLAGS += -Wl,-rpath,#RPATH_FIXER + endif +--- 1/nsprpub/config/rules.mk 2003-09-16 02:00:28.000000000 +0000 ++++ 2/nsprpub/config/rules.mk 2005-07-30 04:00:21.000000000 +0000 +@@ -87,6 +87,9 @@ + endif + endif + ++DSO_LDOPTS += -Wl,-rpath,#RPATH_FIXER ++OS_LDFLAGS += -Wl,-rpath,#RPATH_FIXER ++ + # + # This makefile contains rules for building the following kinds of + # libraries: +--- 1/security/coreconf/rules.mk 2005-07-31 16:31:37.000000000 +0000 ++++ 2/security/coreconf/rules.mk 2005-07-31 16:37:27.000000000 +0000 +@@ -349,7 +349,7 @@ + ifdef XP_OS2_VACPP + $(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) + else +- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) ++ $(MKSHLIB) -Wl,-rpath,#RPATH_FIXER -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) + endif + chmod +x $@ + ifeq ($(OS_TARGET),Darwin) +--- 1/security/coreconf/rules.mk 2005-08-01 11:40:54.000000000 +0000 ++++ 2/security/coreconf/rules.mk 2005-08-01 11:50:31.000000000 +0000 +@@ -291,7 +291,7 @@ + ifdef XP_OS2_VACPP + $(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) + else +- $(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) ++ $(MKPROG) -Wl,-rpath,#RPATH_FIXER -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) + endif + endif + diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r1.ebuild new file mode 100644 index 000000000000..827236b3cff4 --- /dev/null +++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.7-r1.ebuild @@ -0,0 +1,325 @@ +# 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.7-r1.ebuild,v 1.1 2005/09/26 22:08:12 azarah Exp $ + +unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 +MOZ_FREETYPE2="no" # Need to disable for newer .. remove here and in mozconfig + # when older is removed from tree. +inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib + +SVGVER="2.3.10p1" + +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 + mozsvg? ( + mirror://gentoo/moz_libart_lgpl-${SVGVER}.tar.bz2 + http://dev.gentoo.org/~azarah/mozilla/moz_libart_lgpl-${SVGVER}.tar.bz2 + ) + mirror://gentoo/mozilla-1.7.12-gtk2xft.patch.bz2 + http://dev.gentoo.org/~azarah/mozilla/mozilla-1.7.12-gtk2xft.patch.bz2 + mirror://gentoo/mozilla-firefox-1.0.3-ia64.patch.bz2 + mirror://gentoo/mozilla-jslibmath-alpha.patch + http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.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 ) + >=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() { + unpack firefox-${PV}-source.tar.bz2 + cd ${S} || die "cd failed" + + if use mozsvg; then + cd ${S}/other-licenses + unpack moz_libart_lgpl-${SVGVER}.tar.bz2 + fi + cd ${S} + + #################################### + # + # architecture patches + # + #################################### + + # alpha stubs patch from lfs project. + # <taviso@gentoo.org> (26 Jun 2003) + use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch + + # hppa patches from Ivar <orskaug@stud.ntnu.no> + # <gmsoft@gentoo.org> (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 + + # Fix building on amd64 with gcc4 (patch from Debian) + epatch ${FILESDIR}/mozilla-1.7.8-amd64.patch + + #################################### + # + # general compilation and run-time fixes + # + #################################### + + # Build with RPATH set, bug #100597 + epatch ${FILESDIR}/mozilla-1.7.12-rpath.patch + + # GCC4 compile fix, bug #87800 + epatch ${FILESDIR}/mozilla-1.7.6-gcc4.patch + + # Rather use gtk2+xft than freetype for font rendering, and add patch + # from mozilla bugzilla to improve printing. + # https://bugzilla.mozilla.org/show_bug.cgi?id=215219#c113 + epatch ${DISTDIR}/mozilla-1.7.12-gtk2xft.patch.bz2 + # Fix for above - check that pango context is valid + epatch ${FILESDIR}/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch + # Fix for above - should link to libpangoxft + epatch ${FILESDIR}/mozilla-1.7.12-gtk2xft-link-pangoxft.patch + + # Fix libart SVG renderer building against newer freetype2 + epatch ${FILESDIR}/mozilla-1.7.12-libart-freetype.patch + + #################################### + # + # 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 + + ################################### + # + # security fixes + # + ################################### + + # Needed by some of the patches + WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed" +} + +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-libart + use mozsvg && export MOZ_INTERNAL_LIBART_LGPL=1 + 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. + sed -i -e \ + 's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \ + ${S}/config/autoconf.mk \ + ${S}/nsprpub/config/autoconf.mk \ + ${S}/xpfe/global/buildconfig.html + + # Fixup the RPATH + sed -i -e \ + 's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \ + ${S}/config/rules.mk \ + ${S}/nsprpub/config/rules.mk \ + ${S}/security/coreconf/rules.mk \ + ${S}/security/coreconf/rules.mk + + # 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 ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME} || die "Failed to Copy" + + # 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 || die "Failed to Copy" + + # 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 || die "Failed to Copy" + cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl || die "Failed to Copy" + + # Dirty hack to get some applications using this header running + dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \ + /usr/$(get_libdir)/${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/$(get_libdir)/firefox-${PV}|${MOZILLA_FIVE_HOME}|g + s|/usr/include/firefox-${PV}|${MOZILLA_FIVE_HOME}/include|g + s|/usr/share/idl/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/idl|g + s|\(echo -L.*\)\($\)|\1 -Wl,-rpath,${MOZILLA_FIVE_HOME}\2|" \ + ${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| + s|\(Libs:.*\)\($\)|\1 -Wl,-rpath,\${libdir}\2|" ${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 ${S}/{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 +} diff --git a/www-client/mozilla/Manifest b/www-client/mozilla/Manifest index 5251a8609b08..1ad0b6fedca0 100644 --- a/www-client/mozilla/Manifest +++ b/www-client/mozilla/Manifest @@ -1,47 +1,41 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 5ac1d6e61327816f403bd186db788f7a mozilla-1.7.11-r3.ebuild 12321 MD5 1a242e5dd432f1fc4b5396b7593c1cb8 mozilla-1.7.10-r1.ebuild 12594 -MD5 a2adf39f0904785a2816773de7476d61 ChangeLog 51675 -MD5 d93266fa522c8503a5c3c8563b799968 mozilla-1.7.11.ebuild 12172 -MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 -MD5 afa167a2e95520ba2899ca04145f7a87 mozilla-1.7.11-r1.ebuild 12179 -MD5 a72e1b5ec021ce8364d49d28a2d171ff mozilla-1.7.12.ebuild 12893 +MD5 97520bbab6be539ae5ce2f0add5a8488 mozilla-1.7.12-r1.ebuild 13618 MD5 efb11836f2b5c8f484f743a401229c53 mozilla-1.7.11-r2.ebuild 12246 +MD5 f0636bdcef4c2a63254a08aeba27bb01 ChangeLog 51969 +MD5 d93266fa522c8503a5c3c8563b799968 mozilla-1.7.11.ebuild 12172 +MD5 5ac1d6e61327816f403bd186db788f7a mozilla-1.7.11-r3.ebuild 12321 MD5 585e249f746a24ae127ff7a39b12133e mozilla-1.7.10-r3.ebuild 12179 +MD5 a72e1b5ec021ce8364d49d28a2d171ff mozilla-1.7.12.ebuild 12893 MD5 00cce95a37df57816d9bf357e04c3b73 mozilla-1.7.10-r2.ebuild 11834 -MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r2 428 -MD5 8047a3fb75a7615d8c40e82de392468f files/digest-mozilla-1.7.12 504 -MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651 +MD5 afa167a2e95520ba2899ca04145f7a87 mozilla-1.7.11-r1.ebuild 12179 +MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 MD5 a86b94268e23e2bb90882f4b393efbb9 files/digest-mozilla-1.7.10-r3 428 -MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432 -MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428 -MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 -MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310 +MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651 +MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412 MD5 787437939618daf271673626f6414b15 files/mozilla-1.7.11-GLSA105396.patch 4049 -MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465 +MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432 +MD5 8047a3fb75a7615d8c40e82de392468f files/digest-mozilla-1.7.12-r1 504 +MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673 +MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r1 428 +MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432 MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063 -MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105 -MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412 -MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r3 428 -MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953 -MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706 -MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432 -MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673 +MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310 +MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r3 428 +MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863 +MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465 MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931 -MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r1 428 -MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818 +MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428 +MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620 MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716 +MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r2 428 MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020 -MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350 +MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818 +MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105 +MD5 8047a3fb75a7615d8c40e82de392468f files/digest-mozilla-1.7.12 504 +MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135 +MD5 730bebc28f073d8c08d32c78252445d5 files/mozilla-1.7.12-rpath.patch 1752 +MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153 +MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux) - -iD8DBQFDOF5tKRy60XGEcJIRAtTPAJ4z370YkOdoBOi6l0IV1zYxGOgm6gCdGyuL -878GsdvgPy8Gh19Qk4lJ+W8= -=Ej4t ------END PGP SIGNATURE----- |