Add patches for arm to fix bug #362237

Package-Manager: portage-2.1.10.7/cvs/Linux ia64

5 files changed, 119 insertions, 4 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 3e3aff7d7343..f014b6527a88 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,11 @@
 # 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.81 2011/07/26 03:18:33 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.82 2011/08/13 17:26:09 armin76 Exp $
+
+  13 Aug 2011; Raúl Porcel <armin76@gentoo.org>
+  +files/mozilla-2.0_arm_respect_cflags.patch, firefox-5.0-r2.ebuild,
+  +files/arm-bug-644136.patch:
+  Add patches for arm to fix bug #362237
 
   26 Jul 2011; Jory A. Pratt <anarchy@gentoo.org> firefox-5.0-r2.ebuild:
   Fix compilation with curl-7.21.7, bug #375899
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 46a2f6bac000..27fbe8b92bd8 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX arm-bug-644136.patch 472 RMD160 bda46fa7a4ca306ebfa3455d90c6e54a3f0d97e1 SHA1 f2eb5ab3ce793fc7d8c30d9f9db6be3a714f5c16 SHA256 3152f9c5b3f9cd75caf522e71d4105be8fbcc4def3e2f4162663799d78e03511
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
 AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c39ba298096bd08447bb94cad34d SHA1 ffff69bcff712483d1962ce04a700748fdab24f5 SHA256 7edae5ea1efb042412d02ef00c51f5e55c4499751c240b48c7b07f69cc420d94
@@ -5,6 +9,7 @@ AUX gentoo-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a
 AUX icon/firefox-1.5-unbranded.desktop 303 RMD160 e9cb808302b7fbd7d4eb84aeb0a438e1f82f220b SHA1 cd5d0ce5162d9fd246360409b1af396b62c1bc6b SHA256 1d6ba1b322ba1bf3ab8e6ef92528bdbc1a2f5cbca3119df3f4380b8b73b5cb05
 AUX icon/firefox-1.5.desktop 300 RMD160 df437e79147897b0ec52b44edc42ad4ef270eda5 SHA1 b60d51629ba58992f6d9ae9ad8c29ffc6630de4d SHA256 bc6f84004032afab5c078d8dc7c4ffe36abc45738c119fad3fcfa5de89dd5dae
 AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
+AUX mozilla-2.0_arm_respect_cflags.patch 3333 RMD160 d5f8b428a5a9cb0938e99666ac66d2abf3156b9b SHA1 17a5807b5f26a54ba80be7d0b64fbeb6d050364b SHA256 fb92269bcd700b257133875d5ecba063e99f33235282b251d4bb0eb37a73ba8f
 AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05
 DIST firefox-3.6-patches-0.2.tar.bz2 6335 RMD160 1f8297ad4279af70348a848349e75aa1a94c7372 SHA1 4c47c76fbdab937850558751ac73fe71e3269ece SHA256 1dc4278c143fa67c373a090f5698c4174d00aaa91ea63a444c2eca1cc328a523
 DIST firefox-3.6-patches-0.4.tar.bz2 5791 RMD160 17944b3605138c3b651b31fcad306a432b73b80c SHA1 4ddff9a613cc703b34667aab3aea993187405920 SHA256 39bbbe412f70b50e8870e11dbd3f9e74ed7cbeaa23ed47dea1ea6ff72f48e54f
@@ -395,6 +400,13 @@ EBUILD firefox-3.6.12.ebuild 9391 RMD160 e4a7c868b69c1b61cd4cc2bceb145a22f9d76db
 EBUILD firefox-3.6.17.ebuild 9453 RMD160 877c8bf7441925e36687e08e598ff290b25374f1 SHA1 18b1a63b6cece37c3b94139069d5520520738ba0 SHA256 495299be97ed6b650c6d8f5f0044ec2fc74c0bfb2dc8baa79ee9801dd09de92f
 EBUILD firefox-3.6.18.ebuild 9465 RMD160 06b69070b29ff7187bb663b1007a3db1c4dae06b SHA1 6e8a2da98abd0ab6419af3be02156ca9d04ac434 SHA256 dbae0686c9bd1a6b7e12222b9c13214e3902a7d6161d83ee2b2bcda9e763435b
 EBUILD firefox-4.0.1-r1.ebuild 7999 RMD160 744aa73bc524584610bd5086a9c74519b4ada62b SHA1 190d20749be4463b594d56922bd77e19993da690 SHA256 1b426e0ea6be5c55695fd89ecbe8834b3e6469e060bad034aecfc1faf7d37770
-EBUILD firefox-5.0-r2.ebuild 10884 RMD160 2364be6b15255d5c3b04538b144b5b4a26a48d27 SHA1 75063c38b2883ffca4087d4c55e626561adf3e9b SHA256 aeab9630ecea0558feaa579b6dd537c15f2209dddd9665c9b9b84fbb5088f175
-MISC ChangeLog 130191 RMD160 dfc66a3ae10a364e571ca55b910faf2840008b13 SHA1 36dbe221cae4bfa3e7e09102ee10233ceaf2450e SHA256 74b6f1014f83222ae9494bce2af92f7300ea7bee3335e43d0ffdfae813c31487
+EBUILD firefox-5.0-r2.ebuild 11025 RMD160 be95ed30e836c0c31d6e9773819e1198ae1d2271 SHA1 761dc9bba7fb356416829c18f77f190d19165af1 SHA256 66434b79f53982bbefd0d5c94715223599f273e13b73bca2641e3465a371f7fc
+MISC ChangeLog 130383 RMD160 045dbbc0efb7f204c4b7f096fd2de5e4fd64bc2c SHA1 281771c9a36adc151e162197df763493319b4366 SHA256 2a56962c84bd784e9379e07aa6e393fe74fc12ab19e58f3af4107a82da498613
 MISC metadata.xml 984 RMD160 3d501f6e987667abce5a9f1ba7fb5894d33a0f1c SHA1 06cb2914f1c1a81b705384aa6de5c3f8733f677e SHA256 1d835af90178f4e4b26c9394808f224180bbe4b8bf3fde52df01490343308b27
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5Gs7kACgkQuQc30/atMkBSeACgvHHHrSe2CCzx4lmFlTfjRqFC
+RqQAnjH8dyVQVtVG0LhbEbp9rQoonGmO
+=9lot
+-----END PGP SIGNATURE-----
diff --git a/www-client/firefox/files/arm-bug-644136.patch b/www-client/firefox/files/arm-bug-644136.patch
new file mode 100644
index 000000000000..4183f74c5c65
--- /dev/null
+++ b/www-client/firefox/files/arm-bug-644136.patch
@@ -0,0 +1,14 @@
+diff -r 4e4c7457e8f7 js/src/ctypes/libffi/src/arm/sysv.S
+--- a/js/src/ctypes/libffi/src/arm/sysv.S	Sat Apr 02 11:48:22 2011 -0400
++++ b/js/src/ctypes/libffi/src/arm/sysv.S	Sun Apr 03 04:55:15 2011 +0300
+@@ -229,6 +229,10 @@
+         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
+ 
+ 
++/* Below are VFP hard-float ABI call and closure implementations.
++   Add VFP FPU directive here. */
++	.fpu	vfp
++
+ 	@ r0:   fn
+ 	@ r1:   &ecif
+ 	@ r2:   cif->bytes
diff --git a/www-client/firefox/files/mozilla-2.0_arm_respect_cflags.patch b/www-client/firefox/files/mozilla-2.0_arm_respect_cflags.patch
new file mode 100644
index 000000000000..46efe35dc7c4
--- /dev/null
+++ b/www-client/firefox/files/mozilla-2.0_arm_respect_cflags.patch
@@ -0,0 +1,80 @@
+diff -ur mozilla-release.orig//configure.in mozilla-release/configure.in
+--- mozilla-release.orig//configure.in	2011-07-17 13:44:12.000000000 +0200
++++ mozilla-release/configure.in	2011-07-17 13:46:50.000000000 +0200
+@@ -7165,9 +7165,6 @@
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_THUMB2)
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+       fi
+@@ -7181,9 +7178,6 @@
+     arm*)
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+       fi
+@@ -7192,16 +7186,6 @@
+       AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
+     ;;
+   esac
+-else
+-  case "$target_cpu" in
+-    arm*)
+-      if test "$GNU_CC"; then
+-        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-      fi
+-      ;;
+-  esac
+ fi
+ 
+ AC_SUBST(MOZ_THUMB2)
+diff -ur mozilla-release.orig//js/src/configure.in mozilla-release/js/src/configure.in
+--- mozilla-release.orig//js/src/configure.in	2011-07-17 13:43:42.000000000 +0200
++++ mozilla-release/js/src/configure.in	2011-07-17 13:47:39.000000000 +0200
+@@ -4607,9 +4607,6 @@
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_THUMB2)
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+       fi
+@@ -4623,9 +4620,6 @@
+     arm*)
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+       fi
+@@ -4634,16 +4628,6 @@
+       AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
+     ;;
+   esac
+-else
+-  case "$target_cpu" in
+-    arm*)
+-      if test "$GNU_CC"; then
+-        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-      fi
+-      ;;
+-  esac
+ fi
+ 
+ AC_SUBST(MOZ_THUMB2)
\ No newline at end of file
diff --git a/www-client/firefox/firefox-5.0-r2.ebuild b/www-client/firefox/firefox-5.0-r2.ebuild
index c42ffa2567e6..1328c624f220 100644
--- a/www-client/firefox/firefox-5.0-r2.ebuild
+++ b/www-client/firefox/firefox-5.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-5.0-r2.ebuild,v 1.3 2011/07/26 03:18:33 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0-r2.ebuild,v 1.4 2011/08/13 17:26:09 armin76 Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -172,6 +172,10 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
+	# Patches needed for ARM, bug 362237
+	epatch "${FILESDIR}/arm-bug-644136.patch"
+	epatch "${FILESDIR}/mozilla-2.0_arm_respect_cflags.patch"
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user