[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     a493f37aeb6ae23c89ee3b0776ee5b781e9fd11b
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 02:53:40 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 02:53:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=a493f37a

tb-3.3a3 update

---
 mail-client/thunderbird/Manifest                   |    7 +-
 .../thunderbird/files/system-cairo-fixup.patch     |  133 --------------------
 ...alpha2.ebuild => thunderbird-3.3_alpha3.ebuild} |    5 +-
 3 files changed, 5 insertions(+), 140 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index ae5e2c4..73381a2 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -6,9 +6,8 @@ AUX icon/thunderbird-unbranded.desktop 277 RMD160 49301b139cddf8c88d7168fa942295
 AUX icon/thunderbird.desktop 267 RMD160 109313e3ae88d0cd991e831cafbb3f4856b84478 SHA1 861c4cd25a936078597b909bd444164fbf38c82c SHA256 d1e91cf5596d3044e6a1089ce7e97b431eb1fb93afd7b353c6587fc8c4fc2a6f
 AUX libnotify-0.7.patch 1809 RMD160 5d88eedd2769b3cf318f759717df75444a823fcb SHA1 41c1c7f7b0259cf1857f9d38b1d5be0c1027c304 SHA256 97fb2338cd5e813afef08a128358c5702cb63e5399afca3004b20b863ab8281b
 AUX libpng-1.4-support.patch 669 RMD160 88e3de516a1d30c42f12f6f9225f36c0b2ec7c68 SHA1 0dad51d35b16ae36f3fc7a17b8c2ad9329eeba1f SHA256 81d60906b103b7d58213c5ef4d4c9e53ea9c5d46b6dcbd993a3cd54d25627417
-AUX system-cairo-fixup.patch 3364 RMD160 e823edc67c7d0984fed7645b09c417b93eb663ed SHA1 62b3f66be453a2fb13e2504858849aaef72bbb44 SHA256 fac11adcee4f506a005725a5741f55ba55810f7bcfc82fce5fba4317c84f4be5
 AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA256 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c
-DIST enigmail-1.1.2-20110124.tar.bz2 862291 RMD160 6b7b4a9a4295c5d0b0ff149d3750b3c059e29d47 SHA1 a4d81224def58e68ca6b8fc291b93d3598279096 SHA256 89c24933ccdf765d5a0928127a5139e3f800a2b5bf7c20020d0870e78e70f044
+DIST enigmail-1.2a1-20110316.tar.bz2 905604 RMD160 57bb867f70f6b37ee11d426a8e155f2ccf5d56d2 SHA1 371e3c8bd7157ed8aee7648a271df591db75f8c2 SHA256 113db06ab1621328635c5394174afe02bef9c154c46b62ea7c605ac0a0b2beba
 DIST thunderbird-3.1-patches-1.2.tar.bz2 3427 RMD160 354d9003e8132e0aaf7069aec84459ff28237f61 SHA1 36ad5f9af77eaacc02c7df744b5d2563fb54bed8 SHA256 6586cf569b035bd1b9179036678a0cbedbf3def88ca7d69852451542b52693a0
 DIST thunderbird-3.1.9-af.xpi 210605 RMD160 c2d36af032e89c3422ffed329c81119a6323c1dc SHA1 c4c63c458ff0ee3ac159e6993cb3895deaf471d6 SHA256 e7c10eec1f1d75f4daf010d721aba50766a8be3e2c90248c69d412c2c3468255
 DIST thunderbird-3.1.9-ar.xpi 230363 RMD160 82cd47a2d3caa37442ba0734bc8958cfb0ab0ffb SHA1 14fe03fa047f764fc43dfb9853c48494c65d26b5 SHA256 88ebac284316a33b8a97a7528cde1b1b476cc2c8ec3804c53f1b6bd1f8f9b74c
@@ -56,6 +55,6 @@ DIST thunderbird-3.1.9-uk.xpi 244831 RMD160 87f7f8ab4c93cc4afb10ae8b95e3402c3ce4
 DIST thunderbird-3.1.9-zh-CN.xpi 219646 RMD160 a48694168186adec3841840390bbffd772e7211a SHA1 469270dd5b5f4c6efdfd9856b1cb438ae4806337 SHA256 c700b7b46fd66142a0b8afe979dc7eed86354a2d1f996aabb7f649e19511172a
 DIST thunderbird-3.1.9-zh-TW.xpi 220577 RMD160 d13efbae626df159e32e17b40134f082451d013d SHA1 41f064ed29960c57f4e0d2c9676d3e8557f43a2b SHA256 029e44c508e71056c9e6ce9045cc935cba40c714840755dff99bc9efc131a70a
 DIST thunderbird-3.1.9.source.tar.bz2 68760361 RMD160 9c85e4b76929792a7c2c8cbc0435c86cb9961a4d SHA1 22b153102939430180ae1873ce15ef52286ff08d SHA256 8b499ec3d81d3242b0cc2de27effb1891a07259adf7e5e4c06150f8c9f5254c2
-DIST thunderbird-3.3a2.source.tar.bz2 81657866 RMD160 c3378e9b97992665e3f2a152c058fb2fa1a2fb6f SHA1 e9fb755875b49b0fb42554065840c59ddf6389be SHA256 226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12
+DIST thunderbird-3.3a3.source.tar.bz2 83692340 RMD160 79ec91e73d6f1e64f16efae9c6ec333a2e54b220 SHA1 416c085e92a04c12c49b7f1ad41effb7ef24ece9 SHA256 7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618
 EBUILD thunderbird-3.1.9.ebuild 6919 RMD160 be58947bcaa8cd79be14ca7d604f4dd87ee7e515 SHA1 99bf98735225e17cc80e92d880541ac82bd10426 SHA256 a91d1a32df6c36bae2533fd312d7b551776e885ebed44d675fa336c1159d553a
-EBUILD thunderbird-3.3_alpha2.ebuild 7739 RMD160 059321abb2457c8ad4244400cf422edd3964f55d SHA1 c5104679cab923de804c192fdb0f5720df84a1a0 SHA256 e94d2bd1e37b887be2a6b5b823d65bf9a210d688314340da62b2e0d81ccd7c36
+EBUILD thunderbird-3.3_alpha3.ebuild 7695 RMD160 ef0813c9c83025c4434cfac88ea52c6c3f03e858 SHA1 0b9f27b8a07f9a49abef83f63460f944d7c76bbd SHA256 fc5707889ac439b615cd6e173e12a3b7cf6ea0cee5fae3cb44d723732c8fb48a

diff --git a/mail-client/thunderbird/files/system-cairo-fixup.patch b/mail-client/thunderbird/files/system-cairo-fixup.patch
deleted file mode 100644
index 608b4b5..0000000
--- a/mail-client/thunderbird/files/system-cairo-fixup.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-work around new features that are not avaliable in system-cairo on linux
-(romaxa's original patch with modifications to use cairo-tee)
-
-diff --git a/config/system-headers b/config/system-headers
---- a/mozilla/config/system-headers
-+++ b/mozilla/config/system-headers
-@@ -81,16 +81,17 @@ pixman.h
- cairo.h
- cairo-atsui.h
- cairo-beos.h
- cairo-ft.h
- cairo-glitz.h
- cairo-os2.h
- cairo-pdf.h
- cairo-ps.h
-+cairo-tee.h
- cairo-quartz.h
- cairo-win32.h
- cairo-xlib.h
- cairo-xlib-xrender.h
- cairo-directfb.h
- cairo-qpainter.h
- #endif
- dfiff.h
-diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
---- a/mozilla/gfx/thebes/gfxASurface.cpp
-+++ b/mozilla/gfx/thebes/gfxASurface.cpp
-@@ -216,19 +216,21 @@ gfxASurface::Init(cairo_surface_t* surfa
- 
-     mSurface = surface;
-     mSurfaceValid = PR_TRUE;
- 
-     if (existingSurface) {
-         mFloatingRefs = 0;
-     } else {
-         mFloatingRefs = 1;
-+#ifdef MOZ_TREE_CAIRO
-         if (cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR) {
-             cairo_surface_set_subpixel_antialiasing(surface, CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
-         }
-+#endif
-     }
- }
- 
- gfxASurface::gfxSurfaceType
- gfxASurface::GetType() const
- {
-     if (!mSurfaceValid)
-         return (gfxSurfaceType)-1;
-@@ -430,28 +432,34 @@ gfxASurface::FormatFromContent(gfxASurfa
-         default:
-             return ImageFormatRGB24;
-     }
- }
- 
- void
- gfxASurface::SetSubpixelAntialiasingEnabled(PRBool aEnabled)
- {
-+#ifdef MOZ_TREE_CAIRO
-     if (!mSurfaceValid)
-         return;
-     cairo_surface_set_subpixel_antialiasing(mSurface,
-         aEnabled ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
-+#endif
- }
- 
- PRBool
- gfxASurface::GetSubpixelAntialiasingEnabled()
- {
-     if (!mSurfaceValid)
-       return PR_FALSE;
-+#ifdef MOZ_TREE_CAIRO
-     return cairo_surface_get_subpixel_antialiasing(mSurface) == CAIRO_SUBPIXEL_ANTIALIASING_ENABLED;
-+#else
-+    return PR_TRUE;
-+#endif
- }
- 
- PRInt32
- gfxASurface::BytePerPixelFromFormat(gfxImageFormat format)
- {
-     switch (format) {
-         case ImageFormatARGB32:
-         case ImageFormatRGB24:
-diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp
---- a/mozilla/gfx/thebes/gfxTeeSurface.cpp
-+++ b/mozilla/gfx/thebes/gfxTeeSurface.cpp
-@@ -32,17 +32,24 @@
-  * and other provisions required by the GPL or the LGPL. If you do not delete
-  * the provisions above, a recipient may use your version of this file under
-  * the terms of any one of the MPL, the GPL or the LGPL.
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
- #include "gfxTeeSurface.h"
- 
-+/* Once cairo in tree is update ensure we remove the ifdef
-+    and just include cairo-tee.h
-+*/
-+#ifdef MOZ_TREE_CAIRO
- #include "cairo.h"
-+#else
-+#include "cairo-tee.h"
-+#endif
- 
- gfxTeeSurface::gfxTeeSurface(cairo_surface_t *csurf)
- {
-     Init(csurf, PR_TRUE);
- }
- 
- gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount)
- {
-diff --git a/js/src/config/system-headers b/js/src/config/system-headers
---- a/mozilla/js/src/config/system-headers
-+++ b/mozilla/js/src/config/system-headers
-@@ -82,16 +82,17 @@ cairo.h
- cairo-atsui.h
- cairo-beos.h
- cairo-ft.h
- cairo-glitz.h
- cairo-os2.h
- cairo-pdf.h
- cairo-ps.h
- cairo-quartz.h
-+cairo-tee.h
- cairo-win32.h
- cairo-xlib.h
- cairo-xlib-xrender.h
- cairo-directfb.h
- cairo-qpainter.h
- #endif
- dfiff.h
- exception

diff --git a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild b/mail-client/thunderbird/thunderbird-3.3_alpha3.ebuild
similarity index 98%
rename from mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
rename to mail-client/thunderbird/thunderbird-3.3_alpha3.ebuild
index 1bb60ca..56b250d 100644
--- a/mail-client/thunderbird/thunderbird-3.3_alpha2.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.3_alpha3.ebuild
@@ -15,7 +15,7 @@ inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozext
 
 MY_PV="${PV/_alpha/a}"
 MY_P="${P/_alpha/a}"
-EMVER="1.1.2"
+EMVER="1.2a1"
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
@@ -28,7 +28,7 @@ IUSE="bindist +crashreporter +crypt +ipc +lightning mozdom"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases"
 SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2
-	crypt? ( http://dev.gentoo.org/~polynomial-c/mozilla/enigmail-${EMVER}-20110124.tar.bz2 )"
+	crypt? ( http://dev.gentoo.org/~anarchy/mozilla/firefox/enigmail-${EMVER}-20110316.tar.bz2 )"
 #	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 
 #for X in ${LANGS} ; do
@@ -116,7 +116,6 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}/1001-xulrunner_fix_jemalloc_vs_aslr.patch"
 	epatch "${FILESDIR}/2000-thunderbird_gentoo_install_dirs.patch"
-	epatch "${FILESDIR}/system-cairo-fixup.patch"
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail