From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 25 12:14:02 2010 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 057D8106566B for ; Thu, 25 Nov 2010 12:14:02 +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 7AC638FC0A for ; Thu, 25 Nov 2010 12:14:01 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id oAPCDx9v061759 for ; Thu, 25 Nov 2010 12:13:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id oAPCDsb6059741 for freebsd-gecko@freebsd.org; Thu, 25 Nov 2010 12:13:54 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 25 Nov 2010 12:13:54 GMT Message-Id: <201011251213.oAPCDsb6059741@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] r440 - in branches/experimental/mail/thunderbird-devel: . 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: Thu, 25 Nov 2010 12:14:02 -0000 Author: beat Date: Thu Nov 25 12:13:53 2010 New Revision: 440 Log: - Add Thunderbird 3.3 Alpha 1 as mail/thunderbird-devel. This port doesn't link at the moment but It looks like I don't have enough time this week to take a look at the problem. So I just commit this version maybe someone like to volunteer ;) Added: branches/experimental/mail/thunderbird-devel/ - copied from r432, branches/experimental/mail/thunderbird/ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-qcms-qcmstypes.h Deleted: branches/experimental/mail/thunderbird-devel/files/liboggplay_oss branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-jslock.cpp branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h branches/experimental/mail/thunderbird-devel/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp branches/experimental/mail/thunderbird-devel/files/releng6_pulseaudio Modified: branches/experimental/mail/thunderbird-devel/Makefile branches/experimental/mail/thunderbird-devel/distinfo branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in Modified: branches/experimental/mail/thunderbird-devel/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Mon Nov 8 14:27:48 2010 (r432) +++ branches/experimental/mail/thunderbird-devel/Makefile Thu Nov 25 12:13:53 2010 (r440) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 3.1.6 +DISTVERSION= 3.3a1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -18,8 +18,9 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr USE_AUTOTOOLS= autoconf:213 +LATEST_LINK= thunderbird33 USE_GECKO= gecko -CONFLICTS= thunderbird-3.0* +CONFLICTS= thunderbird-3.0* thunderbird-3.1* USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 @@ -31,6 +32,7 @@ HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes +USE_GL= gl MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data MOZ_GRAPHICS= default,-xbm @@ -53,16 +55,9 @@ .include -WRKSRC= ${WRKDIR}/comm-1.9.2 +WRKSRC= ${WRKDIR}/comm-central MOZSRC:= ${WRKSRC}/mozilla -.if ${OSVERSION} < 700000 -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio -.else -EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss -.endif - GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} .if ${HAVE_GNOME:Mlibgnomeui}!="" Modified: branches/experimental/mail/thunderbird-devel/distinfo ============================================================================== --- branches/experimental/mail/thunderbird/distinfo Mon Nov 8 14:27:48 2010 (r432) +++ branches/experimental/mail/thunderbird-devel/distinfo Thu Nov 25 12:13:53 2010 (r440) @@ -1,3 +1,2 @@ -MD5 (thunderbird-3.1.6.source.tar.bz2) = d126a68e6610d8e3675909e0ba606b42 -SHA256 (thunderbird-3.1.6.source.tar.bz2) = 9a27e3acfe14a0f17d2197d75192a005930347d89a88917c468096e527019ef8 -SIZE (thunderbird-3.1.6.source.tar.bz2) = 65850094 +SHA256 (thunderbird-3.3a1.source.tar.bz2) = 07c3f3dfdea3df9b9032480f8d5f962bd5cdbd853fec7a0b6949d21ad3155988 +SIZE (thunderbird-3.3a1.source.tar.bz2) = 78212096 Deleted: branches/experimental/mail/thunderbird/files/liboggplay_oss ============================================================================== --- branches/experimental/mail/thunderbird/files/liboggplay_oss Thu Nov 25 12:13:53 2010 (r432) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ Added: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-qcms-qcmstypes.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-qcms-qcmstypes.h Thu Nov 25 12:13:53 2010 (r440) @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100 ++++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100 +@@ -25,7 +25,7 @@ + #ifdef __OS2__ + /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ + #include +-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED) ++#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED) + typedef PRUptrdiff uintptr_t; + #endif + #endif Modified: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-configure.in Mon Nov 8 14:27:48 2010 (r432) +++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in Thu Nov 25 12:13:53 2010 (r440) @@ -1,6 +1,6 @@ ---- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200 -+++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200 -@@ -1218,7 +1218,7 @@ +--- mozilla/js/src/configure.in.orig 2010-11-17 00:06:38.000000000 +0100 ++++ mozilla/js/src/configure.in 2010-11-17 15:53:01.000000000 +0100 +@@ -1287,7 +1287,7 @@ CPU_ARCH=sparc ;; @@ -8,15 +8,16 @@ +amd64 | x86_64 | ia64) CPU_ARCH="$OS_TEST" ;; - esac -@@ -2466,10 +2466,6 @@ - ENABLE_JIT=1 - NANOJIT_ARCH=ARM + +@@ -2637,11 +2637,6 @@ + AC_DEFINE(JS_CPU_ARM) + AC_DEFINE(JS_NUNBOX32) ;; -sparc*-*) -- ENABLE_JIT=1 +- ENABLE_TRACEJIT=1 - NANOJIT_ARCH=Sparc +- AC_DEFINE(JS_CPU_SPARC) - ;; esac - MOZ_ARG_DISABLE_BOOL(jit, + MOZ_ARG_DISABLE_BOOL(methodjit, Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-jslock.cpp ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-jslock.cpp Thu Nov 25 12:13:53 2010 (r432) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,18 +0,0 @@ ---- mozilla/js/src/jslock.cpp.orig 2010-01-23 20:35:45.000000000 +0100 -+++ mozilla/js/src/jslock.cpp 2010-01-23 20:37:35.000000000 +0100 -@@ -160,8 +160,13 @@ - unsigned int res; - - __asm__ __volatile__ ( -- "stbar\n" -- "cas [%1],%2,%3\n" -+ "membar #StoreLoad | #LoadLoad\n" -+# if defined (__sparc64__) -+ "casx [%1],%2,%3\n" -+# else -+ "cas [%1],%2,%3\n" /* 32-bit version */ -+# endif -+ "membar #StoreLoad | #LoadLoad\n" - "cmp %2,%3\n" - "be,a 1f\n" - "mov 1,%0\n" Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h Thu Nov 25 12:13:53 2010 (r432) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2010-09-06 11:33:54.000000000 +0200 -+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h 2010-09-06 11:34:16.000000000 +0200 -@@ -59,7 +59,7 @@ - - #include - --#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) -+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined (__FreeBSD__) - typedef off_t oggz_off_t; - #else - typedef loff_t oggz_off_t; Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp Thu Nov 25 12:13:53 2010 (r432) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,23 +0,0 @@ ---- mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig -+++ mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp -@@ -629,16 +629,17 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile) - NS_ASSERTION(count, "broken search path! bad count"); - for(PRUint32 i = 0; i < count; i++) - { -- nsCOMPtr current; -+ nsCOMPtr current, normalized; - aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), - getter_AddRefs(current)); - NS_ASSERTION(current, "broken search path! bad element"); - // nsIFile::Equals basically compares path strings so normalize - // before the comparison. - parent->Normalize(); -- current->Normalize(); -+ current->Clone(getter_AddRefs(normalized)); -+ normalized->Normalize(); - PRBool same; -- if (NS_SUCCEEDED(parent->Equals(current, &same)) && same) -+ if (NS_SUCCEEDED(parent->Equals(normalized, &same)) && same) - return (int) i; - } - } Deleted: branches/experimental/mail/thunderbird/files/releng6_pulseaudio ============================================================================== --- branches/experimental/mail/thunderbird/files/releng6_pulseaudio Thu Nov 25 12:13:53 2010 (r432) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,66 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2009-08-20 21:43:41.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-08-20 21:44:17.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 2010-01-19 20:28:10.000000000 +0000 -+++ mozilla/toolkit/library/Makefile.in 2010-01-25 09:38:40.000000000 +0000 -@@ -235,12 +235,12 @@ - endif - - ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc - 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 -lc - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - ---- mozilla/js/src/Makefile.in.orig 2009-08-21 00:34:43.000000000 +0200 -+++ mozilla/js/src/Makefile.in 2009-08-21 00:36:59.000000000 +0200 -@@ -427,7 +427,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lpulse -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 ---- config/rules.mk.orig 2009-08-22 15:30:16.000000000 +0200 -+++ config/rules.mk 2009-08-22 15:30:46.000000000 +0200 -@@ -583,6 +583,7 @@ - ifdef IS_COMPONENT - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic - endif -+EXTRA_LIBS += -pthread -lpulse -lc - endif - - ifeq ($(OS_ARCH),NetBSD) ---- mozilla/layout/build/Makefile.in.orig 2009-08-22 01:00:21.000000000 +0200 -+++ mozilla/layout/build/Makefile.in 2009-08-22 01:00:57.000000000 +0200 -@@ -269,6 +269,10 @@ - endif - endif - -+ifeq ($(OS_ARCH),FreeBSD) -+EXTRA_LIBS += -lpulse -+endif -+ - include $(topsrcdir)/config/rules.mk - - LOCAL_INCLUDES += -I$(srcdir)/../base \