diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-06-26 05:59:53 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-06-26 05:59:53 +0000 |
| commit | e939c5a79ead10d09d088daad55295a54fb41e40 (patch) | |
| tree | dc0bde296402fe0a765c20ad049a3b7652154e17 /www-client | |
| parent | Finally fix the brain-dead configuration checks for libnotify, thanks to detr... (diff) | |
| download | gentoo-2-e939c5a79ead10d09d088daad55295a54fb41e40.tar.gz gentoo-2-e939c5a79ead10d09d088daad55295a54fb41e40.tar.bz2 gentoo-2-e939c5a79ead10d09d088daad55295a54fb41e40.zip | |
Fix bug 372843, and avoid exporting XAUTHORITY as well
(Portage version: 2.2.0_alpha39_p14/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/firefox/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/firefox/files/firefox-5.0-fix-title.patch | 25 | ||||
| -rw-r--r-- | www-client/firefox/firefox-5.0.ebuild | 11 |
3 files changed, 38 insertions, 4 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog index a05b601ea3c3..1f6b1ca0352a 100644 --- a/www-client/firefox/ChangeLog +++ b/www-client/firefox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/firefox # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.75 2011/06/25 14:24:38 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.76 2011/06/26 05:59:53 nirbheek Exp $ + + 26 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> firefox-5.0.ebuild, + +files/firefox-5.0-fix-title.patch: + Fix bug 372843, and avoid exporting XAUTHORITY as well 25 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> firefox-5.0.ebuild: Fix bug 372845 (pgo needs python[sqlite]), bug 372817 (sandbox violations), diff --git a/www-client/firefox/files/firefox-5.0-fix-title.patch b/www-client/firefox/files/firefox-5.0-fix-title.patch new file mode 100644 index 000000000000..01baa9597498 --- /dev/null +++ b/www-client/firefox/files/firefox-5.0-fix-title.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/372843 + +--- mozilla-release/browser/base/Makefile.in ++++ mozilla-release/browser/base/Makefile.in +@@ -62,7 +62,7 @@ + + include $(topsrcdir)/config/rules.mk + +-PRE_RELEASE_SUFFIX := "" ++PRE_RELEASE_SUFFIX := + + DEFINES += \ + -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ +--- mozilla-release/browser/installer/windows/Makefile.in ++++ mozilla-release/browser/installer/windows/Makefile.in +@@ -51,7 +51,7 @@ + SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx + APP_VERSION := $(shell cat $(srcdir)/../../config/version.txt) + DEFINES += -DAPP_VERSION=$(APP_VERSION) +-PRE_RELEASE_SUFFIX := "" ++PRE_RELEASE_SUFFIX := + DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" + + INSTALLER_FILES = \ + diff --git a/www-client/firefox/firefox-5.0.ebuild b/www-client/firefox/firefox-5.0.ebuild index 0aacdd95647a..f8176cebecde 100644 --- a/www-client/firefox/firefox-5.0.ebuild +++ b/www-client/firefox/firefox-5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0.ebuild,v 1.2 2011/06/25 14:24:38 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0.ebuild,v 1.3 2011/06/26 05:59:53 nirbheek Exp $ EAPI="3" VIRTUALX_REQUIRED="pgo" @@ -123,9 +123,11 @@ pkg_setup() { # Avoid PGO profiling problems due to enviroment leakage # These should *always* be cleaned up anyway unset DBUS_SESSION_BUS_ADDRESS \ - XDG_SESSION_COOKIE \ + DISPLAY \ ORBIT_SOCKETDIR \ - SESSION_MANAGER + SESSION_MANAGER \ + XDG_SESSION_COOKIE \ + XAUTHORITY if ! use bindist ; then einfo @@ -183,6 +185,9 @@ src_prepare() { -i "${S}"/nsprpub/configure{.in,} \ || die + # https://bugs.gentoo.org/372843 + epatch "${FILESDIR}/${P}-fix-title.patch" + eautoreconf cd js/src |