| 1 |
commit: 46ede62a1d885fc9f670e710b41bedae6a978793 |
| 2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 2 23:47:54 2011 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 2 23:47:54 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=46ede62a |
| 7 |
|
| 8 |
multiple bug fixes, use system libffi, support multiple archs |
| 9 |
|
| 10 |
--- |
| 11 |
mail-client/thunderbird/Manifest | 6 +- |
| 12 |
.../Copy_xpcshell_only_if_tests_are_enabled.patch | 71 -------------------- |
| 13 |
...rd-7.0.1.ebuild => thunderbird-7.0.1-r1.ebuild} | 19 ++++-- |
| 14 |
3 files changed, 17 insertions(+), 79 deletions(-) |
| 15 |
|
| 16 |
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest |
| 17 |
index 4bf0d8b..219252f 100644 |
| 18 |
--- a/mail-client/thunderbird/Manifest |
| 19 |
+++ b/mail-client/thunderbird/Manifest |
| 20 |
@@ -1,9 +1,9 @@ |
| 21 |
-AUX Copy_xpcshell_only_if_tests_are_enabled.patch 2828 RMD160 a69ed581831c0d4c674c650d6ce38e279d593d8e SHA1 0cd598d09424beaca1dc387c75575cd49fbd9f39 SHA256 38686ca5bcfb06501e1f82ee0f98a359a71c44a9789ce33413439e28495bfb0e |
| 22 |
AUX icon/thunderbird-unbranded.desktop 280 RMD160 9a479a1f7c82021962ea35ee7289e0ba24fea967 SHA1 5ab05edfba3bd1df21145107167176280a2b14eb SHA256 3693d0b91739c01f838d53955f8c3fd9906347a9dde2338d94d7f2a169cd4a46 |
| 23 |
AUX icon/thunderbird.desktop 270 RMD160 09855ea05674863e5daca1465446ef60dcc58ba8 SHA1 594b164f3d410497315a1bae4b1b0222786aca5e SHA256 e8756ac8a421ac18f28b3620b2a021199f3bc4a3a9c566479a9b6697a5305dea |
| 24 |
AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA256 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c |
| 25 |
DIST enigmail-1.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d |
| 26 |
-DIST thunderbird-7.0-patches-0.1.tar.bz2 2521 RMD160 33198b67001d73910c292ad9e6b02473b0293670 SHA1 71036622e59e5ecfe0190b4213c82da959de0d3c SHA256 1419e4544d4b7d2558f10b012da7abc5ea262d7b1291a92e3b4f4527eb8a7672 |
| 27 |
+DIST firefox-7.0-patches-0.5.tar.xz 14652 RMD160 94593a3e01247b4e5fe9c01a80e902937ed3b32b SHA1 c9cfd5e46a18e4e6adfa8334936f854c3e14a687 SHA256 e2f1de9cfbb87cd982ed205b3b5f33e3bcd952b2093a9969281a761cc0a9e293 |
| 28 |
+DIST thunderbird-7.0-patches-0.4.tar.xz 1600 RMD160 117ab25696595c601add3041142312ea0bc16685 SHA1 f343c165b7201ba34c5d794a508caa5ef42326e9 SHA256 ef5ee490574240dcc3d44dcd1f198a2a03405a396e557795c3bf65d22c1c060a |
| 29 |
DIST thunderbird-7.0.1-ar.xpi 427454 RMD160 b0749214d4b25657a491e621fb5ff7942f54f53c SHA1 070f6e98f56bdbcf92ad851e255befac8235278c SHA256 d8b7890d3036b0cf313c9f1c1bf5be13feeb75001d2732e3785667759cc16bc7 |
| 30 |
DIST thunderbird-7.0.1-ca.xpi 408520 RMD160 a3afd32ee13596dcad3235df389da876b2a02532 SHA1 ef6e6849be09550465a0404f7d3a73542029eecc SHA256 4bdb7ca95347516f11ab6bcd31adbfd5f6ebbba6936020d3164d5b56ef57839f |
| 31 |
DIST thunderbird-7.0.1-cs.xpi 408949 RMD160 cfa526dc82b597673a521dc20ec7781c5dd04de9 SHA1 3e27bbb05a106b529964d988a61e9a7c86227899 SHA256 783dde52ce6153e555e2a0e3e712a4c7668abc5bf5e58c93ca72bc136c7f75db |
| 32 |
@@ -41,4 +41,4 @@ DIST thunderbird-7.0.1-tr.xpi 403127 RMD160 50dbfd65e13f604d0d88dc8c675fec9b36ba |
| 33 |
DIST thunderbird-7.0.1-uk.xpi 454368 RMD160 a3f00a485bd9236a02b466f34f1d0634df8a4499 SHA1 09163cc5347c1baf0c0b475a2c0b7b4a779f60a2 SHA256 b2d7ab67be708e4f3ed02d0701748c027250491f9aa41a0f60d150cd8fb41466 |
| 34 |
DIST thunderbird-7.0.1-zh-TW.xpi 420847 RMD160 95095a3f45c4dd38983d9e5d9b6087e57600564e SHA1 defbc32b529699297e8f58642d0530ab2ee0d609 SHA256 7362f1cc5541006c06f1373d1cd90a4c04d496b5b79443524af7d1654a73d668 |
| 35 |
DIST thunderbird-7.0.1.source.tar.bz2 87405591 RMD160 04d39464b5c7c3128a00b0eaff806b3307e0a22e SHA1 ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5 SHA256 83f578bbfa0cb5d0f7faba6214993806050fab3e2039996344a11c9457525242 |
| 36 |
-EBUILD thunderbird-7.0.1.ebuild 8533 RMD160 d7ca2e61c5049154bfaa4f2b1f2c4b7496c66e2a SHA1 295730ce2ea05e0f225c1caf21fae0dc77eb3fab SHA256 733758aa12b96e3886cda0e8fe9f63759aeb1cd4b7ea069955a2cd136aa6e7eb |
| 37 |
+EBUILD thunderbird-7.0.1-r1.ebuild 8850 RMD160 28d8b4b1bfb9335ecaf4e60a5d3c24774871a9ea SHA1 a08b50cad22859c3a5603506a2f53351c600d282 SHA256 c843c0bb86cd469df6956496ee4d4651bcd033b171f652a75da36a862174af18 |
| 38 |
|
| 39 |
diff --git a/mail-client/thunderbird/files/Copy_xpcshell_only_if_tests_are_enabled.patch b/mail-client/thunderbird/files/Copy_xpcshell_only_if_tests_are_enabled.patch |
| 40 |
deleted file mode 100644 |
| 41 |
index 342f7de..0000000 |
| 42 |
--- a/mail-client/thunderbird/files/Copy_xpcshell_only_if_tests_are_enabled.patch |
| 43 |
+++ /dev/null |
| 44 |
@@ -1,71 +0,0 @@ |
| 45 |
-# HG changeset patch |
| 46 |
-# User Takanori MATSUURA <t.matsuu@×××××.com> |
| 47 |
-# Date 1311059208 -32400 |
| 48 |
-# Node ID 6d8318b1709e2259c1077ba1f80374bfc45af9ba |
| 49 |
-# Parent 6596041bb85c5106dc474767bc481c6522f926f3 |
| 50 |
-Bug 672286 - Copy xpcshell.ini only if ENABLE_TESTS is set; r=Standard8 |
| 51 |
- |
| 52 |
-diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in |
| 53 |
---- a/mail/app/Makefile.in |
| 54 |
-+++ b/mail/app/Makefile.in |
| 55 |
-@@ -252,24 +252,27 @@ LIBS += -lphexlib |
| 56 |
- endif |
| 57 |
- |
| 58 |
- libs:: $(srcdir)/profile/prefs.js |
| 59 |
- $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile |
| 60 |
- |
| 61 |
- libs:: blocklist.xml |
| 62 |
- $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin |
| 63 |
- |
| 64 |
-+ifdef ENABLE_TESTS |
| 65 |
- # XXX This is a hack to ensure that we get the right xpcshell.ini for our tests |
| 66 |
- # and that we can share the core mozilla-central xpcshell.ini. |
| 67 |
- # mozilla-central does this in testing/xpcshell-tests which means that it is |
| 68 |
- # very hard for anyone to specify anything else. |
| 69 |
- libs:: |
| 70 |
-+ $(NSINSTALL) -D $(MOZDEPTH)/_tests/xpcshell |
| 71 |
- cp $(MOZILLA_SRCDIR)/testing/xpcshell/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/xpcshell-core.ini |
| 72 |
- $(INSTALL) $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell |
| 73 |
- cp $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list |
| 74 |
-+endif |
| 75 |
- |
| 76 |
- ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
| 77 |
- |
| 78 |
- AB := $(firstword $(subst -, ,$(AB_CD))) |
| 79 |
- |
| 80 |
- APP_NAME = $(MOZ_APP_DISPLAYNAME) |
| 81 |
- |
| 82 |
- LOWER_APP_NAME = $(shell echo $(APP_NAME) | tr '[A-Z]' '[a-z]') |
| 83 |
-diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in |
| 84 |
---- a/suite/app/Makefile.in |
| 85 |
-+++ b/suite/app/Makefile.in |
| 86 |
-@@ -216,24 +216,27 @@ ifeq ($(OS_ARCH),WINNT) |
| 87 |
- $(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt |
| 88 |
- else |
| 89 |
- $(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/ |
| 90 |
- endif |
| 91 |
- |
| 92 |
- libs:: blocklist.xml |
| 93 |
- $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin |
| 94 |
- |
| 95 |
-+ifdef ENABLE_TESTS |
| 96 |
- # XXX This is a hack to ensure that we get the right xpcshell.ini for our tests |
| 97 |
- # and that we can share the core mozilla-central xpcshell.ini. |
| 98 |
- # mozilla-central does this in testing/xpcshell-tests which means that it is |
| 99 |
- # very hard for anyone to specify anything else. |
| 100 |
- libs:: |
| 101 |
-+ $(NSINSTALL) -D $(MOZDEPTH)/_tests/xpcshell |
| 102 |
- cp $(MOZILLA_SRCDIR)/testing/xpcshell/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/xpcshell-core.ini |
| 103 |
- $(INSTALL) $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell |
| 104 |
- cp $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list |
| 105 |
-+endif |
| 106 |
- |
| 107 |
- ifdef MOZ_OMNIJAR |
| 108 |
- # Make extensions end up as XPIs instead of flat chrome when doing omni.jar. |
| 109 |
- # APP_EXTENSIONS exist only bundled with the application, |
| 110 |
- # PROFILE_EXTENSIONS will be copied to the profile in installed builds. |
| 111 |
- # NOTE: This is a hack to run this at the end of compilation, would be nicer |
| 112 |
- # if this was done right away for built-in extensions in omnijar mode. |
| 113 |
- # Listed extension GUIDs: |
| 114 |
- |
| 115 |
- |
| 116 |
|
| 117 |
diff --git a/mail-client/thunderbird/thunderbird-7.0.1.ebuild b/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild |
| 118 |
similarity index 94% |
| 119 |
rename from mail-client/thunderbird/thunderbird-7.0.1.ebuild |
| 120 |
rename to mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild |
| 121 |
index 1aed28a..9d68c29 100644 |
| 122 |
--- a/mail-client/thunderbird/thunderbird-7.0.1.ebuild |
| 123 |
+++ b/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild |
| 124 |
@@ -18,12 +18,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linu |
| 125 |
SLOT="0" |
| 126 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
| 127 |
IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom" |
| 128 |
-PATCH="${PN}-7.0-patches-0.1" |
| 129 |
+PATCH="${PN}-7.0-patches-0.4" |
| 130 |
+PATCHFF="firefox-7.0-patches-0.5" |
| 131 |
|
| 132 |
FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/" |
| 133 |
SRC_URI="${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2 |
| 134 |
crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz ) |
| 135 |
- http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" |
| 136 |
+ http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz |
| 137 |
+ http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz" |
| 138 |
|
| 139 |
if ! [[ ${PV} =~ alpha|beta ]]; then |
| 140 |
# This list can be updated using get_langs.sh from the mozilla overlay |
| 141 |
@@ -55,6 +57,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1 |
| 142 |
>=dev-libs/nspr-4.8.8 |
| 143 |
gconf? ( >=gnome-base/gconf-1.2.1:2 ) |
| 144 |
media-libs/libpng[apng] |
| 145 |
+ virtual/libffi |
| 146 |
!x11-plugins/lightning |
| 147 |
!x11-plugins/enigmail |
| 148 |
system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) |
| 149 |
@@ -126,12 +129,17 @@ src_unpack() { |
| 150 |
} |
| 151 |
|
| 152 |
src_prepare() { |
| 153 |
- # Apply our patches |
| 154 |
+ # Apply our Thunderbird patchset |
| 155 |
EPATCH_SUFFIX="patch" \ |
| 156 |
EPATCH_FORCE="yes" \ |
| 157 |
- epatch "${WORKDIR}" |
| 158 |
+ epatch "${WORKDIR}/thunderbird" |
| 159 |
|
| 160 |
- epatch "${FILESDIR}/Copy_xpcshell_only_if_tests_are_enabled.patch" |
| 161 |
+ # Apply our patchset from firefox to thunderbird as well |
| 162 |
+ pushd "${S}"/mozilla &>/dev/null || die |
| 163 |
+ EPATCH_SUFFIX="patch" \ |
| 164 |
+ EPATCH_FORCE="yes" \ |
| 165 |
+ epatch "${WORKDIR}/firefox" |
| 166 |
+ popd &>/dev/null || die |
| 167 |
|
| 168 |
if use crypt ; then |
| 169 |
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail |
| 170 |
@@ -183,6 +191,7 @@ src_configure() { |
| 171 |
mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}" |
| 172 |
mozconfig_annotate '' --with-user-appdir=.thunderbird |
| 173 |
mozconfig_annotate '' --with-system-png |
| 174 |
+ mozconfig_annotate '' --enable-system-ffi |
| 175 |
|
| 176 |
# Use enable features |
| 177 |
mozconfig_use_enable lightning calendar |
Archives