[SVN-Commit] r619 - in branches/experimental/mail/thunderbird-beta: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Mon Aug 29 15:57:25 UTC 2011


Author: flo
Date: Mon Aug 29 15:57:18 2011
New Revision: 619

Log:
readd thunderbird-beta (7.0b1)

Added:
   branches/experimental/mail/thunderbird-beta/
      - copied from r618, branches/experimental/mail/thunderbird/
   branches/experimental/mail/thunderbird-beta/files/patch-mozilla__build__autoconf__mozconfig-find
   branches/experimental/mail/thunderbird-beta/files/patch-mozilla__content__base__public__nsContentUtils.h
   branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
Deleted:
   branches/experimental/mail/thunderbird-beta/files/patch-calendar-base-src-calDateTime.cpp
   branches/experimental/mail/thunderbird-beta/files/patch-calendar-lightning-install.rdf
   branches/experimental/mail/thunderbird-beta/files/patch-mozilla-content-xslt-public-txDouble.h
   branches/experimental/mail/thunderbird-beta/files/patch-mozilla-storage-build-Makefile.in
Modified:
   branches/experimental/mail/thunderbird-beta/Makefile
   branches/experimental/mail/thunderbird-beta/distinfo

Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Sun Aug 28 20:39:08 2011	(r618)
+++ branches/experimental/mail/thunderbird-beta/Makefile	Mon Aug 29 15:57:18 2011	(r619)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	6.0
-PORTREVISION=	2
+DISTVERSION=	7.0b1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -58,7 +57,7 @@
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-release
+WRKSRC=		${WRKDIR}/comm-beta
 MOZSRC:=	${WRKSRC}/mozilla
 
 .if ${ARCH} == powerpc64

Modified: branches/experimental/mail/thunderbird-beta/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird/distinfo	Sun Aug 28 20:39:08 2011	(r618)
+++ branches/experimental/mail/thunderbird-beta/distinfo	Mon Aug 29 15:57:18 2011	(r619)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-6.0.source.tar.bz2) = 3c56af448ebd4805c7997d8e0e41f4333d110ad2c4ad4873204bd4d68bbd8189
-SIZE (thunderbird-6.0.source.tar.bz2) = 86286245
+SHA256 (thunderbird-7.0b1.source.tar.bz2) = 5ff77da2e5972f9c86c0e1239d09df3d1e14673809dae6be9f7ad12f7ddaa9b6
+SIZE (thunderbird-7.0b1.source.tar.bz2) = 87303372

Deleted: branches/experimental/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp	Mon Aug 29 15:57:18 2011	(r618)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,8 +0,0 @@
---- calendar/base/src/calDateTime.cpp.orig	2011-08-03 20:08:23.361859978 +0200
-+++ calendar/base/src/calDateTime.cpp	2011-08-03 20:08:32.351860948 +0200
-@@ -1,4 +1,4 @@
--/* ***** BEGIN LICENSE BLOCK *****
-+/* ***** BEGIN LICENSE BLOCK *****
-  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  *
-  * The contents of this file are subject to the Mozilla Public License Version

Deleted: branches/experimental/mail/thunderbird/files/patch-calendar-lightning-install.rdf
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-calendar-lightning-install.rdf	Mon Aug 29 15:57:18 2011	(r618)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- calendar/lightning/install.rdf.orig	2011-08-18 14:35:19.000000000 +0200
-+++ calendar/lightning/install.rdf	2011-08-18 14:35:46.000000000 +0200
-@@ -12,7 +12,7 @@
-         <!-- thunderbird -->
-         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-         <em:minVersion>5.0b1</em:minVersion>
--        <em:maxVersion>5.*</em:maxVersion>
-+        <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
-       </Description>
-     </em:targetApplication>
- 

Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-content-xslt-public-txDouble.h
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-content-xslt-public-txDouble.h	Mon Aug 29 15:57:18 2011	(r618)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,20 +0,0 @@
---- mozilla/content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
-+++ mozilla/content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
- 
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
-  * Macros to workaround math-bugs bugs in various platforms
-  */

Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-storage-build-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-storage-build-Makefile.in	Mon Aug 29 15:57:18 2011	(r618)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- mozilla/storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
-+++ mozilla/storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
-@@ -77,6 +77,7 @@
- 	$(EXTRA_DSO_LIBS) \
- 	$(MOZ_COMPONENT_LIBS) \
- 	$(MOZ_JS_LIBS) \
-+	%%PTHREAD_LIBS%% \
- 	$(NULL)
- 
- include $(topsrcdir)/config/rules.mk

Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla__build__autoconf__mozconfig-find
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla__build__autoconf__mozconfig-find	Mon Aug 29 15:57:18 2011	(r619)
@@ -0,0 +1,58 @@
+--- mozilla/build/autoconf/mozconfig-find
++++ mozilla/build/autoconf/mozconfig-find
+@@ -41,16 +41,37 @@
+ #    command-line. The .mozconfig file is searched for in the 
+ #    order:
+ #       if $MOZCONFIG is set, use that.
+ #       Otherwise, use $TOPSRCDIR/.mozconfig
+ #       Otherwise, use $HOME/.mozconfig
+ #
+ topsrcdir=$1
+ 
++abspath() {
++  if uname -s | grep -q MINGW; then
++    # We have no way to figure out whether we're in gmake or pymake right
++    # now. gmake gives us Unix-style paths while pymake gives us Windows-style
++    # paths, so attempt to handle both.
++    regexes='^\([A-Za-z]:\|\\\\\|\/\) ^\/'
++  else
++    regexes='^\/'
++  fi
++
++  for regex in $regexes; do
++    if echo $1 | grep -q $regex; then
++      echo $1
++      exit 0
++    fi
++  done
++
++  # If we're at this point, we have a relative path
++  echo `pwd`/$1
++}
++
+ for _config in "$MOZCONFIG" \
+                "$MOZ_MYCONFIG"
+ do
+   if [ -n "$_config" ] && ! [ -f "$_config" ]; then
+     echo "Specified MOZCONFIG \"$_config\" does not exist!"
+     exit 1
+   fi
+ done
+@@ -61,12 +82,12 @@ for _config in "$MOZCONFIG" \
+                "$topsrcdir/mozconfig" \
+                "$topsrcdir/mozconfig.sh" \
+                "$topsrcdir/myconfig.sh" \
+                "$HOME/.mozconfig" \
+                "$HOME/.mozconfig.sh" \
+                "$HOME/.mozmyconfig.sh"
+ do
+   if test -f "$_config"; then
+-    echo "$_config";
++    echo `abspath $_config`
+     exit 0
+   fi
+ done
+
+
+
+

Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla__content__base__public__nsContentUtils.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla__content__base__public__nsContentUtils.h	Mon Aug 29 15:57:18 2011	(r619)
@@ -0,0 +1,11 @@
+--- mozilla/content/base/public/nsContentUtils.h.orig	2011-07-07 10:44:49.000000000 +0200
++++ mozilla/content/base/public/nsContentUtils.h	2011-07-07 10:46:12.000000000 +0200
+@@ -54,7 +54,7 @@
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+-#ifdef __alpha__
++#if !defined(__amd64__) && !defined(__i386__)
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+ #else
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;

Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp	Mon Aug 29 15:57:18 2011	(r619)
@@ -0,0 +1,13 @@
+--- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
++++ ./mozilla/xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
+@@ -89,6 +89,10 @@
+ nsresult
+ nsThreadManager::Init()
+ {
++#ifdef NS_TLS
++  if (!gTLSThreadID)
++    gTLSThreadID = mozilla::threads::Generic;
++#endif
+   if (!mThreadsByPRThread.Init())
+     return NS_ERROR_OUT_OF_MEMORY;
+ 


More information about the freebsd-gecko mailing list