Add patch for ARM OS detection, bug 327783

Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 61 insertions, 14 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 46ff88defb31..b3970c2c4efa 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.623 2010/07/08 20:13:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.624 2010/07/11 12:25:34 nirbheek Exp $
+
+  11 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/xulrunner-1.9.2-arm-fixes.patch, mozilla-firefox-3.6.4.ebuild,
+  mozilla-firefox-3.6.6.ebuild:
+  Add patch for ARM OS detection, bug 327783
 
   08 Jul 2010; Brent Baude <ranger@gentoo.org> mozilla-firefox-3.6.4.ebuild:
   Marking mozilla-firefox-3.6.4 ppc64 and ppc for bug 324735
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index a21c56a043a5..0986461ea270 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -8,6 +8,7 @@ AUX icon/iceweasel.desktop 251 RMD160 56a1e32c06c3bd460d15f5fc56d23293cffd62bd S
 AUX icon/mozilla-firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
 AUX icon/mozilla-firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
 AUX mozilla-filepicker.patch 722 RMD160 5d47c8d1c7f6288071295dadc0779b1eed13a2f2 SHA1 987535d45fbefd2ae0a3de4cc19e7fc86dc17c3e SHA256 f716c34efe691c8fe8924682b663670926614962bf782bac13e52fb77aeee13c
+AUX xulrunner-1.9.2-arm-fixes.patch 587 RMD160 495e8037785a1867fad0c088a4c834df6f02291c SHA1 5f08ef1f65771c2891a067c7baac8a4ef8466deb SHA256 a1b0aef546deecafe64c9ce70b08e7252a3eaf8d84a381a62b5edfaf1f735817
 AUX xulrunner-1.9.2-noalsa-fixup.patch 1031 RMD160 6eae45ee3e29fa47a7b31688cfcbfb594fcdd79b SHA1 845d4962708281bbd0cba45db82335739a50897b SHA256 1c4e017b6a8d81267a9d4b29b10cc4cfe69b090f8f8903a663f25b5e300eddd5
 DIST firefox-2.0.0.19-source.tar.bz2 40298609 RMD160 e5bba299e7bc012a70956bcb253517b696a519b1 SHA1 8c4f87c50a0ecf78530b6fbfaac3123196a260a9 SHA256 945f79fae1ff6bb8fb8e6cf0dc91b37d3381546df659939912aefe75b4a2c0cf
 DIST firefox-3.5.8.source.tar.bz2 46954234 RMD160 97a4394d895fc0d8e7be34c090ebe75540108a90 SHA1 4bfb9a274113fb9ee590c00da69d995dc500d4cc SHA256 9b9b9b0f6e783fd4184a2f08264a3470de4cbf1c41cf9cf887a8373d220bb4db
@@ -358,7 +359,7 @@ DIST mozilla-firefox-3.6.6-zh-TW.xpi 128401 RMD160 632e2deab69b4775ae11790a65796
 EBUILD mozilla-firefox-2.0.0.19.ebuild 10148 RMD160 0abf5dac24c47da9df18690fbbada3dcd5c612be SHA1 62d453d2a38fa7353c991e07aa0753c1e361ccd8 SHA256 15f59686b4948e52d46221483b4c3124886846f100b9266047b236ada6a30fe1
 EBUILD mozilla-firefox-3.5.8.ebuild 8551 RMD160 1ade6f7f07446b1da263d1a58fd6e0dad42dec1e SHA1 a7660c3308b5953d8b0a48f5e1beb75194ffcc3a SHA256 4c7154f594860a5471ba4d1b75a10edec968ff0cccd1f2426a355cf1521022ac
 EBUILD mozilla-firefox-3.6.3.ebuild 8652 RMD160 7709adca8f16a264d4fba4c893fb30161d3f655f SHA1 ba76763dd93b4516303d03983caa7515bd49cbcf SHA256 5ef2b9ab794ec5a839d59d2c946784e2e3fda435323b639f36007d440fc9603a
-EBUILD mozilla-firefox-3.6.4.ebuild 8939 RMD160 71932083d10253a87a22754ce764d60dd80c7304 SHA1 b515d9b482a7e2b641b85075e694284297d05305 SHA256 fe22740c1588417688bbd1b139ca66fb4131e0bb54b9ecf1274940ec8738c378
-EBUILD mozilla-firefox-3.6.6.ebuild 8954 RMD160 afbef2c2dee169975c553971bcc28282460edff6 SHA1 e438165fbcdc9672a646afae4f62a2841db36d1b SHA256 09ac60177d4232925294024d2df0c52f797dab3e4852d6c2d1e6966ae4a73acd
-MISC ChangeLog 115025 RMD160 c333e6e642cf332192838a86da19328506bd5c2c SHA1 868ae218aea644c6f9d2752b13222e107e865ab5 SHA256 6b9b960d370aecad84182527d2b7783a324d73ca34c201a488456388e87baa93
+EBUILD mozilla-firefox-3.6.4.ebuild 9027 RMD160 3d49130dcc6f7d4a6f05f3ebf37ecb83a5f5443c SHA1 8bd66d4fc9950e8395d8be3483d447819552bf38 SHA256 1beee0b393ca3970576aac4ca2a37ae9afd1b2f8e2070eab1d2b060e9aa6111f
+EBUILD mozilla-firefox-3.6.6.ebuild 9036 RMD160 730a22b837f1efe6f94ccadf2776cbe594f15256 SHA1 c6b7283fbfdd85bf02cb24cad056bee8a9f98301 SHA256 2042688ffdf81737939d17bf2d21d5bd73b510a1109c534d764b1edbf633ddb0
+MISC ChangeLog 115231 RMD160 3aeec65a51a3e66c345f7fc51bac2ed7dee4cf4d SHA1 528f71367dcb0d69dd597dce4dc198941c2dda95 SHA256 dfc6a4c9f39facfdf3596b08dde5ffa84a807d8550c0aae40efaac56c6f33718
 MISC metadata.xml 934 RMD160 515723c95ea7fcc7715fbd781c4f9a9784c212c0 SHA1 24fe41af8aea9f860656f32381c6b55f97357487 SHA256 e1b3e8cc44a861538dcacbeca620ffc71a22060a428d34718635837d9e3166e0
diff --git a/www-client/mozilla-firefox/files/xulrunner-1.9.2-arm-fixes.patch b/www-client/mozilla-firefox/files/xulrunner-1.9.2-arm-fixes.patch
new file mode 100644
index 000000000000..a726209e6373
--- /dev/null
+++ b/www-client/mozilla-firefox/files/xulrunner-1.9.2-arm-fixes.patch
@@ -0,0 +1,35 @@
+Fix arm OS detection
+
+https://bugs.gentoo.org/327783
+https://bugzilla.mozilla.org/show_bug.cgi?id=577319
+---
+--- configure.in
++++ configure.in
+@@ -1424,9 +1424,11 @@
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+-arm)
++arm*)
+     if test "$OS_TARGET" = "WINCE"; then
+         CPU_ARCH="$OS_TEST"
++    else
++        CPU_ARCH="arm"
+     fi
+     ;;
+ esac
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -1162,9 +1162,11 @@
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+-arm)
++arm*)
+     if test "$OS_TARGET" = "WINCE"; then
+         CPU_ARCH="$OS_TEST"
++    else
++        CPU_ARCH="arm"
+     fi
+     ;;
+ esac
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild
index a293d0f75dba..ecef84935983 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild,v 1.7 2010/07/08 20:13:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild,v 1.8 2010/07/11 12:25:34 nirbheek Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python
 
-LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
-es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it ja
-ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru
-si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW"
+LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR \
+es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it \
+ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm \
+ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW"
 NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
 
 MAJ_XUL_PV="1.9.2"
@@ -139,6 +139,9 @@ src_prepare() {
 	# Fix broken alignment
 	epatch "${FILESDIR}/1000_fix_alignment.patch"
 
+	# ARM fixes, bug 327783
+	epatch "${FILESDIR}/xulrunner-1.9.2-arm-fixes.patch"
+
 	# Allow user to apply additional patches without modifing ebuild
 	epatch_user
 
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.6.6.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.6.6.ebuild
index 203a46968868..8bac8ef7f242 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-3.6.6.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.6.6.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6.6.ebuild,v 1.1 2010/06/27 12:28:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6.6.ebuild,v 1.2 2010/07/11 12:25:34 nirbheek Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python
 
-LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
-es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it ja
-ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru
-si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW"
+LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR \
+es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it \
+ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm \
+ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW"
 NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
 
 MAJ_XUL_PV="1.9.2"
@@ -139,6 +139,9 @@ src_prepare() {
 	# Fix broken alignment
 	epatch "${FILESDIR}/1000_fix_alignment.patch"
 
+	# ARM fixes, bug 327783
+	epatch "${FILESDIR}/xulrunner-1.9.2-arm-fixes.patch"
+
 	# Allow user to apply additional patches without modifing ebuild
 	epatch_user