Date: Fri, 18 Feb 2011 23:27:04 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r493 - in branches/experimental/www/seamonkey2-devel: . files Message-ID: <201102182327.p1INR409095972@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Fri Feb 18 23:27:03 2011 New Revision: 493 Log: - Update to 2.1 Beta 2 - Remove JAVASCRIPT_DEBUGGER as SeaMonkey no longer builds with JavaScript debugger disabled - Add two patches from Gentoo to fix build with system-cairo [1] Please note: To build SeaMonkey 2.1b2 you need NSPR 4.8.7 and NSS 3.12.9 from the experimental branch. Obtained from: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2d558e6491a0fdcf8e864ffebf38 6b9ca8e6c792 [1] Added: branches/experimental/www/seamonkey2-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in - copied, changed from r489, branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in branches/experimental/www/seamonkey2-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in - copied, changed from r489, branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in branches/experimental/www/seamonkey2-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in - copied, changed from r489, branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in branches/experimental/www/seamonkey2-devel/files/patch-ldap-xpcom-src-Makefile.in - copied, changed from r489, branches/experimental/www/seamonkey2-devel/files/patch-directory-xpcom-base-src-Makefile.in branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp Deleted: branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in branches/experimental/www/seamonkey2-devel/files/patch-directory-xpcom-base-src-Makefile.in Modified: branches/experimental/www/seamonkey2-devel/Makefile branches/experimental/www/seamonkey2-devel/distinfo branches/experimental/www/seamonkey2-devel/files/patch-bugzilla-449453 branches/experimental/www/seamonkey2-devel/files/patch-sysnss Modified: branches/experimental/www/seamonkey2-devel/Makefile ============================================================================== --- branches/experimental/www/seamonkey2-devel/Makefile Fri Feb 18 23:14:26 2011 (r492) +++ branches/experimental/www/seamonkey2-devel/Makefile Fri Feb 18 23:27:03 2011 (r493) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.1b1 +DISTVERSION= 2.1b2 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -58,7 +58,6 @@ LDAP "Enable LDAP support for Mailnews" on \ CHATZILLA "Enable the Chatzilla IRC module" on \ DBUS "Enable D-BUS support" on \ - JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \ SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> @@ -96,13 +95,6 @@ .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif -.if defined(WITH_JAVASCRIPT_DEBUGGER) -MOZ_OPTIONS+= --enable-jsd \ - --enable-dtd-debug -.else -MOZ_OPTIONS+= --disable-jsd \ - --disable-dtd-debug -.endif .if defined(WITHOUT_COMPOSER) MOZ_OPTIONS+= --disable-composer Modified: branches/experimental/www/seamonkey2-devel/distinfo ============================================================================== --- branches/experimental/www/seamonkey2-devel/distinfo Fri Feb 18 23:14:26 2011 (r492) +++ branches/experimental/www/seamonkey2-devel/distinfo Fri Feb 18 23:27:03 2011 (r493) @@ -1,3 +1,2 @@ -MD5 (seamonkey-2.1b1.source.tar.bz2) = 6b061557dd2744d8a28c880ddf374b90 -SHA256 (seamonkey-2.1b1.source.tar.bz2) = 0fa74bbd1f5eba6495e3e3373e5cec419d721e21c7e71bbb92a367eb98212df4 -SIZE (seamonkey-2.1b1.source.tar.bz2) = 78582261 +SHA256 (seamonkey-2.1b2.source.tar.bz2) = 9f9e59303b1d39dc97aa943f49018a572d41b5e566c66e176f1f012e2e9d898a +SIZE (seamonkey-2.1b2.source.tar.bz2) = 83425193 Modified: branches/experimental/www/seamonkey2-devel/files/patch-bugzilla-449453 ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-bugzilla-449453 Fri Feb 18 23:14:26 2011 (r492) +++ branches/experimental/www/seamonkey2-devel/files/patch-bugzilla-449453 Fri Feb 18 23:27:03 2011 (r493) @@ -1,10 +1,10 @@ -Index: mozilla/directory/c-sdk/ldap/include/portable.h +Index: ldap/sdks/c-sdk/ldap/include/portable.h =================================================================== 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 ) @@ -24,13 +24,13 @@ * many systems do not have the setpwfile() library routine... we just * enable use for those systems we know have it. */ -Index: mozilla/directory/c-sdk/ldap/include/regex.h +Index: ldap/sdks/c-sdk/ldap/include/regex.h =================================================================== 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 @@ -52,41 +52,13 @@ int re_unlock(); char * LDAP_CALL re_comp(); int LDAP_CALL re_exec(); -Index: mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in,v -retrieving revision 5.25 -diff -u -8 -p -r5.25 Makefile.in ---- directory/c-sdk/ldap/libraries/libldap/Makefile.in 24 Dec 2008 09:39:55 -0000 5.25 -+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in 6 Oct 2010 19:06:59 -0000 -@@ -249,16 +249,20 @@ ifeq ($(OS_ARCH), OpenVMS) - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) - SHARED_LIBRARY_LIBS = $(dist_libdir)/lib$(LBER_LIBNAME).a - endif - - ifeq ($(OS_ARCH), BeOS) - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -+endif -+ - ifeq ($(OS_ARCH), NetBSD) - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) - endif - - ifeq ($(OS_ARCH), OpenBSD) - EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread - endif - -Index: mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c +Index: ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c =================================================================== 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]; } Deleted: branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in Fri Feb 18 23:27:03 2011 (r492) +++ /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/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in Fri Feb 18 23:27:03 2011 (r492) +++ /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-01 10:18:43.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/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in Fri Feb 18 23:27:03 2011 (r492) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ ---- directory/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200 -+++ directory/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200 -@@ -42,7 +42,7 @@ - NSPR_LIBS = @NSPR_LIBS@ - NSPR_CFLAGS = @NSPR_CFLAGS@ - NSS_LIBS = @NSS_LIBS@ --NSS_CFLAGS = @NSS_CFLAGS@ -+NSS_CFLAGS = @NSS_CFLAGS@ -I/usr/local/include/nss/nss - - include $(MOD_DEPTH)/config/autoconf.mk - include $(topsrcdir)/build.mk -@@ -180,6 +180,10 @@ - CUSTOM_LIBS=1 - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+CUSTOM_LIBS=1 -+endif -+ - ifndef CUSTOM_LIBS - EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME) - EXTRA_LIBS += $(NSSLINK) Deleted: branches/experimental/www/seamonkey2-devel/files/patch-directory-xpcom-base-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-directory-xpcom-base-src-Makefile.in Fri Feb 18 23:27:03 2011 (r492) +++ /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/www/seamonkey2-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in (from r489, branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in) ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in Wed Feb 2 08:45:15 2011 (r489, copy source) +++ branches/experimental/www/seamonkey2-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in Fri Feb 18 23:27:03 2011 (r493) @@ -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/www/seamonkey2-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in (from r489, branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in) ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in Wed Feb 2 08:45:15 2011 (r489, copy source) +++ branches/experimental/www/seamonkey2-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in Fri Feb 18 23:27:03 2011 (r493) @@ -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-01 10:18:43.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-01 10:18:43.000000000 +0100 @@ -147,6 +147,11 @@ CUSTOM_LIBS=1 endif Copied and modified: branches/experimental/www/seamonkey2-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in (from r489, branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in) ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-directory-c-sdk-ldap-libraries-libssldap-Makefile.in Wed Feb 2 08:45:15 2011 (r489, copy source) +++ branches/experimental/www/seamonkey2-devel/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Fri Feb 18 23:27:03 2011 (r493) @@ -1,5 +1,5 @@ ---- directory/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200 -+++ directory/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200 +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200 ++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200 @@ -42,7 +42,7 @@ NSPR_LIBS = @NSPR_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ Copied and modified: branches/experimental/www/seamonkey2-devel/files/patch-ldap-xpcom-src-Makefile.in (from r489, branches/experimental/www/seamonkey2-devel/files/patch-directory-xpcom-base-src-Makefile.in) ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-directory-xpcom-base-src-Makefile.in Wed Feb 2 08:45:15 2011 (r489, copy source) +++ branches/experimental/www/seamonkey2-devel/files/patch-ldap-xpcom-src-Makefile.in Fri Feb 18 23:27:03 2011 (r493) @@ -1,5 +1,5 @@ ---- 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 +--- 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 @@ $(NULL) endif Added: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp Fri Feb 18 23:27:03 2011 (r493) @@ -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/www/seamonkey2-devel/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp Fri Feb 18 23:27:03 2011 (r493) @@ -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 + } + Modified: branches/experimental/www/seamonkey2-devel/files/patch-sysnss ============================================================================== --- branches/experimental/www/seamonkey2-devel/files/patch-sysnss Fri Feb 18 23:14:26 2011 (r492) +++ branches/experimental/www/seamonkey2-devel/files/patch-sysnss Fri Feb 18 23:27:03 2011 (r493) @@ -1,6 +1,6 @@ ---- mozilla/security/manager/Makefile.in.orig 2010-05-11 01:56:21.000000000 +0000 -+++ mozilla/security/manager/Makefile.in 2010-05-11 18:03:40.000000000 +0000 -@@ -47,16 +47,8 @@ +--- mozilla/security/manager/Makefile.in.orig 2011-02-09 21:07:24.000000000 +0100 ++++ mozilla/security/manager/Makefile.in 2011-02-15 23:30:11.000000000 +0100 +@@ -49,16 +49,8 @@ MODULE = psm ifndef MOZ_NATIVE_NSS @@ -17,7 +17,31 @@ ifndef NSS_DISABLE_DBM NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk -@@ -322,73 +314,8 @@ +@@ -68,23 +60,6 @@ + endif + + ifndef MOZ_NATIVE_NSS +-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH))) +-SDK_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ +- $(NULL) +-else +-SDK_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \ +- $(NULL) +-endif + endif + + # Default +@@ -339,74 +314,8 @@ libs:: ifndef MOZ_NATIVE_NSS @@ -30,6 +54,7 @@ - $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) - $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) - $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/modutil $(DEFAULT_GMAKE_FLAGS) -endif -ifndef SKIP_CHK -ifndef ENABLE_TESTS # Just avoid secondary compile @@ -92,7 +117,7 @@ $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C locales $@ -@@ -401,47 +328,6 @@ +@@ -419,47 +328,6 @@ install:: ifndef MOZ_NATIVE_NSS @@ -140,7 +165,7 @@ endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ -@@ -458,10 +344,4 @@ +@@ -476,10 +344,4 @@ $(MAKE) -C pki $@ endif ifndef MOZ_NATIVE_NSS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102182327.p1INR409095972>