[SVN-Commit] r651 - in branches/experimental/www/firefox-beta: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Sun Oct 2 15:10:54 UTC 2011 

Author: beat
Date: Sun Oct  2 15:10:47 2011
New Revision: 651

Log:
- Update to 8.0 Beta 1

Added:
   branches/experimental/www/firefox-beta/files/patch-xpcom-io-nsAppFileLocationProvider.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-xpcom__threads__nsThreadManager.cpp

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile	Sun Oct  2 15:10:01 2011	(r650)
+++ branches/experimental/www/firefox-beta/Makefile	Sun Oct  2 15:10:47 2011	(r651)
@@ -2,11 +2,11 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.246 2011/08/24 23:34:00 flo Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.251 2011/09/30 15:07:49 beat Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	7.0b6
+DISTVERSION=	8.0b1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -17,7 +17,8 @@
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.8.8:${PORTSDIR}/devel/nspr \
-		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
+		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+                ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		event-1.4:${PORTSDIR}/devel/libevent
 
@@ -116,7 +117,8 @@
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/security/manager/ssl/src/Makefile.in \
 		${WRKSRC}/js/src/config/mkdepend/Makefile.in \
-		${WRKSRC}/js/src/config/config.mk
+		${WRKSRC}/js/src/config/config.mk \
+		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|echo aout|echo elf|g ; \

Modified: branches/experimental/www/firefox-beta/distinfo
==============================================================================
--- branches/experimental/www/firefox-beta/distinfo	Sun Oct  2 15:10:01 2011	(r650)
+++ branches/experimental/www/firefox-beta/distinfo	Sun Oct  2 15:10:47 2011	(r651)
@@ -1,2 +1,2 @@
-SHA256 (firefox-7.0b6.source.tar.bz2) = 020d9a271b75d3ac738a7f7858ed34501a2ffee465ce51aada20c1e750b0ae85
-SIZE (firefox-7.0b6.source.tar.bz2) = 69205454
+SHA256 (firefox-8.0b1.source.tar.bz2) = f556c48ce2238d360b6c80ac694b943c3e0bc06b5b5cc50894fbd9c7d585aae9
+SIZE (firefox-8.0b1.source.tar.bz2) = 70353090

Modified: branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in	Sun Oct  2 15:10:01 2011	(r650)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in	Sun Oct  2 15:10:47 2011	(r651)
@@ -19,23 +19,12 @@
  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.
--DEFINES		+= -D__STDC_LIMIT_MACROS
-+DEFINES		+= -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
+@@ -793,7 +796,7 @@
+ endif # WINNT
  
- INCLUDES	+= -I$(srcdir)
- 
-
--@@ -793,7 +796,8 @@
-+@@ -793,7 +796,7 @@
-  endif # WINNT
-  
-  ifeq ($(OS_ARCH),FreeBSD)
- -EXTRA_LIBS += -pthread
--+DEFINES           += -DFREEBSD
- +EXTRA_LIBS       += -pthread -lc
-  endif
-  ifeq ($(OS_ARCH),IRIX)
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS	+= -pthread
++EXTRA_LIBS	+= -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32

Modified: branches/experimental/www/firefox-beta/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-js-src-configure.in	Sun Oct  2 15:10:01 2011	(r650)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-configure.in	Sun Oct  2 15:10:47 2011	(r651)
@@ -1,6 +1,6 @@
---- 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 @@
+--- js/src/configure.in.orig	2011-09-28 14:41:24.000000000 +0200
++++ js/src/configure.in	2011-10-01 16:02:43.000000000 +0200
+@@ -1533,7 +1533,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,7 +9,7 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -1495,7 +1495,7 @@
+@@ -1555,7 +1555,7 @@
  dnl ===============================================================
  INTEL_ARCHITECTURE=
  case "$OS_TEST" in
@@ -18,48 +18,24 @@
        INTEL_ARCHITECTURE=1
  esac
  
-@@ -2713,7 +2713,7 @@
+@@ -2743,6 +2743,16 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
--x86_64*-*)
 +amd64*-*)
-     ENABLE_TRACEJIT=1
-     NANOJIT_ARCH=X64
-     ENABLE_METHODJIT=1
-@@ -2723,23 +2723,23 @@
-     AC_DEFINE(JS_CPU_X64)
-     AC_DEFINE(JS_PUNBOX64)
-     ;;
--arm*-*)
-+x86_64*-*)
-     ENABLE_TRACEJIT=1
--    NANOJIT_ARCH=ARM
++    ENABLE_TRACEJIT=1
 +    NANOJIT_ARCH=X64
-     ENABLE_METHODJIT=1
-     ENABLE_MONOIC=1
-     ENABLE_POLYIC=1
--    AC_DEFINE(JS_CPU_ARM)
--    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_METHODJIT=1
++    ENABLE_MONOIC=1
++    ENABLE_POLYIC=1
 +    ENABLE_POLYIC_TYPED_ARRAY=1
 +    AC_DEFINE(JS_CPU_X64)
 +    AC_DEFINE(JS_PUNBOX64)
-     ;;
--sparc*-*)
-+arm*-*)
++    ;;
+ x86_64*-*)
      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
-@@ -2796,6 +2796,10 @@
+     NANOJIT_ARCH=X64
+@@ -2827,6 +2837,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;

Added: branches/experimental/www/firefox-beta/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-xpcom-io-nsAppFileLocationProvider.cpp	Sun Oct  2 15:10:47 2011	(r651)
@@ -0,0 +1,11 @@
+--- xpcom/io/nsAppFileLocationProvider.cpp.orig	2011-09-30 15:52:07.000000000 +0200
++++ xpcom/io/nsAppFileLocationProvider.cpp	2011-09-30 15:52:40.000000000 +0200
+@@ -238,7 +238,7 @@
+ #if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
+           "/usr/lib64/mozilla/plugins";
+ #else
+-          "/usr/lib/mozilla/plugins";
++          "%%LOCALBASE%%/lib/npapi/symlinks/firefox";
+ #endif
+         rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
+                                    PR_FALSE, getter_AddRefs(localFile));

Modified: branches/experimental/www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp	Sun Oct  2 15:10:01 2011	(r650)
+++ branches/experimental/www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp	Sun Oct  2 15:10:47 2011	(r651)
@@ -1,10 +1,11 @@
 --- ./xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
 +++ ./xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,10 @@
+@@ -89,6 +89,11 @@
  nsresult
  nsThreadManager::Init()
  {
-+#ifdef NS_TLS
++#ifdef NS_TLS && (__FreeBSD_version < 802513 \
++  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
 +  if (!gTLSThreadID)
 +    gTLSThreadID = mozilla::threads::Generic;
 +#endif

More information about the freebsd-gecko mailing list