diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2011-03-27 14:25:27 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2011-03-27 14:25:27 +0000 |
| commit | 16dbb452b788782ce787f4329e4c9d76b534d6c1 (patch) | |
| tree | 6940560885b5ecd558315814f2c8bdeafed1b03a /www-client/firefox | |
| parent | Marking freetype-2.4.4 ppc for bug 360223 (diff) | |
| download | gentoo-2-16dbb452b788782ce787f4329e4c9d76b534d6c1.tar.gz gentoo-2-16dbb452b788782ce787f4329e4c9d76b534d6c1.tar.bz2 gentoo-2-16dbb452b788782ce787f4329e4c9d76b534d6c1.zip | |
Fix default gentoo preferences
(Portage version: 2.1.9.44/cvs/Linux x86_64)
Diffstat (limited to 'www-client/firefox')
| -rw-r--r-- | www-client/firefox/ChangeLog | 8 | ||||
| -rw-r--r-- | www-client/firefox/files/fix-preferences-gentoo.patch | 10 | ||||
| -rw-r--r-- | www-client/firefox/firefox-4.0-r2.ebuild (renamed from www-client/firefox/firefox-4.0-r1.ebuild) | 5 |
3 files changed, 21 insertions, 2 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog index c963c8eb3881..06c899892bde 100644 --- a/www-client/firefox/ChangeLog +++ b/www-client/firefox/ChangeLog @@ -1,6 +1,12 @@ # 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.53 2011/03/26 13:50:51 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.54 2011/03/27 14:25:27 anarchy Exp $ + +*firefox-4.0-r2 (27 Mar 2011) + + 27 Mar 2011; Jory A. Pratt <anarchy@gentoo.org> -firefox-4.0-r1.ebuild, + +firefox-4.0-r2.ebuild, +files/fix-preferences-gentoo.patch: + Fix default gentoo preferences 26 Mar 2011; Brent Baude <ranger@gentoo.org> firefox-3.6.16.ebuild: Marking firefox-3.6.16 ppc64 and ppc for bug 360055 diff --git a/www-client/firefox/files/fix-preferences-gentoo.patch b/www-client/firefox/files/fix-preferences-gentoo.patch new file mode 100644 index 000000000000..a8ba90fb9f10 --- /dev/null +++ b/www-client/firefox/files/fix-preferences-gentoo.patch @@ -0,0 +1,10 @@ +--- a/browser/installer/package-manifest.in 2011-03-24 23:01:23.543000001 -0500 ++++ b/browser/installer/package-manifest.in 2011-03-24 23:02:01.927000001 -0500 +@@ -444,6 +444,7 @@ + + ; [Default Preferences] + ; All the pref files must be part of base to prevent migration bugs ++@BINPATH@/@PREF_DIR@/all-gentoo.js + @BINPATH@/@PREF_DIR@/firefox.js + @BINPATH@/@PREF_DIR@/firefox-branding.js + @BINPATH@/@PREF_DIR@/channel-prefs.js diff --git a/www-client/firefox/firefox-4.0-r1.ebuild b/www-client/firefox/firefox-4.0-r2.ebuild index 7ace0af9df6b..3c94f2e9bf1f 100644 --- a/www-client/firefox/firefox-4.0-r1.ebuild +++ b/www-client/firefox/firefox-4.0-r2.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-4.0-r1.ebuild,v 1.1 2011/03/23 00:45:30 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-4.0-r2.ebuild,v 1.1 2011/03/27 14:25:27 anarchy Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -136,6 +136,9 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}" + # Ensure are preferences are added to omnijar + epatch "${FILESDIR}/fix-preferences-gentoo.patch" + # Allow user to apply any additional patches without modifing ebuild epatch_user |