Date: Sat, 23 Jun 2012 13:13:23 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r791 - in branches/experimental/www/seamonkey: . files Message-ID: <201206231313.q5NDDNeM049089@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 23 13:13:23 2012
New Revision: 791
Log:
update SeaMonkey, patch from beat@
Added:
branches/experimental/www/seamonkey/files/patch-bugzilla-736961
branches/experimental/www/seamonkey/files/patch-suite-installer-Makefile.in
Modified:
branches/experimental/www/seamonkey/Makefile
branches/experimental/www/seamonkey/distinfo
branches/experimental/www/seamonkey/files/patch-mozilla-configure.in
branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in
branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Fri Jun 22 19:02:20 2012 (r790)
+++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:13:23 2012 (r791)
@@ -6,7 +6,7 @@
#
PORTNAME= seamonkey
-DISTVERSION= 2.9
+DISTVERSION= 2.10.1
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
@@ -34,6 +34,7 @@
MAKE_JOBS_SAFE= yes
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
+EXTRA_CFLAGS= -O0
USE_GCC= 4.2+
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
Modified: branches/experimental/www/seamonkey/distinfo
==============================================================================
--- branches/experimental/www/seamonkey/distinfo Fri Jun 22 19:02:20 2012 (r790)
+++ branches/experimental/www/seamonkey/distinfo Sat Jun 23 13:13:23 2012 (r791)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.9.source.tar.bz2) = d3be08bbd8f7a3f20f650bfe32ee51c3618a07b5852336a1f3595e37c14311fb
-SIZE (seamonkey-2.9.source.tar.bz2) = 102265124
+SHA256 (seamonkey-2.10.1.source.tar.bz2) = 96e9542393d14a7522d05993b54239b2d45bc7198389a56e1e56af97038cac8f
+SIZE (seamonkey-2.10.1.source.tar.bz2) = 103439433
Added: branches/experimental/www/seamonkey/files/patch-bugzilla-736961
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-bugzilla-736961 Sat Jun 23 13:13:23 2012 (r791)
@@ -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/www/seamonkey/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Fri Jun 22 19:02:20 2012 (r790)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Sat Jun 23 13:13:23 2012 (r791)
@@ -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,33 +18,6 @@
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 <time.h>],
- [ 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)
@@ -4230,6 +4233,9 @@
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
@@ -77,7 +50,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
;;
@@ -92,7 +65,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
;;
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in Fri Jun 22 19:02:20 2012 (r790)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in Sat Jun 23 13:13:23 2012 (r791)
@@ -1,20 +1,40 @@
---- mozilla/js/src/configure.in.orig 2012-03-12 10:27:55.000000000 +0100
-+++ mozilla/js/src/configure.in 2012-03-12 10:28:22.000000000 +0100
-@@ -2831,12 +2831,14 @@
- AC_DEFINE(JS_NUNBOX32)
+--- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100
++++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100
+@@ -1470,7 +1470,7 @@
+ CPU_ARCH=sparc
;;
- sparc*-*)
-+ if test ! "$HAVE_64BIT_OS" ; then
- ENABLE_METHODJIT=1
- ENABLE_MONOIC=1
- ENABLE_POLYIC=1
- ENABLE_METHODJIT_TYPED_ARRAY=1
- AC_DEFINE(JS_CPU_SPARC)
- AC_DEFINE(JS_NUNBOX32)
-+ fi
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
;;
+
+@@ -1492,7 +1492,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+- x86_64|i?86)
++ amd64|x86_64|i?86)
+ INTEL_ARCHITECTURE=1
esac
+@@ -2814,6 +2814,16 @@
+ AC_DEFINE(JS_CPU_X86)
+ AC_DEFINE(JS_NUNBOX32)
+ ;;
++amd64*-*)
++ ENABLE_TRACEJIT=1
++ NANOJIT_ARCH=X64
++ ENABLE_METHODJIT=1
++ ENABLE_MONOIC=1
++ ENABLE_POLYIC=1
++ ENABLE_POLYIC_TYPED_ARRAY=1
++ AC_DEFINE(JS_CPU_X64)
++ AC_DEFINE(JS_PUNBOX64)
++ ;;
+ x86_64*-*)
+ ENABLE_METHODJIT=1
+ ENABLE_MONOIC=1
@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
* C++ implementations should define these macros only when __STDC_LIMIT_MACROS
* is defined before <stdint.h> is included. */
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Fri Jun 22 19:02:20 2012 (r790)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:13:23 2012 (r791)
@@ -1,12 +1,11 @@
---- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500
-+++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500
-@@ -181,7 +181,7 @@
- export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
- $(INSTALL) $^ .
+--- mozilla/toolkit/library/Makefile.in.orig 2012-06-15 14:04:29.000000000 +0200
++++ mozilla/toolkit/library/Makefile.in 2012-06-19 20:48:15.000000000 +0200
+@@ -438,7 +443,7 @@
+ endif
+ endif
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%%
- ifdef MOZ_ENABLE_LIBXUL
- include $(srcdir)/libxul-rules.mk
-
+ DEFINES += -DIMPL_XREAPI
+
Added: branches/experimental/www/seamonkey/files/patch-suite-installer-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-suite-installer-Makefile.in Sat Jun 23 13:13:23 2012 (r791)
@@ -0,0 +1,11 @@
+--- suite/installer/Makefile.in.orig 2012-06-19 20:42:29.000000000 +0200
++++ suite/installer/Makefile.in 2012-06-19 20:42:54.000000000 +0200
+@@ -49,7 +49,7 @@
+ MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
+ # Be fatal, except when building with XULRunner which already bundles some files.
+ ifndef SYSTEM_LIBXUL
+-MOZ_PKG_FATAL_WARNINGS = 1
++MOZ_PKG_FATAL_WARNINGS = 0
+ endif
+
+ MOZ_NONLOCALIZED_PKG_LIST = \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206231313.q5NDDNeM049089>