Date: Wed, 6 Jul 2011 21:46:11 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r585 - in branches/experimental/www/firefox-beta: . files Message-ID: <201107062146.p66LkBMB075919@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Wed Jul 6 21:46:10 2011
New Revision: 585
Log:
- update to 6.0b1
Deleted:
branches/experimental/www/firefox-beta/files/patch-js-src-jsnativestack.cpp
Modified:
branches/experimental/www/firefox-beta/Makefile
branches/experimental/www/firefox-beta/distinfo
branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in
branches/experimental/www/firefox-beta/files/patch-js-src-configure.in
branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in
Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile Wed Jul 6 18:20:09 2011 (r584)
+++ branches/experimental/www/firefox-beta/Makefile Wed Jul 6 21:46:10 2011 (r585)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 5.0b7
+DISTVERSION= 6.0b1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
Modified: branches/experimental/www/firefox-beta/distinfo
==============================================================================
--- branches/experimental/www/firefox-beta/distinfo Wed Jul 6 18:20:09 2011 (r584)
+++ branches/experimental/www/firefox-beta/distinfo Wed Jul 6 21:46:10 2011 (r585)
@@ -1,2 +1,2 @@
-SHA256 (firefox-5.0b7.source.tar.bz2) = da2d7d71e6ca21c268ae5accc96f25d188e935674cba017021ffdba677ac5975
-SIZE (firefox-5.0b7.source.tar.bz2) = 68710896
+SHA256 (firefox-6.0b1.source.tar.bz2) = 4f363b8071528dd00ebdf65866b25077c986413c7ffeb5d4a5c1934beed18827
+SIZE (firefox-6.0b1.source.tar.bz2) = 67701417
Modified: branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in Wed Jul 6 18:20:09 2011 (r584)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in Wed Jul 6 21:46:10 2011 (r585)
@@ -1,6 +1,25 @@
---- js/src/Makefile.in.orig 2011-03-17 18:51:39.000000000 +0100
-+++ js/src/Makefile.in 2011-03-18 19:41:09.000000000 +0100
-@@ -612,7 +612,7 @@
+--- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200
++++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+
+ VPATH += $(srcdir)/assembler \
+ $(srcdir)/assembler/wtf \
+@@ -469,6 +469,9 @@
+ else
+ #CPPSRCS += only_on_x86.cpp
+ endif
++ifeq (amd64, $(TARGET_CPU))
++#CPPSRCS += only_on_x86_64.cpp
++endif
+ endif
+ ifeq (arm, $(TARGET_CPU))
+ #CPPSRCS += only_on_arm.cpp
+@@ -739,7 +742,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.
@@ -9,7 +28,7 @@
INCLUDES += -I$(srcdir)
-@@ -666,7 +666,8 @@
+@@ -793,7 +796,8 @@
endif # WINNT
ifeq ($(OS_ARCH),FreeBSD)
Modified: branches/experimental/www/firefox-beta/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-js-src-configure.in Wed Jul 6 18:20:09 2011 (r584)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-configure.in Wed Jul 6 21:46:10 2011 (r585)
@@ -1,32 +1,72 @@
---- js/src/configure.in.orig 2010-11-04 21:05:48.000000000 +0100
-+++ js/src/configure.in 2010-11-22 21:30:24.000000000 +0100
-@@ -2621,7 +2621,7 @@
+--- js/src/configure.in.orig 2011-07-06 05:09:22.000000000 +0200
++++ js/src/configure.in 2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+
+@@ -1495,7 +1495,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+- x86_64|i?86)
++ amd64|x86_64|i?86)
+ INTEL_ARCHITECTURE=1
+ esac
+
+@@ -2713,7 +2713,7 @@
AC_DEFINE(JS_CPU_X86)
AC_DEFINE(JS_NUNBOX32)
;;
-x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
ENABLE_TRACEJIT=1
NANOJIT_ARCH=X64
ENABLE_METHODJIT=1
-@@ -2638,11 +2638,6 @@
- AC_DEFINE(JS_CPU_ARM)
- AC_DEFINE(JS_NUNBOX32)
+@@ -2723,23 +2723,23 @@
+ AC_DEFINE(JS_CPU_X64)
+ AC_DEFINE(JS_PUNBOX64)
+ ;;
+-arm*-*)
++x86_64*-*)
+ ENABLE_TRACEJIT=1
+- NANOJIT_ARCH=ARM
++ NANOJIT_ARCH=X64
+ ENABLE_METHODJIT=1
+ ENABLE_MONOIC=1
+ ENABLE_POLYIC=1
+- AC_DEFINE(JS_CPU_ARM)
+- AC_DEFINE(JS_NUNBOX32)
++ ENABLE_POLYIC_TYPED_ARRAY=1
++ AC_DEFINE(JS_CPU_X64)
++ AC_DEFINE(JS_PUNBOX64)
;;
-sparc*-*)
-- ENABLE_TRACEJIT=1
++arm*-*)
+ ENABLE_TRACEJIT=1
- NANOJIT_ARCH=Sparc
++ NANOJIT_ARCH=ARM
+ ENABLE_METHODJIT=1
+ ENABLE_MONOIC=1
+ ENABLE_POLYIC=1
+- ENABLE_POLYIC_TYPED_ARRAY=1
- AC_DEFINE(JS_CPU_SPARC)
-- ;;
++ AC_DEFINE(JS_CPU_ARM)
+ AC_DEFINE(JS_NUNBOX32)
+ ;;
esac
-
- MOZ_ARG_DISABLE_BOOL(methodjit,
-@@ -2693,7 +2688,7 @@
+@@ -2796,6 +2796,10 @@
i?86-*)
AC_DEFINE(AVMPLUS_IA32)
;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
++ AC_DEFINE(AVMPLUS_AMD64)
++ AC_DEFINE(AVMPLUS_64BIT)
++ ;;
+ x86_64*-*)
AC_DEFINE(AVMPLUS_AMD64)
AC_DEFINE(AVMPLUS_64BIT)
- ;;
Deleted: branches/experimental/www/firefox-beta/files/patch-js-src-jsnativestack.cpp
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-js-src-jsnativestack.cpp Wed Jul 6 21:46:10 2011 (r584)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- js/src/jsnativestack.cpp~
-+++ 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
-
Modified: branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in Wed Jul 6 18:20:09 2011 (r584)
+++ branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in Wed Jul 6 21:46:10 2011 (r585)
@@ -1,13 +1,13 @@
---- layout/generic/Makefile.in.orig 2011-04-26 23:21:46.000000000 +0200
-+++ layout/generic/Makefile.in 2011-04-26 23:44:09.096445086 +0200
-@@ -147,9 +147,10 @@
+--- layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200
++++ layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200
+@@ -159,9 +159,10 @@
-I$(srcdir)/../../content/html/content/src \
-I$(srcdir)/../../dom/base \
- -I$(srcdir)/../../modules/plugin/base/src \
+ -I$(srcdir)/../../dom/plugins/base \
- $(MOZ_CAIRO_CFLAGS) \
$(NULL)
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++ CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
+
ifdef MOZ_ENABLE_GTK2
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107062146.p66LkBMB075919>