From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 6 14:05:20 2012 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 35D2E106564A for ; Wed, 6 Jun 2012 14:05:20 +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 C1B0E8FC17 for ; Wed, 6 Jun 2012 14:05:19 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q56E5CJ9043078 for ; Wed, 6 Jun 2012 14:05:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q56E57Dq042278 for freebsd-gecko@freebsd.org; Wed, 6 Jun 2012 14:05:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 6 Jun 2012 14:05:07 GMT Message-Id: <201206061405.q56E57Dq042278@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] r721 - in branches/experimental/mail/thunderbird: . 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: Wed, 06 Jun 2012 14:05:20 -0000 Author: beat Date: Wed Jun 6 14:05:07 2012 New Revision: 721 Log: - Update to 13.0 (It compiles, it doesn't run) Added: branches/experimental/mail/thunderbird/files/patch-bugzilla-736961 Modified: branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird/distinfo branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Tue Jun 5 10:39:23 2012 (r720) +++ branches/experimental/mail/thunderbird/Makefile Wed Jun 6 14:05:07 2012 (r721) @@ -2,11 +2,11 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.150 2012/05/02 15:27:28 flo Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.151 2012/06/01 05:21:30 dinoex Exp $ # PORTNAME= thunderbird -DISTVERSION= 12.0.1 +DISTVERSION= 13.0 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -15,7 +15,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ @@ -61,6 +61,10 @@ .include +.if ${OSVERSION} > 800000 +USE_GCC= 4.6+ +.endif + WRKSRC= ${WRKDIR}/comm-release MOZSRC:= ${WRKSRC}/mozilla Modified: branches/experimental/mail/thunderbird/distinfo ============================================================================== --- branches/experimental/mail/thunderbird/distinfo Tue Jun 5 10:39:23 2012 (r720) +++ branches/experimental/mail/thunderbird/distinfo Wed Jun 6 14:05:07 2012 (r721) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-12.0.1.source.tar.bz2) = d8914f27b0ec71d940475a8942c951b106ecda69fd3a2954047584663a6ab183 -SIZE (thunderbird-12.0.1.source.tar.bz2) = 101253776 +SHA256 (thunderbird-13.0.source.tar.bz2) = 50fbb2e50d9294067974d3270899f32fbeb61e7951becb5deaf09ac5cf874dfb +SIZE (thunderbird-13.0.source.tar.bz2) = 102799262 Added: branches/experimental/mail/thunderbird/files/patch-bugzilla-736961 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-bugzilla-736961 Wed Jun 6 14:05:07 2012 (r721) @@ -0,0 +1,111 @@ +--- mozilla/config/rules.mk.orig Wed May 2 05:16:35 2012 ++++ mozilla/config/rules.mk Fri May 11 08:42:50 2012 +@@ -1479,7 +1487,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + @if test -n "$(findstring $*.h, $(EXPORTS))"; \ + then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi + +@@ -1492,7 +1500,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ + -I$(topsrcdir)/xpcom/typelib/xpt/tools \ +- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + + # no need to link together if XPIDLSRCS contains only XPIDL_MODULE + ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) +--- mozilla/js/src/config/rules.mk.orig Fri May 11 08:42:57 2012 ++++ mozilla/js/src/config/rules.mk Fri May 11 08:43:15 2012 +@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + @if test -n "$(findstring $*.h, $(EXPORTS))"; \ + then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi + +@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ + -I$(topsrcdir)/xpcom/typelib/xpt/tools \ +- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + + # no need to link together if XPIDLSRCS contains only XPIDL_MODULE + ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) +--- mozilla/js/xpconnect/src/Makefile.in.orig Fri May 11 08:43:27 2012 ++++ mozilla/js/xpconnect/src/Makefile.in Fri May 11 08:44:03 2012 +@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \ + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/qsgen.py \ + --idlpath=$(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output dom_quickstubs.h \ + --stub-output dom_quickstubs.cpp \ + --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \ +@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \ + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dombindingsgen.py \ + --idlpath=$(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output dombindings_gen.h \ + $(srcdir)/dombindings.conf + +@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \ + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dombindingsgen.py \ + --idlpath=$(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --stub-output dombindings_gen.cpp \ + --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \ + $(srcdir)/dombindings.conf +@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.c + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dictionary_helper_gen.py \ + -I $(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output DictionaryHelpers.h \ + $(srcdir)/dictionary_helper_gen.conf + +@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dictionary_helper_gen.py \ + -I $(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output DictionaryHelpers.h \ + --stub-output DictionaryHelpers.cpp \ + --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \ +--- mozilla/xpcom/idl-parser/Makefile.in.orig Fri May 11 08:44:10 2012 ++++ mozilla/xpcom/idl-parser/Makefile.in Fri May 11 08:44:29 2012 +@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS) + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen + + check:: + $(PYTHON_PATH) \ +--- mozilla/xpcom/typelib/xpidl/Makefile.in.orig Fri May 11 08:44:51 2012 ++++ mozilla/xpcom/typelib/xpidl/Makefile.in Fri May 11 08:45:09 2012 +@@ -48,8 +48,8 @@ SDK_BINARY = \ + $(topsrcdir)/xpcom/idl-parser/xpidl.py \ + $(topsrcdir)/xpcom/idl-parser/header.py \ + $(topsrcdir)/xpcom/idl-parser/typelib.py \ +- $(DEPTH)/xpcom/idl-parser/xpidllex.py \ +- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \ ++ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \ ++ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \ + $(NULL) + + ifndef MOZ_SYSTEM_PLY Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Tue Jun 5 10:39:23 2012 (r720) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Wed Jun 6 14:05:07 2012 (r721) @@ -1,6 +1,6 @@ ---- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -1549,7 +1549,7 @@ +--- mozilla/configure.in.orig 2012-05-23 20:56:34.000000000 +0200 ++++ mozilla/configure.in 2012-05-27 18:18:25.000000000 +0200 +@@ -1517,7 +1517,7 @@ CPU_ARCH=sparc ;; @@ -9,7 +9,7 @@ CPU_ARCH="$OS_TEST" ;; -@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp +@@ -1539,7 +1539,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= case "$OS_TEST" in @@ -18,34 +18,7 @@ INTEL_ARCHITECTURE=1 esac -@@ -3803,19 +3803,21 @@ - AC_CHECK_FUNCS(localtime_r strtok_r) - - dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt --_SAVE_LDFLAGS=$LDFLAGS --LDFLAGS="$LDFLAGS -lrt" --AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, -+_SAVE_LIBS=$LIBS -+AC_SEARCH_LIBS(clock_gettime, rt) -+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), - ac_cv_have_clock_monotonic, - [AC_TRY_LINK([#include ], - [ struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); ], - ac_cv_have_clock_monotonic=yes, - ac_cv_have_clock_monotonic=no)]) --LDFLAGS=$_SAVE_LDFLAGS -+LIBS=$_SAVE_LIBS - if test "$ac_cv_have_clock_monotonic" = "yes"; then - HAVE_CLOCK_MONOTONIC=1 -- REALTIME_LIBS=-lrt -+ if test "$ac_cv_search_clock_gettime" != "none required"; then -+ REALTIME_LIBS=$ac_cv_search_clock_gettime -+ fi - AC_DEFINE(HAVE_CLOCK_MONOTONIC) - AC_SUBST(HAVE_CLOCK_MONOTONIC) - AC_SUBST(REALTIME_LIBS) -@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS +@@ -4580,7 +4580,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS @@ -54,7 +27,7 @@ ZLIB_CFLAGS="-I${ZLIB_DIR}/include" ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi -@@ -6022,6 +6024,14 @@ +@@ -5903,6 +5903,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 ;; @@ -69,7 +42,7 @@ SunOS:x86) VPX_ASFLAGS="-f elf32 -rnasm -pnasm" VPX_X86_ASM=1 -@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then +@@ -6297,6 +6305,14 @@ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" LIBJPEG_TURBO_X64_ASM=1 ;;