Marked ~hppa (bug #414297).

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, RepoMan options: --ignore-arches, signed Manifest commit with key A792A613)

6 files changed, 49 insertions, 7 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 1a9ab0c9e5e0..58bfa0c17a67 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.243 2013/05/28 13:35:18 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.244 2013/06/05 14:59:33 jer Exp $
+
+  05 Jun 2013; Jeroen Roovers <jer@gentoo.org> firefox-17.0.5.ebuild,
+  firefox-17.0.6.ebuild, firefox-21.0.ebuild, +files/firefox-20-hppa.patch,
+  +files/firefox-21-hppa.patch:
+  Marked ~hppa (bug #414297).
 
   28 May 2013; <anarchy@gentoo.org> +files/bug-846986.patch:
   Add missing patch, bug #471568
diff --git a/www-client/firefox/files/firefox-20-hppa.patch b/www-client/firefox/files/firefox-20-hppa.patch
new file mode 100644
index 000000000000..79d447099060
--- /dev/null
+++ b/www-client/firefox/files/firefox-20-hppa.patch
@@ -0,0 +1,22 @@
+--- a/js/src/gc/RootMarking.cpp
++++ b/js/src/gc/RootMarking.cpp
+@@ -314,7 +314,7 @@
+ 
+     uintptr_t *stackMin, *stackEnd;
+ #if JS_STACK_GROWTH_DIRECTION > 0
+-    stackMin = rt->nativeStackBase;
++    stackMin = reinterpret_cast<uintptr_t *>(rt->nativeStackBase);
+     stackEnd = cgcd->nativeStackTop;
+ #else
+     stackMin = cgcd->nativeStackTop + 1;
+--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_pa32.cpp
++++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_pa32.cpp
+@@ -124,7 +124,7 @@
+   return result;
+ }
+ 
+-extern "C" int SharedStub(int);
++extern "C" nsresult SharedStub(int);
+ 
+ #define STUB_ENTRY(n)       \
+ nsresult nsXPTCStubBase::Stub##n()  \
diff --git a/www-client/firefox/files/firefox-21-hppa.patch b/www-client/firefox/files/firefox-21-hppa.patch
new file mode 100644
index 000000000000..8186221c217d
--- /dev/null
+++ b/www-client/firefox/files/firefox-21-hppa.patch
@@ -0,0 +1,11 @@
+--- a/js/src/jsapi.cpp	2013-05-11 21:19:34.000000000 +0200
++++ b/js/src/jsapi.cpp	2013-05-28 17:39:15.347027000 +0200
+@@ -892,7 +892,7 @@
+     PodZero(&atomState);
+ 
+ #if JS_STACK_GROWTH_DIRECTION > 0
+-    nativeStackLimit = UINTPTR_MAX;
++    mainThread.nativeStackLimit = UINTPTR_MAX;
+ #endif
+ }
+ 
diff --git a/www-client/firefox/firefox-17.0.5.ebuild b/www-client/firefox/firefox-17.0.5.ebuild
index 42c7a3ff33b5..ce670944511d 100644
--- a/www-client/firefox/firefox-17.0.5.ebuild
+++ b/www-client/firefox/firefox-17.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-17.0.5.ebuild,v 1.7 2013/04/16 05:45:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-17.0.5.ebuild,v 1.8 2013/06/05 14:59:33 jer Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -35,7 +35,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 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm -hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist gstreamer +jit +minimal pgo selinux system-sqlite"
diff --git a/www-client/firefox/firefox-17.0.6.ebuild b/www-client/firefox/firefox-17.0.6.ebuild
index a027c0d2df16..2bf211707772 100644
--- a/www-client/firefox/firefox-17.0.6.ebuild
+++ b/www-client/firefox/firefox-17.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-17.0.6.ebuild,v 1.6 2013/05/25 20:47:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-17.0.6.ebuild,v 1.7 2013/06/05 14:59:33 jer Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -35,7 +35,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 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm -hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist gstreamer +jit +minimal pgo selinux system-sqlite"
diff --git a/www-client/firefox/firefox-21.0.ebuild b/www-client/firefox/firefox-21.0.ebuild
index e5cb0532e9c5..eed89db1781a 100644
--- a/www-client/firefox/firefox-21.0.ebuild
+++ b/www-client/firefox/firefox-21.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-21.0.ebuild,v 1.1 2013/05/28 03:37:14 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-21.0.ebuild,v 1.2 2013/06/05 14:59:33 jer Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -35,7 +35,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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist gstreamer +jit +minimal pgo pulseaudio selinux system-cairo system-jpeg system-sqlite"
@@ -153,6 +153,10 @@ src_prepare() {
 	# Undefined reference fix
 	epatch "${FILESDIR}"/bug-846986.patch
 
+	# HPPA patches (bug #414297)
+	epatch "${FILESDIR}"/${PN}-20-hppa.patch
+	epatch "${FILESDIR}"/${PN}-21-hppa.patch
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user