From 472e3d5fdc9c054054ae3cff9074c8770d9855fc Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sun, 11 Jul 2010 12:53:11 +0000 Subject: [PATCH] Add patch for ARM OS detection, bug 327783 Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- mail-client/thunderbird/ChangeLog | 6 +++- mail-client/thunderbird/Manifest | 5 +-- .../thunderbird-xul-1.9.2-arm-fixes.patch | 35 +++++++++++++++++++ .../thunderbird/thunderbird-3.1.ebuild | 5 ++- 4 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 mail-client/thunderbird/files/thunderbird-xul-1.9.2-arm-fixes.patch diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog index 765dc794ac3d..33e7be602287 100644 --- a/mail-client/thunderbird/ChangeLog +++ b/mail-client/thunderbird/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/thunderbird # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.13 2010/07/08 20:10:23 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.14 2010/07/11 12:53:10 nirbheek Exp $ + + 11 Jul 2010; Nirbheek Chauhan + +files/thunderbird-xul-1.9.2-arm-fixes.patch, thunderbird-3.1.ebuild: + Add patch for ARM OS detection, bug 327783 08 Jul 2010; Brent Baude thunderbird-3.0.5.ebuild: Marking thunderbird-3.0.5 ppc64 and ppc for bug 324735 diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 420223a59357..174efbbaa43b 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -7,6 +7,7 @@ AUX thunderbird-3.1-gcc45.patch 1051 RMD160 d01dcbdc7c25d8a4c077d07abc247111a6c5 AUX thunderbird-3.1-noalsa-fixup.patch 1087 RMD160 ad7807e9d42c65b9f1a8965e43db349a4c1fd38f SHA1 36f66207e3df9aa2481a7e2cb43c6ba0e74dc912 SHA256 62a9044ad373a3ead7c8547e7a342891c55f04d5fe0225e5ac05115fbad962e1 AUX thunderbird-gentoo-default-prefs-1.js 311 RMD160 3542b008d6ba40a0290e5921d3388b81c817437c SHA1 bd307aa373458fed7c30c749d3e7acaf26e0b05e SHA256 1c9e25533118fc41e7dd8c276ce60106f6fb1959cab3887438759d23fdbc5445 AUX thunderbird-gentoo-default-prefs.js 494 RMD160 9eed5d9ac1f7953bb563354176a3656c09e62744 SHA1 6a155c0e3bf74f37ddb2e506df5cb35af5e7105f SHA256 e9831135f0f893944df3f51d3c754db9eb330a1293d7e6b79b7682d6ce60b48f +AUX thunderbird-xul-1.9.2-arm-fixes.patch 603 RMD160 952db59f2c3d526b04323fec830cf04c28dfb84d SHA1 b1e2f12c0b204bf2c6434303c0638750dcb1b73d SHA256 19d230805cb5d62a99fef32dfc373661dcc3361bf8d1f6077854120a5e9a9821 DIST mozilla-thunderbird-3.0-patches-0.3.tar.bz2 3241 RMD160 bc3b163b9c5bd7c7fb497786b2dc2da4e0a4bd28 SHA1 0182b73d48cd21204504f3bb8e17f0d9a7289464 SHA256 a430c71a12fe63662d43b4eeb5b185841a4788cbbbbd7178a3c73056ba94c5cd DIST mozilla-thunderbird-3.1-patches-0.1.tar.bz2 2451 RMD160 31b5126836b4fb6b5e62f4d1772fab2e4111320e SHA1 b86c3e93edc632801f3e331884404332b458d7b1 SHA256 79c6a48cdcf322226e39c0d8b5136506d6fb9c939c7ce531ac7f5c6ad3588d28 DIST thunderbird-3.0.4-af.xpi 200344 RMD160 4059b543f2536a148de331408f763e4befd52079 SHA1 fd35228f6f41975ed09339682eeab469b570029e SHA256 89d3836b7bc6db283618c0073313b39a11bd4ce658a2d15272a6b3e093a9f2df @@ -144,6 +145,6 @@ DIST thunderbird-3.1-zh-TW.xpi 220411 RMD160 c7aaa900aeaf7c0926d9ad793d9df5a9eca DIST thunderbird-3.1.source.tar.bz2 65633518 RMD160 bc55cf89dfe1f2c946fff8f5ec21b0377229afe7 SHA1 89e9d8099a5437ce401577fc4d526eb0dd9e51da SHA256 494090fd47944c15e3906847931d7efe77ec0e05f56dbae3a8c36d0a48616a86 EBUILD thunderbird-3.0.4-r1.ebuild 7028 RMD160 df4bebf6ae84c63cdcc2f1a1ad1093d3c9cfe325 SHA1 07f3d45628903fb5dbad78f72457b29b7864e3b8 SHA256 7d0613e43175794ff9397f1315397bb8eae224af97e3cc1f0c42de77bf02db53 EBUILD thunderbird-3.0.5.ebuild 7150 RMD160 011f22c7777829af6e1d818482eca947420849cb SHA1 f666fdb223c902bff422ff7d7ad28fef53dc8264 SHA256 6a74597d28376a8ece91d39356ca4a85e2c066e854b15568a13f916ead410771 -EBUILD thunderbird-3.1.ebuild 7545 RMD160 e9cf46ec0c8f3ca48659b9bd276f9ce8be8fded1 SHA1 0f6b559a772a1e2dc8e615b0f2d015bc49d80398 SHA256 b669493f0833aefe11254b9a570ced7cc41c06aac1bc7db7216a027072dd2a36 -MISC ChangeLog 52628 RMD160 e2b571598922cf084567eea1d196284f33c50909 SHA1 ebd4760a88f6cfbc2e18fddbf881c93755e427da SHA256 8dd4d7c2632e8e932d4df68c4f5ec24b7ca1f40c62d9bf589f7c266e09c54296 +EBUILD thunderbird-3.1.ebuild 7626 RMD160 9c50d5d9f9f06680545826f005f95635152656d2 SHA1 a8a9516e18ae284b3bf43301e1a83ff9da1b20a0 SHA256 e1849f31b28eb5cbe2605b37553b8778b6a4c8639d3a4c169809efbcc2bb71fd +MISC ChangeLog 52802 RMD160 c0a93c95d43ea0a626de5081166683309e6141db SHA1 f133652b21779ab33adfa1abe282386ee45b507d SHA256 edce7fe53a1c3a4d99962180d0f6e150349e5c089091088503987e2f38f92976 MISC metadata.xml 471 RMD160 dd596368f27518e6d32d724e878d8dfb0303fb68 SHA1 147c70ac08b477679be27a428679c4c06ce0c1f0 SHA256 8f3f2c2b7c204fa12ce8ab51e655985374ea469d3870680b6925d541dbf56ef3 diff --git a/mail-client/thunderbird/files/thunderbird-xul-1.9.2-arm-fixes.patch b/mail-client/thunderbird/files/thunderbird-xul-1.9.2-arm-fixes.patch new file mode 100644 index 000000000000..c7d7a65bf43d --- /dev/null +++ b/mail-client/thunderbird/files/thunderbird-xul-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 +--- mozilla/js/src/configure.in ++++ mozilla/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/mail-client/thunderbird/thunderbird-3.1.ebuild b/mail-client/thunderbird/thunderbird-3.1.ebuild index a898f7575ea0..3c78a82c0f84 100644 --- a/mail-client/thunderbird/thunderbird-3.1.ebuild +++ b/mail-client/thunderbird/thunderbird-3.1.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/mail-client/thunderbird/thunderbird-3.1.ebuild,v 1.3 2010/06/26 21:42:09 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.ebuild,v 1.4 2010/07/11 12:53:10 nirbheek Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -122,6 +122,9 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.1-gcc45.patch + # ARM fixes, bug 327783 + epatch "${FILESDIR}/${PN}-xul-1.9.2-arm-fixes.patch" + eautoreconf cd mozilla -- 2.26.2