Author: flo
Date: Fri Apr 22 21:51:29 2011
New Revision: 536
Log:
- update to 3.3a3
- merge some patches from firefox 4.0
Added:
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-Makefile.in
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-config_config.mk
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-jsnativestack.cpp
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-libvpx-vpx_config.c
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-libvpx-vpx_config.h
Deleted:
branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-623277
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp
Modified:
branches/experimental/mail/thunderbird-devel/Makefile
branches/experimental/mail/thunderbird-devel/distinfo
branches/experimental/mail/thunderbird-devel/files/patch-configure.in
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-mkdepend-Makefile.in
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-configure.in
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in
Modified: branches/experimental/mail/thunderbird-devel/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-devel/Makefile Wed Apr 20
06:55:28 2011 (r535)
+++ branches/experimental/mail/thunderbird-devel/Makefile Fri Apr 22
21:51:29 2011 (r536)
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-DISTVERSION= 3.3a2
+DISTVERSION= 3.3a3
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -42,7 +42,8 @@
--disable-updater --disable-necko-wifi
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
-MOZILLA_PLIST_DIRS= bin lib
+GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
+ lib/${MOZILLA}/include lib/${MOZILLA}/lib
MOZ_PKGCONFIG_FILES=
PORTNAME_ICON= ${PORTNAME}.png
@@ -74,6 +75,10 @@
notify.1:${PORTSDIR}/devel/libnotify
.endif
+.if ${ARCH} == amd64 || ${ARCH} == i386
+BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
+.endif
+
post-extract::
${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
<${FILESDIR}/thunderbird.desktop.in
>${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
Modified: branches/experimental/mail/thunderbird-devel/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird-devel/distinfo Wed Apr 20
06:55:28 2011 (r535)
+++ branches/experimental/mail/thunderbird-devel/distinfo Fri Apr 22
21:51:29 2011 (r536)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-3.3a2.source.tar.bz2) =
226f3406e934f82085897671d042b7c0b2b07bfe697f49086f71d8a13e646b12
-SIZE (thunderbird-3.3a2.source.tar.bz2) = 81657866
+SHA256 (thunderbird-3.3a3.source.tar.bz2) =
7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618
+SIZE (thunderbird-3.3a3.source.tar.bz2) = 83692340
Deleted:
branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-623277
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-623277
Fri Apr 22 21:51:29 2011 (r535)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,89 +0,0 @@
-# vim: se ft=diff :
-# HG changeset patch
-# Parent 86285f568e0ce0c6bfd4158cb02703e909a6190b
-# User Cameron Kaiser <spectre>
-# Date 2011-01-08 22:42
-Bug 623277 - Failed to build with --disable-methodjit [r=dmandelin]
-
-diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
---- mozilla/js/src/jsdbgapi.cpp
-+++ mozilla/js/src/jsdbgapi.cpp
-@@ -111,37 +111,37 @@ IsScriptLive(JSContext *cx, JSScript *sc
- #endif
-
- JS_PUBLIC_API(void)
- JS_SetRuntimeDebugMode(JSRuntime *rt, JSBool debug)
- {
- rt->debugMode = debug;
- }
-
-+#ifdef JS_METHODJIT
- static void
- PurgeCallICs(JSContext *cx, JSScript *start)
- {
--#ifdef JS_METHODJIT
- for (JSScript *script = start;
- &script->links != &cx->compartment->scripts;
- script = (JSScript *)script->links.next)
- {
- // Debug mode does not use call ICs.
- if (script->debugMode)
- continue;
-
- JS_ASSERT(!IsScriptLive(cx, script));
-
- if (script->jitNormal)
- script->jitNormal->nukeScriptDependentICs();
- if (script->jitCtor)
- script->jitCtor->nukeScriptDependentICs();
- }
-+}
- #endif
--}
-
- JS_FRIEND_API(JSBool)
- js_SetDebugMode(JSContext *cx, JSBool debug)
- {
- cx->compartment->debugMode = debug;
- #ifdef JS_METHODJIT
- for (JSScript *script = (JSScript *)cx->compartment->scripts.next;
- &script->links != &cx->compartment->scripts;
-diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
---- mozilla/js/src/jsinterpinlines.h
-+++ mozilla/js/src/jsinterpinlines.h
-@@ -581,17 +581,21 @@ InvokeSessionGuard::invoke(JSContext *cx
- {
- /* N.B. Must be kept in sync with Invoke */
-
- /* Refer to canonical (callee, this) for optimized() sessions. */
- formals_[-2] = savedCallee_;
- formals_[-1] = savedThis_;
-
- void *code;
-+#ifdef JS_METHODJIT
- if (!optimized() || !(code = script_->getJIT(false /* !constructing
*/)->invokeEntry))
-+#else
-+ if (!optimized())
-+#endif
- return Invoke(cx, args_, 0);
-
- /* Clear any garbage left from the last Invoke. */
- JSStackFrame *fp = frame_.fp();
- fp->clearMissingArgs();
- fp->resetInvokeCallFrame();
- SetValueRangeToUndefined(fp->slots(), script_->nfixed);
-
---- mozilla/js/src/shell/js.cpp.orig 2011-01-14 23:22:08.000000000 +0100
-+++ mozilla/js/src/shell/js.cpp 2011-01-15 15:10:44.000000000 +0100
-@@ -4249,7 +4249,11 @@
- JSBool
- MJitStats(JSContext *cx, uintN argc, jsval *vp)
- {
-+#ifdef JS_METHODJIT
- JS_SET_RVAL(cx, vp, INT_TO_JSVAL(cx->runtime->mjitMemoryUsed));
-+#else
-+ JS_SET_RVAL(cx, vp, JSVAL_VOID);
-+#endif
- return true;
- }
-
Modified: branches/experimental/mail/thunderbird-devel/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-configure.in
Wed Apr 20 06:55:28 2011 (r535)
+++ branches/experimental/mail/thunderbird-devel/files/patch-configure.in
Fri Apr 22 21:51:29 2011 (r536)
@@ -1,6 +1,6 @@
---- configure.in.orig 2009-08-14 11:24:58.206076928 +0200
-+++ configure.in 2009-08-14 11:25:29.601293359 +0200
-@@ -5680,7 +5680,7 @@
+--- configure.in.orig 2011-03-14 14:50:16.000000000 +0100
++++ configure.in 2011-04-22 12:52:35.061444423 +0200
+@@ -1420,7 +1420,7 @@
CPU_ARCH=sparc
;;
@@ -8,4 +8,22 @@
+amd64 | x86_64 | ia64)
CPU_ARCH="$OS_TEST"
;;
+
+@@ -1440,7 +1440,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+- x86_64|i?86)
++ amd64|x86_64|i?86)
+ INTEL_ARCHITECTURE=1
esac
+
+@@ -4388,7 +4388,7 @@
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+
+-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a
"$SYSTEM_ZLIB" = 1; then
+ ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
+ ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
+ fi
Modified:
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-mkdepend-Makefile.in
==============================================================================
---
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-mkdepend-Makefile.in
Wed Apr 20 06:55:28 2011 (r535)
+++
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-mkdepend-Makefile.in
Fri Apr 22 21:51:29 2011 (r536)
@@ -4,7 +4,7 @@
include $(topsrcdir)/config/rules.mk
HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += $(XCFLAGS)
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\"
-DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
Modified:
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-configure.in
==============================================================================
---
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-configure.in
Wed Apr 20 06:55:28 2011 (r535)
+++
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-configure.in
Fri Apr 22 21:51:29 2011 (r536)
@@ -1,6 +1,6 @@
---- mozilla/configure.in.orig 2009-08-14 11:24:58.206076928 +0200
-+++ mozilla/configure.in 2009-08-14 11:25:29.601293359 +0200
-@@ -5680,7 +5680,7 @@
+--- mozilla/configure.in.orig 2011-03-14 14:57:11.000000000 +0100
++++ mozilla/configure.in 2011-04-22 12:53:44.608444324 +0200
+@@ -1545,7 +1545,7 @@
CPU_ARCH=sparc
;;
@@ -8,4 +8,19 @@
+amd64 | x86_64 | ia64)
CPU_ARCH="$OS_TEST"
;;
- esac
+
+@@ -6167,6 +6167,14 @@
+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+ VPX_X86_ASM=1
+ ;;
++ FreeBSD:i386)
++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++ VPX_X86_ASM=1
++ ;;
++ FreeBSD:amd64)
++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++ VPX_X86_ASM=1
++ ;;
+ SunOS:x86)
+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+ VPX_X86_ASM=1
Deleted:
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp
==============================================================================
---
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp
Fri Apr 22 21:51:29 2011 (r535)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,32 +0,0 @@
-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/mail/thunderbird-devel/files/patch-mozilla-js-src-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-Makefile.in
Fri Apr 22 21:51:29 2011 (r536)
@@ -0,0 +1,22 @@
+--- mozilla/js/src/Makefile.in.orig 2011-03-17 18:51:39.000000000 +0100
++++ mozilla/js/src/Makefile.in 2011-03-18 19:41:09.000000000 +0100
+@@ -612,7 +612,7 @@
+ # to reliably get limit macros defined, we'd always have to define the
+ # one below before including any header, but that's obscure and
+ # fragile, so we do it here.
+-DEFINES += -D__STDC_LIMIT_MACROS
++DEFINES += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
+
+ INCLUDES += -I$(srcdir)
+
+@@ -666,7 +666,8 @@
+ endif # WINNT
+
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS += -pthread
++DEFINES += -DFREEBSD
++EXTRA_LIBS += -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
+
Added:
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-config_config.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-config_config.mk
Fri Apr 22 21:51:29 2011 (r536)
@@ -0,0 +1,10 @@
+--- mozilla/js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000
+0200
++++ mozilla/js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200
+@@ -506,6 +506,7 @@
+ -I$(srcdir) \
+ -I. \
+ -I$(DIST)/include -I$(DIST)/include/nsprpub \
++ -I%%LOCALBASE%%/include \
+ $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub)
\
+ $(OS_INCLUDES) \
+ $(NULL)
Modified:
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in
==============================================================================
---
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in
Wed Apr 20 06:55:28 2011 (r535)
+++
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in
Fri Apr 22 21:51:29 2011 (r536)
@@ -1,15 +1,15 @@
---- 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
- ;;
-
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
- CPU_ARCH="$OS_TEST"
+--- mozilla/js/src/configure.in.orig 2010-11-04 21:05:48.000000000 +0100
++++ mozilla/js/src/configure.in 2010-11-22 21:30:24.000000000 +0100
+@@ -2621,7 +2621,7 @@
+ AC_DEFINE(JS_CPU_X86)
+ AC_DEFINE(JS_NUNBOX32)
;;
-
-@@ -2637,11 +2637,6 @@
+-x86_64*-*)
++x86_64*-*|amd64*-*)
+ ENABLE_TRACEJIT=1
+ NANOJIT_ARCH=X64
+ ENABLE_METHODJIT=1
+@@ -2638,11 +2638,6 @@
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
@@ -21,3 +21,13 @@
esac
MOZ_ARG_DISABLE_BOOL(methodjit,
+@@ -2693,7 +2688,7 @@
+ i?86-*)
+ AC_DEFINE(AVMPLUS_IA32)
+ ;;
+-x86_64*-*)
++x86_64*-*|amd64*-*)
+ AC_DEFINE(AVMPLUS_AMD64)
+ AC_DEFINE(AVMPLUS_64BIT)
+ ;;
+
Added:
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-jsnativestack.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-jsnativestack.cpp
Fri Apr 22 21:51:29 2011 (r536)
@@ -0,0 +1,11 @@
+--- mozilla/js/src/jsnativestack.cpp~
++++ mozilla/js/src/jsnativestack.cpp
+@@ -50,7 +50,8 @@
+ #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
+ # include <pthread.h>
+
+-# if defined(__FreeBSD__)
++# if defined(FREEBSD)
++# include <cstddef>
+ # include <pthread_np.h>
+ # endif
Added:
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-libvpx-vpx_config.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-libvpx-vpx_config.c
Fri Apr 22 21:51:29 2011 (r536)
@@ -0,0 +1,16 @@
+--- mozilla/media/libvpx/vpx_config_c.c~
++++ mozilla/media/libvpx/vpx_config_c.c
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.c"
+
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
Added:
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-libvpx-vpx_config.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-media-libvpx-vpx_config.h
Fri Apr 22 21:51:29 2011 (r536)
@@ -0,0 +1,16 @@
+--- mozilla/media/libvpx/vpx_config.h~
++++ mozilla/media/libvpx/vpx_config.h
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.h"
+
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
_______________________________________________
freebsd-gecko@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
