[SVN-Commit] r349 - in branches/experimental/www/seamonkey2-devel: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Mon Jul 12 13:00:03 UTC 2010 

Author: beat
Date: Mon Jul 12 12:59:55 2010
New Revision: 349

Log:
- Update to 2.1 Alpha 2

Deleted:
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-config-Makefile.in
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-embedding-base_nsEmbedAPI.cpp
   branches/experimental/www/seamonkey2-devel/files/releng6_pulseaudio
Modified:
   branches/experimental/www/seamonkey2-devel/Makefile
   branches/experimental/www/seamonkey2-devel/distinfo
   branches/experimental/www/seamonkey2-devel/files/libsydney_oss
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-ycbcr-chromium_types.h

Modified: branches/experimental/www/seamonkey2-devel/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2-devel/Makefile	Fri Jul  9 08:25:18 2010	(r348)
+++ branches/experimental/www/seamonkey2-devel/Makefile	Mon Jul 12 12:59:55 2010	(r349)
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.1a1
+DISTVERSION=	2.1a2
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	seamonkey/nightly/${DISTVERSION}-candidates/build1/source
+MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
 DISTNAME=	seamonkey-${DISTVERSION}.source
 
 MAINTAINER=	gecko at FreeBSD.org
@@ -62,10 +62,9 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
+BROKEN=		Does not build
 .else
-EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
+#EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
 .endif
 
 MOZSRC:=	${WRKDIR}/comm-central/mozilla

Modified: branches/experimental/www/seamonkey2-devel/distinfo
==============================================================================
--- branches/experimental/www/seamonkey2-devel/distinfo	Fri Jul  9 08:25:18 2010	(r348)
+++ branches/experimental/www/seamonkey2-devel/distinfo	Mon Jul 12 12:59:55 2010	(r349)
@@ -1,3 +1,3 @@
-MD5 (seamonkey-2.1a1.source.tar.bz2) = 16d87bc961e5c9153c8553fb1dc73320
-SHA256 (seamonkey-2.1a1.source.tar.bz2) = 2b702a535cf3c03345b032046fb48c191fbeade44d6f46797f43e7b52a5adaa2
-SIZE (seamonkey-2.1a1.source.tar.bz2) = 66738404
+MD5 (seamonkey-2.1a2.source.tar.bz2) = 77f09afc021691893090a9e8eeed5e75
+SHA256 (seamonkey-2.1a2.source.tar.bz2) = 974b10c8bb42bd51ef6881409573fa9404de2ca221c1cc3fa12193a8d5175907
+SIZE (seamonkey-2.1a2.source.tar.bz2) = 74670945

Modified: branches/experimental/www/seamonkey2-devel/files/libsydney_oss
==============================================================================
--- branches/experimental/www/seamonkey2-devel/files/libsydney_oss	Fri Jul  9 08:25:18 2010	(r348)
+++ branches/experimental/www/seamonkey2-devel/files/libsydney_oss	Mon Jul 12 12:59:55 2010	(r349)
@@ -1,15 +1,11 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-08-26 20:30:30.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-08-26 20:31:01.000000000 +0200
-@@ -45,6 +45,12 @@
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2010-06-10 14:24:56.000000000 +0200
++++ mozilla/media/libsydneyaudio/src/Makefile.in	2010-07-05 22:06:07.000000000 +0200
+@@ -45,7 +45,7 @@
  LIBRARY_NAME	= sydneyaudio
  FORCE_STATIC_LIB= 1
  
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS		= \
-+			sydney_audio_oss.c \
-+			$(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
+-ifneq (,$(filter DragonFly FreeBSD GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
++ifneq (,$(filter DragonFly GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
  CSRCS		= \
- 		sydney_audio_alsa.c \
+ 		sydney_audio_oss.c \
+ 		$(NULL)

Deleted: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-config-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey2-devel/files/patch-mozilla-config-Makefile.in	Mon Jul 12 12:59:55 2010	(r348)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,16 +0,0 @@
---- mozilla/config/Makefile.in
-+++ mozilla/config/Makefile.in
-@@ -139,10 +139,10 @@ GARBAGE_DIRS += system_wrappers
- endif
- 
- ifdef WRAP_STL_INCLUDES
--ifdef GCC_VERSION
--stl_compiler = gcc
--else
-+ifdef _MSC_VER
- stl_compiler = msvc
-+else
-+stl_compiler = gcc
- endif
- endif
- 

Deleted: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-embedding-base_nsEmbedAPI.cpp
==============================================================================
--- branches/experimental/www/seamonkey2-devel/files/patch-mozilla-embedding-base_nsEmbedAPI.cpp	Mon Jul 12 12:59:55 2010	(r348)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,16 +0,0 @@
---- mozilla/embedding/base/nsEmbedAPI.cpp.orig	2007-10-09 20:00:30.000000000 -0400
-+++ mozilla/embedding/base/nsEmbedAPI.cpp	2007-10-09 20:01:45.000000000 -0400
-@@ -53,7 +53,12 @@ static PRBool             sRegistryIniti
- static PRUint32           sInitCounter = 0;
- 
- #define HACK_AROUND_THREADING_ISSUES
--//#define HACK_AROUND_NONREENTRANT_INITXPCOM
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#if __FreeBSD_version < 700042
-+#define HACK_AROUND_NONREENTRANT_INITXPCOM
-+#endif
-+#endif
- 
- #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
- // XXX hack class to clean up XPCOM when this module is unloaded

Modified: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-ycbcr-chromium_types.h
==============================================================================
--- branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-ycbcr-chromium_types.h	Fri Jul  9 08:25:18 2010	(r348)
+++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-ycbcr-chromium_types.h	Mon Jul 12 12:59:55 2010	(r349)
@@ -1,9 +1,9 @@
---- mozilla/gfx/ycbcr/chromium_types.h.orig	2010-05-13 12:11:28.000000000 +0200
-+++ mozilla/gfx/ycbcr/chromium_types.h	2010-05-13 12:12:31.000000000 +0200
-@@ -64,6 +64,10 @@
- #define ARCH_CPU_PPC_FAMILY 1
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1
+--- mozilla/gfx/ycbcr/chromium_types.h.orig	2010-07-12 11:52:39.000000000 +0200
++++ mozilla/gfx/ycbcr/chromium_types.h	2010-07-12 11:53:21.000000000 +0200
+@@ -72,6 +72,10 @@
+ #define ARCH_CPU_SPARC_FAMILY 1
+ #define ARCH_CPU_SPARC 1
+ #define ARCH_CPU_64_BITS 1
 +#elif defined(__sparc64__)
 +#define ARCH_CPU_SPARC_FAMILY 1
 +#define ARCH_CPU_SPARC 1

Deleted: branches/experimental/www/seamonkey2-devel/files/releng6_pulseaudio
==============================================================================
--- branches/experimental/www/seamonkey2-devel/files/releng6_pulseaudio	Mon Jul 12 12:59:55 2010	(r348)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,55 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-08-11 17:22:08.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-08-11 17:22:36.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME	= sydneyaudio
- FORCE_STATIC_LIB= 1
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS		= \
-+		sydney_audio_pulseaudio.c \
-+		$(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS		= \
- 		sydney_audio_alsa.c \
---- mozilla/toolkit/library/Makefile.in.orig	2009-09-03 19:49:34.000000000 +0200
-+++ mozilla/toolkit/library/Makefile.in	2009-09-17 17:30:42.000000000 +0200
-@@ -228,12 +228,12 @@
- endif
- 
- ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
- 
- ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
- 
---- mozilla/layout/build/Makefile.in.orig	2009-09-17 23:07:56.000000000 +0200
-+++ mozilla/layout/build/Makefile.in	2009-09-17 23:15:53.000000000 +0200
-@@ -269,6 +269,10 @@
- endif
- endif
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+EXTRA_DSO_LDOPTS += -lpulse -lpthread
-+endif
-+
- include $(topsrcdir)/config/rules.mk
- 
- LOCAL_INCLUDES	+= -I$(srcdir)/../base \
---- mozilla/xpcom/base/nsStackWalk.cpp.orig	2009-11-30 22:47:52.000000000 +0100
-+++ mozilla/xpcom/base/nsStackWalk.cpp	2009-11-30 22:48:09.000000000 +0100
-@@ -1115,6 +1115,7 @@
- #include "nscore.h"
- #include <stdio.h>
- #include "plstr.h"
-+#include <dlfcn.h>
- 
- // On glibc 2.1, the Dl_info api defined in <dlfcn.h> is only exposed
- // if __USE_GNU is defined.  I suppose its some kind of standards

More information about the freebsd-gecko mailing list