Add patch for ARM OS detection, bug 327783

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

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 32855b000fd4cf11d755485779a332bd8f4f2f01..6a8e6787472a911eaf8aa51c16bdaeff30b9b668 100644 (file)
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.324 2010/07/08 20:08:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.325 2010/07/11 12:30:16 nirbheek Exp $
+
+  11 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  xulrunner-1.9.2.4.ebuild, xulrunner-1.9.2.6.ebuild,
+  +files/xulrunner-1.9.2-arm-fixes.patch:
+  Add patch for ARM OS detection, bug 327783
 
   08 Jul 2010; Brent Baude <ranger@gentoo.org> xulrunner-1.9.2.4.ebuild:
   Marking xulrunner-1.9.2.4 ppc64 and ppc for bug 324735

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index fd5d6af492767bdc6f4249e3a62c0c6cfaeaefb5..7d3415d28ee7319aecd962d0b517e2e233588b55 100644 (file)
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -6,6 +6,7 @@ AUX 301-xulrunner-xpctools.diff 550 RMD160 12d370d5473de5c54233a70533cd35e37305e
 AUX xulrunner-1.8-gcc-4.4.patch 310 RMD160 9d8f402aa66752b7d61fc47b6f4a1526f1f8a4e5 SHA1 741a8679bb6d65d83dfdc1ea0cd277c08b3bcc7e SHA256 2bb5b927e11307daf14b4cdab381fba27c6fcb0ba8631e7952d38821282e2c6f
 AUX xulrunner-1.8.1.19-glibc-2.10-support.patch 696 RMD160 171629110f94ecf974e7d0ac71ac842f16786b27 SHA1 316f3f325ed219643362a1837dd8451000945393 SHA256 1cf9a4c0dd54a537886dff05be9e996fc25e63518f5eaef5781492a2a21150b2
 AUX xulrunner-1.8.1.19-libpng14.patch 610 RMD160 c4c75c8d58ba848472bbb3f41bb25f2ca9e6c5c7 SHA1 40f7045f07171f5be489776501c54a7c596012f0 SHA256 a2efedc358b86126189fd78ac05319bba01fb5a7477bd300b63edfcdc7aed7ea
+AUX xulrunner-1.9.2-arm-fixes.patch 587 RMD160 495e8037785a1867fad0c088a4c834df6f02291c SHA1 5f08ef1f65771c2891a067c7baac8a4ef8466deb SHA256 a1b0aef546deecafe64c9ce70b08e7252a3eaf8d84a381a62b5edfaf1f735817
 AUX xulrunner-1.9.2-fix-pkgconfig-file.patch 397 RMD160 f1724e2476d21751e59845826dfc76dadd9db048 SHA1 0f70bfb689cba2fc609b6642408c41b0032422bc SHA256 74590a970f96a767c353e5530e40048c3c1ea0f652029eb35e782029c0b45d6e
 AUX xulrunner-1.9.2-noalsa-fixup.patch 1031 RMD160 6eae45ee3e29fa47a7b31688cfcbfb594fcdd79b SHA1 845d4962708281bbd0cba45db82335739a50897b SHA256 1c4e017b6a8d81267a9d4b29b10cc4cfe69b090f8f8903a663f25b5e300eddd5
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
@@ -29,7 +30,7 @@ EBUILD xulrunner-1.9.0.14.ebuild 4938 RMD160 90dab4447b3470cca3da354555665fe4b8b
 EBUILD xulrunner-1.9.1.6.ebuild 7948 RMD160 b3bca093dcb0ae36a7d493cb2990d7fe519a6a0f SHA1 9acb71f4171a6bc79c5e62732e085342ac77f7c5 SHA256 a59d74e0e3594f387d707b26277dc819d713c27d0d813024ba636fffa9aa7cff
 EBUILD xulrunner-1.9.1.8.ebuild 7951 RMD160 235df30f6c383961147c5114ab2bbc39e12aad05 SHA1 5fb4b96ba83ef678ac01faa354d4b67b53149dbd SHA256 d2d1768a7ecf76e310cfec673961605fe9c36c836dc50242541b3a46e3fc2938
 EBUILD xulrunner-1.9.2.3-r1.ebuild 7113 RMD160 a76436aea74663f110fe5a2ae60903ac09eab46e SHA1 cf7da8c677dc6e7707532c91461f0985d5185a05 SHA256 6c10a44ce7b04a689411e3eaca4c1d6e9260d29088df1b31af4999143e0efdce
-EBUILD xulrunner-1.9.2.4.ebuild 7179 RMD160 8fcab0755f840d257580afd767118013c5ee2b78 SHA1 b5abe190b3dcdbdc5aa498f642327d3d3dc9ec6c SHA256 dbda2db0fb5b84f761f02b854cbe33eef246d83981e56e69af288c655fed8b85
-EBUILD xulrunner-1.9.2.6.ebuild 7194 RMD160 481fb9b0285f42bb5462fb0e2410dfbb8f50c3c5 SHA1 a69593ebd59c8e2877aeffef537a7c71d5beee81 SHA256 818431389b43c91e350d8e87fbcf010e1eb3bd6292a182ec0bc2f6cbc7381699
-MISC ChangeLog 43804 RMD160 9e337576256a6d99ac6b0b238be6faac98267fc8 SHA1 42830e2f81a8eaba15ccbbc61e035f36892c83ab SHA256 1b515494bf9e819f7de564a2efbb0a8eae87cc66e3e1f13ee7e22eb84ac0dca7
+EBUILD xulrunner-1.9.2.4.ebuild 7257 RMD160 07c7f7949b1a788e8a307b5c5f98d3816d37c932 SHA1 5487c5e2452270dd28e4aa30a689ba8e95b1c450 SHA256 34d16a5f94d8d60a3075229f3e36bac3990a8632027792e770a4afa1f845144b
+EBUILD xulrunner-1.9.2.6.ebuild 7266 RMD160 fe128ef1ca1ca9535c58f4eddf75b7f47376976b SHA1 44743771fe9f5e3d1bf3cbbc5acbcbbcbd1a42c3 SHA256 ee2a72670bb87becab90a1fa4eed50522242de313179fc256704e8c385c8cf50
+MISC ChangeLog 44002 RMD160 6714076465ba199a1802432b790e2548f5c216bc SHA1 b7d1bd3100a0eebf0cf0f5bccd839fcb3b55c0e4 SHA256 ddc9fe7e0778c072e582f35bd261b113f21d617a46a41d521a7f178642e1c350
 MISC metadata.xml 534 RMD160 6f9915565c51559c0e4726fed4e43cffce894306 SHA1 7ababd8846ab59b3ea43ac0153750584aa792055 SHA256 60f561d9e9846e96bfa0d6a9161058986c65dba93879073e7138477b6ce61978

diff --git a/net-libs/xulrunner/files/xulrunner-1.9.2-arm-fixes.patch b/net-libs/xulrunner/files/xulrunner-1.9.2-arm-fixes.patch
new file mode 100644 (file)
index 0000000..a726209
--- /dev/null
+++ b/net-libs/xulrunner/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/net-libs/xulrunner/xulrunner-1.9.2.4.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.4.ebuild
index ba404b95260fd5298c044a57e6d350f55c613054..dfbc5fe2ad4a0de8dca54942e2d7080e76704aab 100644 (file)
--- a/net-libs/xulrunner/xulrunner-1.9.2.4.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.4.ebuild,v 1.6 2010/07/08 20:08:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.4.ebuild,v 1.7 2010/07/11 12:30:16 nirbheek Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -77,6 +77,9 @@ src_prepare() {
        # Ensure we find myspell dict.
        epatch "${FILESDIR}/1002_fix-system-hunspell-dict-detections.patch"
 
+       # ARM fixes, bug 327783
+       epatch "${FILESDIR}/${PN}-1.9.2-arm-fixes.patch"
+
        # Allow user to apply additional patches without modifing ebuild
        epatch_user
 

diff --git a/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild
index d4f9479992e3c586b20c2d063bc0f6e582d50ec8..8f6589a93bd46337fab12b8e44600f0e1be279f0 100644 (file)
--- a/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild,v 1.1 2010/06/27 12:27:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild,v 1.2 2010/07/11 12:30:16 nirbheek Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -77,6 +77,9 @@ src_prepare() {
        # Ensure we find myspell dict.
        epatch "${FILESDIR}/1002_fix-system-hunspell-dict-detections.patch"
 
+       # ARM fixes, bug 327783
+       epatch "${FILESDIR}/${PN}-1.9.2-arm-fixes.patch"
+
        # Allow user to apply additional patches without modifing ebuild
        epatch_user