Date: Sun, 28 Aug 2011 16:18:42 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r616 - in branches/experimental/www/firefox-beta: . files Message-ID: <201108281618.p7SGIgCI085104@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Sun Aug 28 16:18:42 2011
New Revision: 616
Log:
readd firefox-beta (7.0b2)
This includes a very important patch by Test Rat <ttsestt@gmail.com> which
prevents firefox from crashing on startup. (patch-xpcom__threads__nsThreadManager.cpp)
Added:
branches/experimental/www/firefox-beta/
- copied from r611, branches/experimental/www/firefox/
branches/experimental/www/firefox-beta/files/patch-bugzilla-659932
- copied unchanged from r615, branches/experimental/www/firefox/files/patch-bugzilla-659932
branches/experimental/www/firefox-beta/files/patch-content__base__public__nsContentUtils.h
branches/experimental/www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp
Replaced:
branches/experimental/www/firefox-beta/Makefile
- copied, changed from r615, branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox-beta/distinfo
- copied, changed from r615, branches/experimental/www/firefox/distinfo
branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in
- copied unchanged from r615, branches/experimental/www/firefox/files/patch-js-src-Makefile.in
branches/experimental/www/firefox-beta/files/patch-js-src-configure.in
- copied unchanged from r615, branches/experimental/www/firefox/files/patch-js-src-configure.in
branches/experimental/www/firefox-beta/files/patch-js_src_jsnum.cpp
- copied unchanged from r615, branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp
branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in
- copied unchanged from r615, branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in
branches/experimental/www/firefox-beta/files/patch-nsprpub-pr-include-md_freebsd.h
- copied unchanged from r615, branches/experimental/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h
Deleted:
branches/experimental/www/firefox-beta/files/patch-bugzilla-535300
branches/experimental/www/firefox-beta/files/patch-content-xslt-public-txDouble.h
branches/experimental/www/firefox-beta/files/patch-js-src-jsnativestack.cpp
branches/experimental/www/firefox-beta/files/patch-storage_build_Makefile.in
Copied and modified: branches/experimental/www/firefox-beta/Makefile (from r615, branches/experimental/www/firefox/Makefile)
==============================================================================
--- branches/experimental/www/firefox/Makefile Sun Aug 28 15:08:27 2011 (r615, copy source)
+++ branches/experimental/www/firefox-beta/Makefile Sun Aug 28 16:18:42 2011 (r616)
@@ -6,8 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 6.0
-PORTREVISION= 1
+DISTVERSION= 7.0b2
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -57,7 +56,7 @@
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-release
+WRKSRC:= ${WRKDIR}/mozilla-beta
.if ${HAVE_GNOME:Mlibgnomeui}!=""
USE_GNOME+= libgnomeui
Copied and modified: branches/experimental/www/firefox-beta/distinfo (from r615, branches/experimental/www/firefox/distinfo)
==============================================================================
--- branches/experimental/www/firefox/distinfo Sun Aug 28 15:08:27 2011 (r615, copy source)
+++ branches/experimental/www/firefox-beta/distinfo Sun Aug 28 16:18:42 2011 (r616)
@@ -1,2 +1,2 @@
-SHA256 (firefox-6.0.source.tar.bz2) = cc3fb554ca02358e000502a1023d5ba01e6d18ae30c719f5a3b1ce1ad8334973
-SIZE (firefox-6.0.source.tar.bz2) = 67919174
+SHA256 (firefox-7.0b2.source.tar.bz2) = b39ec1acd1ef89261bfa0438279ad93d96eae03ec73148c46da805fc105fd7cc
+SIZE (firefox-7.0b2.source.tar.bz2) = 69140654
Deleted: branches/experimental/www/firefox/files/patch-bugzilla-535300
==============================================================================
--- branches/experimental/www/firefox/files/patch-bugzilla-535300 Sun Aug 28 16:18:42 2011 (r611)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-06-15 23:57:27.000000000 +0200
-+++ ipc/glue/GeckoChildProcessHost.cpp 2011-06-27 23:48:28.799495181 +0200
-@@ -433,7 +433,16 @@
- #ifdef ANDROID
- path += "/lib";
- #endif
-- newEnvVars["LD_LIBRARY_PATH"] = path.get();
-+ const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-+ nsCString new_ld_lib_path;
-+ if (ld_library_path && *ld_library_path) {
-+ new_ld_lib_path.Assign(ld_library_path);
-+ new_ld_lib_path.AppendLiteral(":");
-+ new_ld_lib_path.Append(path.get());
-+ newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get();
-+ } else {
-+ newEnvVars["LD_LIBRARY_PATH"] = path.get();
-+ }
- #elif OS_MACOSX
- newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
- #endif
Copied: branches/experimental/www/firefox-beta/files/patch-bugzilla-659932 (from r615, branches/experimental/www/firefox/files/patch-bugzilla-659932)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-bugzilla-659932 Sun Aug 28 16:18:42 2011 (r616, copy of r615, branches/experimental/www/firefox/files/patch-bugzilla-659932)
@@ -0,0 +1,35 @@
+--- toolkit/xre/glxtest.cpp.orig 2011-08-11 17:41:31.000000000 -0400
++++ toolkit/xre/glxtest.cpp 2011-08-23 15:09:48.000000000 -0400
+@@ -114,6 +114,9 @@
+ typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *);
+ PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension"));
+
++ typedef GLXFBConfig* (* PFNGLXQUERYVERSION) (Display *, int *, int *);
++ PFNGLXQUERYVERSION glXQueryVersion = cast<PFNGLXQUERYVERSION>(dlsym(libgl, "glXQueryVersion"));
++
+ typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *);
+ PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig"));
+
+@@ -139,6 +142,7 @@
+ PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString"));
+
+ if (!glXQueryExtension ||
++ !glXQueryVersion ||
+ !glXChooseFBConfig ||
+ !glXGetVisualFromFBConfig ||
+ !glXCreatePixmap ||
+@@ -158,6 +162,14 @@
+ ///// Check that the GLX extension is present /////
+ if (!glXQueryExtension(dpy, NULL, NULL))
+ fatal_error("GLX extension missing");
++
++ ///// Check that the GLX version is >= 1.3, needed for glXCreatePixmap, bug 659932 /////
++ int majorVersion, minorVersion;
++ if (!glXQueryVersion(dpy, &majorVersion, &minorVersion))
++ fatal_error("Unable to query GLX version");
++
++ if (majorVersion < 1 || (majorVersion == 1 && minorVersion < 3))
++ fatal_error("GLX version older than the required 1.3");
+
+ XSetErrorHandler(x_error_handler);
+
Deleted: branches/experimental/www/firefox/files/patch-content-xslt-public-txDouble.h
==============================================================================
--- branches/experimental/www/firefox/files/patch-content-xslt-public-txDouble.h Sun Aug 28 16:18:42 2011 (r611)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- content/xslt/public/txDouble.h.orig 2009-08-16 21:46:27.000000000 +0200
-+++ content/xslt/public/txDouble.h 2009-08-16 21:49:53.000000000 +0200
-@@ -43,7 +43,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Added: branches/experimental/www/firefox-beta/files/patch-content__base__public__nsContentUtils.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-content__base__public__nsContentUtils.h Sun Aug 28 16:18:42 2011 (r616)
@@ -0,0 +1,11 @@
+--- content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200
++++ content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200
+@@ -54,7 +54,7 @@
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+-#ifdef __alpha__
++#if !defined(__amd64__) && !defined(__i386__)
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+ #else
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Copied: branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in (from r615, branches/experimental/www/firefox/files/patch-js-src-Makefile.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in Sun Aug 28 16:18:42 2011 (r616, copy of r615, branches/experimental/www/firefox/files/patch-js-src-Makefile.in)
@@ -0,0 +1,41 @@
+--- 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.
+-DEFINES += -D__STDC_LIMIT_MACROS
++DEFINES += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
+
+ 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)
Copied: branches/experimental/www/firefox-beta/files/patch-js-src-configure.in (from r615, branches/experimental/www/firefox/files/patch-js-src-configure.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-configure.in Sun Aug 28 16:18:42 2011 (r616, copy of r615, branches/experimental/www/firefox/files/patch-js-src-configure.in)
@@ -0,0 +1,72 @@
+--- 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*-*)
++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
++ 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*-*)
++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
+@@ -2796,6 +2796,10 @@
+ i?86-*)
+ AC_DEFINE(AVMPLUS_IA32)
+ ;;
++amd64*-*)
++ AC_DEFINE(AVMPLUS_AMD64)
++ AC_DEFINE(AVMPLUS_64BIT)
++ ;;
+ x86_64*-*)
+ AC_DEFINE(AVMPLUS_AMD64)
+ AC_DEFINE(AVMPLUS_64BIT)
Deleted: branches/experimental/www/firefox/files/patch-js-src-jsnativestack.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-js-src-jsnativestack.cpp Sun Aug 28 16:18:42 2011 (r611)
+++ /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
-
Copied: branches/experimental/www/firefox-beta/files/patch-js_src_jsnum.cpp (from r615, branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-js_src_jsnum.cpp Sun Aug 28 16:18:42 2011 (r616, copy of r615, branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp)
@@ -0,0 +1,31 @@
+--- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
++++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
+@@ -43,6 +43,9 @@
+ /*
+ * JS number type and wrapper class.
+ */
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ #ifdef XP_OS2
+ #define _PC_53 PC_53
+ #define _MCW_EM MCW_EM
+@@ -691,8 +694,18 @@
+
+ #else
+
++#if defined(__FreeBSD__)
++#if __BSD_VISIBLE == 0
++#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
++#endif
++#include <fenv.h>
++#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
++#else
++
+ #define FIX_FPU() ((void)0)
+
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++
+ #endif
+
+ JSBool
Copied: branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in (from r615, branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in Sun Aug 28 16:18:42 2011 (r616, copy of r615, branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in)
@@ -0,0 +1,14 @@
+--- 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)/../../dom/plugins/base \
+- $(MOZ_CAIRO_CFLAGS) \
+ $(NULL)
+
++CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++
+ ifdef MOZ_ENABLE_GTK2
+ CXXFLAGS += $(MOZ_GTK2_CFLAGS)
+ endif
Copied: branches/experimental/www/firefox-beta/files/patch-nsprpub-pr-include-md_freebsd.h (from r615, branches/experimental/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-nsprpub-pr-include-md_freebsd.h Sun Aug 28 16:18:42 2011 (r616, copy of r615, branches/experimental/www/firefox/files/patch-nsprpub-pr-include-md_freebsd.h)
@@ -0,0 +1,30 @@
+--- nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100
++++ nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100
+@@ -57,6 +57,10 @@
+ #define _PR_SI_ARCHITECTURE "ia64"
+ #elif defined(__amd64__)
+ #define _PR_SI_ARCHITECTURE "amd64"
++#elif defined(__powerpc64__)
++#define _PR_SI_ARCHITECTURE "powerpc64"
++#elif defined(__powerpc__)
++#define _PR_SI_ARCHITECTURE "powerpc"
+ #else
+ #error "Unknown CPU architecture"
+ #endif
+@@ -106,6 +110,16 @@
+ #define _PR_IPV6_V6ONLY_PROBE
+ #endif
+
++#if (__FreeBSD_version >= 700016)
++#if defined(_PR_PTHREADS)
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_5_ARG_GETPROTO_R
++#define _PR_HAVE_GETHOST_R
++#define _PR_HAVE_GETHOST_R_INT
++#define _PR_HAVE_THREADSAFE_GETHOST
++#endif
++#endif
++
+ #define USE_SETJMP
+
+ #ifndef _PR_PTHREADS
Deleted: branches/experimental/www/firefox/files/patch-storage_build_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-storage_build_Makefile.in Sun Aug 28 16:18:42 2011 (r611)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
-@@ -77,6 +77,7 @@
- $(EXTRA_DSO_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
-+ %%PTHREAD_LIBS%% \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
Added: branches/experimental/www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-xpcom__threads__nsThreadManager.cpp Sun Aug 28 16:18:42 2011 (r616)
@@ -0,0 +1,13 @@
+--- ./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 @@
+ nsresult
+ nsThreadManager::Init()
+ {
++#ifdef NS_TLS
++ if (!gTLSThreadID)
++ gTLSThreadID = mozilla::threads::Generic;
++#endif
+ if (!mThreadsByPRThread.Init())
+ return NS_ERROR_OUT_OF_MEMORY;
+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108281618.p7SGIgCI085104>