Date: Thu, 20 Jan 2011 14:57:28 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r485 - in branches/experimental/mail/thunderbird-devel: . files Message-ID: <201101201457.p0KEvSUl035430@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Thu Jan 20 14:57:27 2011 New Revision: 485 Log: - Update to 3.3 Alpha 2 - Add two patches from Gentoo to fix build with system-cairo [1]: patch-mozilla-gfx-thebes-gfxTeeSurface.cpp patch-mozilla-gfx-thebes-gfxASurface.cpp - Add patch from Mozilla to fix build if getJIT is not defined [2]: patch-bugzilla-623277 This version needs NSPR 4.8.7 which is available in the experimental branch: branches/experimental/devel/nspr Obtained from: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2d558e6491a0fdcf8e864ffebf386b9ca8e6c792 [1], https://bugzilla.mozilla.org/show_bug.cgi?id=623277 [2] Added: branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-623277 branches/experimental/mail/thunderbird-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in - copied, changed from r480, branches/experimental/mail/thunderbird-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in branches/experimental/mail/thunderbird-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in - copied, changed from r480, branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-Makefile.in branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-ycbcr-Makefile.in branches/experimental/mail/thunderbird-devel/files/patch-mozilla-intl-uconv-src-Makefile.in Deleted: branches/experimental/mail/thunderbird-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in branches/experimental/mail/thunderbird-devel/files/patch-directory_xpcom_base_src_Makefile.in Modified: branches/experimental/mail/thunderbird-devel/Makefile branches/experimental/mail/thunderbird-devel/distinfo branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-449453 Modified: branches/experimental/mail/thunderbird-devel/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-devel/Makefile Sat Jan 15 21:55:57 2011 (r484) +++ branches/experimental/mail/thunderbird-devel/Makefile Thu Jan 20 14:57:27 2011 (r485) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 3.3a1 +DISTVERSION= 3.3a2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -15,7 +15,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr USE_AUTOTOOLS= autoconf213 LATEST_LINK= thunderbird33 Modified: branches/experimental/mail/thunderbird-devel/distinfo ============================================================================== --- branches/experimental/mail/thunderbird-devel/distinfo Sat Jan 15 21:55:57 2011 (r484) +++ branches/experimental/mail/thunderbird-devel/distinfo Thu Jan 20 14:57:27 2011 (r485) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-3.3a1.source.tar.bz2) = 07c3f3dfdea3df9b9032480f8d5f962bd5cdbd853fec7a0b6949d21ad3155988 -SIZE (thunderbird-3.3a1.source.tar.bz2) = 78212096 +SHA256 (thunderbird-3.3a2.source.tar.bz2) = 226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12 +SIZE (thunderbird-3.3a2.source.tar.bz2) = 81657866 Modified: branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-449453 ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-449453 Sat Jan 15 21:55:57 2011 (r484) +++ branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-449453 Thu Jan 20 14:57:27 2011 (r485) @@ -3,8 +3,8 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/portable.h,v retrieving revision 5.15 diff -u -8 -p -r5.15 portable.h ---- directory/c-sdk/ldap/include/portable.h 3 Oct 2006 20:43:40 -0000 5.15 -+++ directory/c-sdk/ldap/include/portable.h 6 Oct 2010 19:06:58 -0000 +--- ldap/sdks/c-sdk/ldap/include/portable.h 3 Oct 2006 20:43:40 -0000 5.15 ++++ ldap/sdks/c-sdk/ldap/include/portable.h 6 Oct 2010 19:06:58 -0000 @@ -117,17 +117,17 @@ #else #define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT ) @@ -29,8 +29,8 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/regex.h,v retrieving revision 5.2 diff -u -8 -p -r5.2 regex.h ---- directory/c-sdk/ldap/include/regex.h 15 Oct 2003 17:26:00 -0000 5.2 -+++ directory/c-sdk/ldap/include/regex.h 6 Oct 2010 19:06:59 -0000 +--- ldap/sdks/c-sdk/ldap/include/regex.h 15 Oct 2003 17:26:00 -0000 5.2 ++++ ldap/sdks/c-sdk/ldap/include/regex.h 6 Oct 2010 19:06:59 -0000 @@ -68,18 +68,18 @@ extern "C" { #define LDAP_CALL #endif @@ -57,8 +57,8 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c,v retrieving revision 5.2 diff -u -8 -p -r5.2 regex.c ---- directory/c-sdk/ldap/libraries/libldap/regex.c 15 Oct 2003 17:26:03 -0000 5.2 -+++ directory/c-sdk/ldap/libraries/libldap/regex.c 6 Oct 2010 19:06:59 -0000 +--- ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 15 Oct 2003 17:26:03 -0000 5.2 ++++ ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 6 Oct 2010 19:06:59 -0000 @@ -262,17 +262,17 @@ chset(REGEXCHAR c) bittab[((c) & (unsigned)BLKIND) >> 3] |= bitarr[(c) & BITIND]; } Added: branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-623277 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-623277 Thu Jan 20 14:57:27 2011 (r485) @@ -0,0 +1,89 @@ +# vim: se ft=diff : +# HG changeset patch +# Parent 86285f568e0ce0c6bfd4158cb02703e909a6190b +# User Cameron Kaiser <spectre> +# Date 2011-01-08 22:42 +Bug 623277 - Failed to build with --disable-methodjit [r=dmandelin] + +diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp +--- mozilla/js/src/jsdbgapi.cpp ++++ mozilla/js/src/jsdbgapi.cpp +@@ -111,37 +111,37 @@ IsScriptLive(JSContext *cx, JSScript *sc + #endif + + JS_PUBLIC_API(void) + JS_SetRuntimeDebugMode(JSRuntime *rt, JSBool debug) + { + rt->debugMode = debug; + } + ++#ifdef JS_METHODJIT + static void + PurgeCallICs(JSContext *cx, JSScript *start) + { +-#ifdef JS_METHODJIT + for (JSScript *script = start; + &script->links != &cx->compartment->scripts; + script = (JSScript *)script->links.next) + { + // Debug mode does not use call ICs. + if (script->debugMode) + continue; + + JS_ASSERT(!IsScriptLive(cx, script)); + + if (script->jitNormal) + script->jitNormal->nukeScriptDependentICs(); + if (script->jitCtor) + script->jitCtor->nukeScriptDependentICs(); + } ++} + #endif +-} + + JS_FRIEND_API(JSBool) + js_SetDebugMode(JSContext *cx, JSBool debug) + { + cx->compartment->debugMode = debug; + #ifdef JS_METHODJIT + for (JSScript *script = (JSScript *)cx->compartment->scripts.next; + &script->links != &cx->compartment->scripts; +diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h +--- mozilla/js/src/jsinterpinlines.h ++++ mozilla/js/src/jsinterpinlines.h +@@ -581,17 +581,21 @@ InvokeSessionGuard::invoke(JSContext *cx + { + /* N.B. Must be kept in sync with Invoke */ + + /* Refer to canonical (callee, this) for optimized() sessions. */ + formals_[-2] = savedCallee_; + formals_[-1] = savedThis_; + + void *code; ++#ifdef JS_METHODJIT + if (!optimized() || !(code = script_->getJIT(false /* !constructing */)->invokeEntry)) ++#else ++ if (!optimized()) ++#endif + return Invoke(cx, args_, 0); + + /* Clear any garbage left from the last Invoke. */ + JSStackFrame *fp = frame_.fp(); + fp->clearMissingArgs(); + fp->resetInvokeCallFrame(); + SetValueRangeToUndefined(fp->slots(), script_->nfixed); + +--- mozilla/js/src/shell/js.cpp.orig 2011-01-14 23:22:08.000000000 +0100 ++++ mozilla/js/src/shell/js.cpp 2011-01-15 15:10:44.000000000 +0100 +@@ -4249,7 +4249,11 @@ + JSBool + MJitStats(JSContext *cx, uintN argc, jsval *vp) + { ++#ifdef JS_METHODJIT + JS_SET_RVAL(cx, vp, INT_TO_JSVAL(cx->runtime->mjitMemoryUsed)); ++#else ++ JS_SET_RVAL(cx, vp, JSVAL_VOID); ++#endif + return true; + } + Deleted: branches/experimental/mail/thunderbird-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in Thu Jan 20 14:57:27 2011 (r484) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 -+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 -@@ -254,6 +254,10 @@ - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+endif -+ - ifeq ($(OS_ARCH), NetBSD) - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) - endif Deleted: branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in Thu Jan 20 14:57:27 2011 (r484) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 -+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 -@@ -147,6 +147,11 @@ - CUSTOM_LIBS=1 - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+CUSTOM_LIBS=1 -+endif -+ - # no extra libs on HP-UX - ifeq ($(OS_ARCH), HP-UX) - CUSTOM_LIBS=1 Deleted: branches/experimental/mail/thunderbird-devel/files/patch-directory_xpcom_base_src_Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-directory_xpcom_base_src_Makefile.in Thu Jan 20 14:57:27 2011 (r484) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- directory/xpcom/base/src/Makefile.in.orig 2009-11-22 03:44:31.000000000 +0100 -+++ directory/xpcom/base/src/Makefile.in 2009-11-26 13:06:53.000000000 +0100 -@@ -97,6 +97,10 @@ - $(NULL) - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+endif -+ - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) - - include $(topsrcdir)/config/rules.mk Copied and modified: branches/experimental/mail/thunderbird-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in (from r480, branches/experimental/mail/thunderbird-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in) ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in Mon Jan 3 12:37:05 2011 (r480, copy source) +++ branches/experimental/mail/thunderbird-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in Thu Jan 20 14:57:27 2011 (r485) @@ -1,5 +1,5 @@ ---- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 -+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 +--- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 @@ -254,6 +254,10 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe endif Copied and modified: branches/experimental/mail/thunderbird-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in (from r480, branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in) ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in Mon Jan 3 12:37:05 2011 (r480, copy source) +++ branches/experimental/mail/thunderbird-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in Thu Jan 20 14:57:27 2011 (r485) @@ -1,5 +1,5 @@ ---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 -+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 +--- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 ++++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 @@ -147,6 +147,11 @@ CUSTOM_LIBS=1 endif Added: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-Makefile.in Thu Jan 20 14:57:27 2011 (r485) @@ -0,0 +1,14 @@ +--- mozilla/gfx/thebes/Makefile.in.orig 2011-01-16 00:34:11.000000000 +0100 ++++ mozilla/gfx/thebes/Makefile.in 2011-01-16 00:35:50.000000000 +0100 +@@ -212,6 +212,11 @@ + + endif + ++ifeq ($(OS_TEST),amd64) ++ CPPSRCS += gfxAlphaRecoverySSE2.cpp ++ SSE2_FLAGS=-msse2 ++endif ++ + ifdef MOZ_IPC + CPPSRCS += \ + gfxSharedImageSurface.cpp \ Added: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp Thu Jan 20 14:57:27 2011 (r485) @@ -0,0 +1,32 @@ +diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp +--- mozilla/gfx/thebes/gfxASurface.cpp ++++ mozilla/gfx/thebes/gfxASurface.cpp +@@ -222,7 +222,9 @@ gfxASurface::Init(cairo_surface_t* surfa + } 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 + } + } +@@ -438,6 +440,8 @@ gfxASurface::SetSubpixelAntialiasingEnab + if (!mSurfaceValid) + return; ++#ifdef MOZ_TREE_CAIRO + cairo_surface_set_subpixel_antialiasing(mSurface, + aEnabled ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED); ++#endif + } + +@@ -447,5 +451,9 @@ gfxASurface::GetSubpixelAntialiasingEnab + if (!mSurfaceValid) + return PR_FALSE; ++#ifdef MOZ_TREE_CAIRO + return cairo_surface_get_subpixel_antialiasing(mSurface) == CAIRO_SUBPIXEL_ANTIALIASING_ENABLED; ++#else ++ return PR_FALSE; ++#endif + } + Added: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp Thu Jan 20 14:57:27 2011 (r485) @@ -0,0 +1,36 @@ +diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp +--- mozilla/gfx/thebes/gfxTeeSurface.cpp ++++ mozilla/gfx/thebes/gfxTeeSurface.cpp +@@ -47,4 +47,5 @@ gfxTeeSurface::gfxTeeSurface(cairo_surfa + gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount) + { ++#ifdef MOZ_TREE_CAIRO + NS_ASSERTION(aSurfaceCount > 0, "Must have a least one surface"); + cairo_surface_t *csurf = cairo_tee_surface_create(aSurfaces[0]->CairoSurface()); +@@ -54,4 +55,5 @@ gfxTeeSurface::gfxTeeSurface(gfxASurface + cairo_tee_surface_add(csurf, aSurfaces[i]->CairoSurface()); + } ++#endif + } + +@@ -59,6 +61,8 @@ const gfxIntSize + gfxTeeSurface::GetSize() const + { ++#ifdef MOZ_TREE_CAIRO + nsRefPtr<gfxASurface> master = Wrap(cairo_tee_surface_index(mSurface, 0)); + return master->GetSize(); ++#endif + } + +@@ -66,4 +70,5 @@ void + gfxTeeSurface::GetSurfaces(nsTArray<nsRefPtr<gfxASurface> >* aSurfaces) + { ++#ifdef MOZ_TREE_CAIRO + for (PRInt32 i = 0; ; ++i) { + cairo_surface_t *csurf = cairo_tee_surface_index(mSurface, i); +@@ -75,3 +80,4 @@ gfxTeeSurface::GetSurfaces(nsTArray<nsRe + *elem = Wrap(csurf); + } ++#endif + } + Added: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-ycbcr-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-ycbcr-Makefile.in Thu Jan 20 14:57:27 2011 (r485) @@ -0,0 +1,14 @@ +--- mozilla/gfx/ycbcr/Makefile.in.orig 2011-01-17 12:02:28.000000000 +0100 ++++ mozilla/gfx/ycbcr/Makefile.in 2011-01-17 12:06:41.000000000 +0100 +@@ -41,6 +41,11 @@ + + endif + ++ifeq ($(OS_TEST),amd64) ++ CPPSRCS += yuv_convert_mmx.cpp \ ++ yuv_convert_sse2.cpp ++ SSE2_FLAGS=-msse2 ++endif + + ifdef _MSC_VER + CPPSRCS += yuv_row_win.cpp \ Added: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-intl-uconv-src-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-intl-uconv-src-Makefile.in Thu Jan 20 14:57:27 2011 (r485) @@ -0,0 +1,14 @@ +--- mozilla/intl/uconv/src/Makefile.in.orig 2011-01-17 12:42:48.000000000 +0100 ++++ mozilla/intl/uconv/src/Makefile.in 2011-01-17 12:43:59.000000000 +0100 +@@ -93,6 +93,11 @@ + endif + endif + ++ifeq ($(OS_TEST),amd64) ++ CPPSRCS += nsUTF8ToUnicodeSSE2.cpp ++ SSE2_FLAGS=-msse2 ++endif ++ + ifeq ($(MOZ_WIDGET_TOOLKIT),os2) + CPPSRCS += nsOS2Charset.cpp + else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101201457.p0KEvSUl035430>