summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-client/firefox/ChangeLog8
-rw-r--r--www-client/firefox/firefox-12.0-r2.ebuild (renamed from www-client/firefox/firefox-12.0-r1.ebuild)7
2 files changed, 10 insertions, 5 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 3a5a0e00d1e5..a260a85b4470 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-client/firefox
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.153 2012/05/28 14:44:24 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.154 2012/05/28 18:48:50 anarchy Exp $
+
+*firefox-12.0-r2 (28 May 2012)
+
+ 28 May 2012; <anarchy@gentoo.org> -firefox-12.0-r1.ebuild,
+ +firefox-12.0-r2.ebuild:
+ Revert to using system cairo
28 May 2012; <anarchy@gentoo.org> firefox-12.0-r1.ebuild:
Finish adding support for gcc-4.7, bug #410557
diff --git a/www-client/firefox/firefox-12.0-r1.ebuild b/www-client/firefox/firefox-12.0-r2.ebuild
index 0ca5f3e15055..a438846d5560 100644
--- a/www-client/firefox/firefox-12.0-r1.ebuild
+++ b/www-client/firefox/firefox-12.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-12.0-r1.ebuild,v 1.3 2012/05/28 14:44:24 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-12.0-r2.ebuild,v 1.1 2012/05/28 18:48:50 anarchy Exp $
EAPI="3"
VIRTUALX_REQUIRED="pgo"
@@ -27,7 +27,7 @@ fi
# Changeset for alpha snapshot
CHANGESET="e56ecd8b3a68"
# Patch version
-PATCH="${PN}-12.0-patches-0.4"
+PATCH="${PN}-12.0-patches-0.5"
# Upstream ftp release URI that's used by mozlinguas.eclass
# We don't use the http mirror because it deletes old tarballs.
MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
@@ -37,7 +37,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3
DESCRIPTION="Firefox Web Browser"
HOMEPAGE="http://www.mozilla.com/firefox"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE="bindist +crashreporter +ipc +jit +minimal pgo selinux system-sqlite +webm"
@@ -201,7 +201,6 @@ src_configure() {
mozconfig_annotate '' --enable-safe-browsing
mozconfig_annotate '' --with-system-png
mozconfig_annotate '' --enable-system-ffi
- mozconfig_annotate 'Missing features' --disable-system-cairo
# Other ff-specific settings
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}