From 76ca6c49b8ae8901ca6caafaec5a9d5de6691791 Mon Sep 17 00:00:00 2001 From: beat Date: Tue, 27 Sep 2011 18:44:34 +0000 Subject: - Update Firefox to 7.0 Thanks to: flo@ for preparing the www/firefox update --- www/firefox-esr/Makefile | 2 +- www/firefox-esr/distinfo | 4 ++-- www/firefox-esr/files/patch-bugzilla-535300 | 20 -------------------- .../files/patch-content-xslt-public-txDouble.h | 11 ----------- .../patch-content__base__public__nsContentUtils.h | 11 +++++++++++ www/firefox-esr/files/patch-js-src-Makefile.in | 20 +++++++++++--------- .../files/patch-storage_build_Makefile.in | 10 ---------- .../files/patch-xpcom__threads__nsThreadManager.cpp | 13 +++++++++++++ 8 files changed, 38 insertions(+), 53 deletions(-) delete mode 100644 www/firefox-esr/files/patch-bugzilla-535300 delete mode 100644 www/firefox-esr/files/patch-content-xslt-public-txDouble.h create mode 100644 www/firefox-esr/files/patch-content__base__public__nsContentUtils.h delete mode 100644 www/firefox-esr/files/patch-storage_build_Makefile.in create mode 100644 www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp (limited to 'www/firefox-esr') diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index d1fc4851863d..2a7d531d50ac 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 6.0.2 +DISTVERSION= 7.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index 38d02922ecf5..92cad936e0f1 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-6.0.2.source.tar.bz2) = 7021f26a576be43ccf32181432eb8b7d5e1bfdfb923e143594dd4ea2a271412c -SIZE (firefox-6.0.2.source.tar.bz2) = 67926496 +SHA256 (firefox-7.0.source.tar.bz2) = 82d46cff57d9cae41f8d3b764808d8348a8d8c65b189f2591aa721d6346deaba +SIZE (firefox-7.0.source.tar.bz2) = 69282568 diff --git a/www/firefox-esr/files/patch-bugzilla-535300 b/www/firefox-esr/files/patch-bugzilla-535300 deleted file mode 100644 index 4c0bb136129a..000000000000 --- a/www/firefox-esr/files/patch-bugzilla-535300 +++ /dev/null @@ -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 diff --git a/www/firefox-esr/files/patch-content-xslt-public-txDouble.h b/www/firefox-esr/files/patch-content-xslt-public-txDouble.h deleted file mode 100644 index cd4acfc534bf..000000000000 --- a/www/firefox-esr/files/patch-content-xslt-public-txDouble.h +++ /dev/null @@ -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 --#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; diff --git a/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h b/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h new file mode 100644 index 000000000000..8239b2e8b8fd --- /dev/null +++ b/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h @@ -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 +-#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; diff --git a/www/firefox-esr/files/patch-js-src-Makefile.in b/www/firefox-esr/files/patch-js-src-Makefile.in index 75b37bf70bfe..2aa090fc3b57 100644 --- a/www/firefox-esr/files/patch-js-src-Makefile.in +++ b/www/firefox-esr/files/patch-js-src-Makefile.in @@ -28,12 +28,14 @@ INCLUDES += -I$(srcdir) -@@ -793,7 +796,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 + +-@@ -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) diff --git a/www/firefox-esr/files/patch-storage_build_Makefile.in b/www/firefox-esr/files/patch-storage_build_Makefile.in deleted file mode 100644 index 18202a5a61d8..000000000000 --- a/www/firefox-esr/files/patch-storage_build_Makefile.in +++ /dev/null @@ -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 diff --git a/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp b/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp new file mode 100644 index 000000000000..085800f9d08a --- /dev/null +++ b/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp @@ -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; + -- cgit