Date: Fri, 20 Apr 2012 15:18:19 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r712 - in branches/experimental/www/seamonkey-beta: . files Message-ID: <201204201518.q3KFIJGL099899@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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<SourceSurface*>(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<SourceSurface>
+ 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<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/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in Thu Apr 19 14:42:42 2012 (r711)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in Fri Apr 20 15:18:18 2012 (r712)
@@ -1,15 +1,15 @@
---- mozilla/js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200
-+++ mozilla/js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200
-@@ -416,7 +416,7 @@
- # END enclude sources for V8 dtoa
- #############################################
+--- mozilla/js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100
++++ mozilla/js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100
+@@ -352,7 +352,7 @@
+ # For architectures without YARR JIT, PCRE is faster than the YARR
+ # interpreter (bug 684559).
--ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
-+ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+-ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU)))
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
-@@ -469,6 +469,9 @@
+ VPATH += $(srcdir)/yarr/pcre \
+ $(NULL)
+@@ -418,6 +418,9 @@
else
#CPPSRCS += only_on_x86.cpp
endif
@@ -19,12 +19,12 @@
endif
ifeq (arm, $(TARGET_CPU))
#CPPSRCS += only_on_arm.cpp
-@@ -793,7 +796,7 @@
+@@ -737,7 +740,7 @@
endif # WINNT
ifeq ($(OS_ARCH),FreeBSD)
-EXTRA_LIBS += -pthread
+EXTRA_LIBS += -pthread -lc
endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
+ ifeq ($(OS_ARCH),Linux)
+ EXTRA_LIBS += -ldl
Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in Thu Apr 19 14:42:42 2012 (r711)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in Fri Apr 20 15:18:18 2012 (r712)
@@ -1,14 +1,13 @@
---- mozilla/js/src/configure.in.orig 2012-01-30 11:45:12.914127778 +0100
-+++ mozilla/js/src/configure.in 2012-01-30 11:46:03.130059796 +0100
-@@ -2512,6 +2512,7 @@
+--- mozilla/js/src/configure.in.orig 2012-03-12 10:27:55.000000000 +0100
++++ mozilla/js/src/configure.in 2012-03-12 10:28:22.000000000 +0100
+@@ -2831,12 +2831,14 @@
AC_DEFINE(JS_NUNBOX32)
;;
sparc*-*)
+ if test ! "$HAVE_64BIT_OS" ; then
- ENABLE_TRACEJIT=1
- NANOJIT_ARCH=Sparc
ENABLE_METHODJIT=1
-@@ -2520,6 +2521,7 @@
+ ENABLE_MONOIC=1
+ ENABLE_POLYIC=1
ENABLE_METHODJIT_TYPED_ARRAY=1
AC_DEFINE(JS_CPU_SPARC)
AC_DEFINE(JS_NUNBOX32)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204201518.q3KFIJGL099899>