From owner-freebsd-gecko@FreeBSD.ORG Fri Apr 20 15:18:31 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A302F106564A for ; Fri, 20 Apr 2012 15:18:31 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 41B618FC0A for ; Fri, 20 Apr 2012 15:18:31 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q3KFIOUH001875 for ; Fri, 20 Apr 2012 15:18:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q3KFIJGL099899 for freebsd-gecko@freebsd.org; Fri, 20 Apr 2012 15:18:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 20 Apr 2012 15:18:19 GMT Message-Id: <201204201518.q3KFIJGL099899@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r712 - in branches/experimental/www/seamonkey-beta: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2012 15:18:31 -0000 Author: beat Date: Fri Apr 20 15:18:18 2012 New Revision: 712 Log: - Update to 2.9b3 Added: branches/experimental/www/seamonkey-beta/files/extra-patch-configure.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp (contents, props changed) Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp Modified: branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey-beta/distinfo branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Thu Apr 19 14:42:42 2012 (r711) +++ branches/experimental/www/seamonkey-beta/Makefile Fri Apr 20 15:18:18 2012 (r712) @@ -2,11 +2,11 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey/Makefile,v 1.319 2011/12/23 16:58:05 beat Exp $ +# $FreeBSD: ports/www/seamonkey/Makefile,v 1.323 2012/03/14 15:50:04 beat Exp $ # PORTNAME= seamonkey -DISTVERSION= 2.7 +DISTVERSION= 2.9b3 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -84,7 +84,8 @@ .endif .if defined(WITHOUT_MAILNEWS) -EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk +EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ + ${FILESDIR}/extra-patch-configure.in MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP Modified: branches/experimental/www/seamonkey-beta/distinfo ============================================================================== --- branches/experimental/www/seamonkey-beta/distinfo Thu Apr 19 14:42:42 2012 (r711) +++ branches/experimental/www/seamonkey-beta/distinfo Fri Apr 20 15:18:18 2012 (r712) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.7.source.tar.bz2) = 695c3e4767262fac35bcf80f71dcbdfbc1172cdd323338ea530f6680283aea2f -SIZE (seamonkey-2.7.source.tar.bz2) = 98045633 +SHA256 (seamonkey-2.9b3.source.tar.bz2) = 8532d8deeadd6ac6894a0828fbfdfb456b04c08cd1ce6baeaf6d05137023d900 +SIZE (seamonkey-2.9b3.source.tar.bz2) = 102211948 Modified: branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk ============================================================================== --- branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk Thu Apr 19 14:42:42 2012 (r711) +++ branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk Fri Apr 20 15:18:18 2012 (r712) @@ -1,6 +1,6 @@ ---- bridge/bridge.mk.orig 2011-09-29 01:10:49.000000000 +0200 -+++ bridge/bridge.mk 2011-10-26 22:21:47.000000000 +0200 -@@ -38,16 +38,16 @@ +--- bridge/bridge.mk.orig 2012-03-13 06:23:10.000000000 +0100 ++++ bridge/bridge.mk 2012-03-14 12:28:03.000000000 +0100 +@@ -38,17 +38,19 @@ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete @@ -10,13 +10,15 @@ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom -#endif +endif - + #ifdef MOZ_MORK APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork #endif - --ifdef MOZ_MAIL_NEWS + +ifdef disabled APP_LIBXUL_DIRS += \ $(DEPTH)$(SUBDIR)/mailnews/base \ $(DEPTH)$(SUBDIR)/mailnews/mime/public \ + $(DEPTH)$(SUBDIR)/mailnews \ + $(NULL) ++endif Added: branches/experimental/www/seamonkey-beta/files/extra-patch-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/extra-patch-configure.in Fri Apr 20 15:18:18 2012 (r712) @@ -0,0 +1,14 @@ +--- configure.in.orig 2012-03-14 14:18:03.000000000 +0100 ++++ configure.in 2012-03-14 14:18:25.000000000 +0100 +@@ -837,11 +837,6 @@ + AC_PROG_CPP + AC_PROG_CXXCPP + +-MAIL_COMPONENT="mail msgsmime import" +-export MAIL_COMPONENT +-MAIL_MODULE="MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule)" +-export MAIL_MODULE +- + if test -n "$_WIN32_MSVC"; then + SKIP_PATH_CHECKS=1 + SKIP_COMPILER_CHECKS=1 Modified: branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in Thu Apr 19 14:42:42 2012 (r711) +++ branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in Fri Apr 20 15:18:18 2012 (r712) @@ -1,6 +1,6 @@ ---- ldap/xpcom/src/Makefile.in.orig 2009-11-22 03:44:31.000000000 +0100 -+++ ldap/xpcom/src/Makefile.in 2009-11-26 13:06:53.000000000 +0100 -@@ -97,6 +97,10 @@ +--- ldap/xpcom/src/Makefile.in.orig 2012-03-12 10:25:35.000000000 +0100 ++++ ldap/xpcom/src/Makefile.in 2012-03-12 10:26:09.000000000 +0100 +@@ -89,6 +89,10 @@ $(NULL) endif @@ -8,6 +8,6 @@ +EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread +endif + - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) - - include $(topsrcdir)/config/rules.mk + EXTRA_DSO_LDOPTS += $(LDAP_LIBS) + ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp Fri Apr 20 15:18:18 2012 (r712) @@ -0,0 +1,34 @@ +--- mozilla/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000 ++++ mozilla/gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000 +@@ -446,6 +446,7 @@ + static_cast(srcBuffer)->Release(); + } + ++#ifdef MOZ_TREE_CAIRO + void SourceSnapshotDetached(cairo_surface_t *nullSurf) + { + gfxImageSurface* origSurf = +@@ -453,6 +454,7 @@ + + origSurf->SetData(&kSourceSurface, NULL, NULL); + } ++#endif + + RefPtr + gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) +@@ -522,6 +524,7 @@ + imgSurface->Stride(), + format); + ++ #ifdef MOZ_TREE_CAIRO + cairo_surface_t *nullSurf = + cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); + cairo_surface_set_user_data(nullSurf, +@@ -530,6 +533,7 @@ + NULL); + cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); + cairo_surface_destroy(nullSurf); ++ #endif + } + + srcBuffer->AddRef(); Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp Fri Apr 20 15:18:18 2012 (r711) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,36 +0,0 @@ -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 master = Wrap(cairo_tee_surface_index(mSurface, 0)); - return master->GetSize(); -+#endif - } - -@@ -66,4 +70,5 @@ void - gfxTeeSurface::GetSurfaces(nsTArray >* 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