diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-10-10 00:15:33 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-10-10 00:15:33 +0000 |
| commit | d018f5f996e4e7cea9c2e2598b6596e3cfb67e15 (patch) | |
| tree | 04cf9a9629c411aae26a6e65e470013eea74f837 /www | |
| parent | Bring back bsd.port.pre.mk since the post-install requires PREFIX (diff) | |
* Workaround a bug which can cause applications embedding Gecko to crash
on exit [1]
* Use the correct size for a JavaScript object on 64-bit platforms which
will help get the Java plug-in working on those platforms [2]
Test by: mezz [1]
Submitted by: jkim [2]
Obtained from: Firefox trunk [2]
Notes
Notes:
svn path=/head/; revision=201230
Diffstat (limited to 'www')
18 files changed, 186 insertions, 4 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index c9f55b2d20af..7654bfdf1c60 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -8,7 +8,7 @@ PORTNAME= firefox DISTVERSION= 2.0.0.7 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/www/firefox-esr/files/patch-embedding_base_nsEmbedAPI.cpp b/www/firefox-esr/files/patch-embedding_base_nsEmbedAPI.cpp new file mode 100644 index 000000000000..2cc9823fed1c --- /dev/null +++ b/www/firefox-esr/files/patch-embedding_base_nsEmbedAPI.cpp @@ -0,0 +1,16 @@ +--- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 ++++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 +@@ -53,7 +53,12 @@ static PRBool sRegistryIniti + static PRUint32 sInitCounter = 0; + + #define HACK_AROUND_THREADING_ISSUES +-//#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#if __FreeBSD_version < 700042 ++#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#endif ++#endif + + #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM + // XXX hack class to clean up XPCOM when this module is unloaded diff --git a/www/firefox-esr/files/patch-js_src_liveconnect_nsISecureLiveconnect.h b/www/firefox-esr/files/patch-js_src_liveconnect_nsISecureLiveconnect.h new file mode 100644 index 000000000000..a672de913dd6 --- /dev/null +++ b/www/firefox-esr/files/patch-js_src_liveconnect_nsISecureLiveconnect.h @@ -0,0 +1,14 @@ +--- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400 ++++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400 +@@ -51,7 +51,11 @@ + #include "nsIFactory.h" + #include "jni.h" + ++#if JS_BYTES_PER_WORD == 8 ++typedef jlong jsobject; ++#else + typedef jint jsobject; ++#endif + + class nsISecureLiveconnect : public nsISupports { + public: diff --git a/www/firefox/Makefile b/www/firefox/Makefile index c9f55b2d20af..7654bfdf1c60 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -8,7 +8,7 @@ PORTNAME= firefox DISTVERSION= 2.0.0.7 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/www/firefox/files/patch-embedding_base_nsEmbedAPI.cpp b/www/firefox/files/patch-embedding_base_nsEmbedAPI.cpp new file mode 100644 index 000000000000..2cc9823fed1c --- /dev/null +++ b/www/firefox/files/patch-embedding_base_nsEmbedAPI.cpp @@ -0,0 +1,16 @@ +--- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 ++++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 +@@ -53,7 +53,12 @@ static PRBool sRegistryIniti + static PRUint32 sInitCounter = 0; + + #define HACK_AROUND_THREADING_ISSUES +-//#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#if __FreeBSD_version < 700042 ++#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#endif ++#endif + + #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM + // XXX hack class to clean up XPCOM when this module is unloaded diff --git a/www/firefox/files/patch-js_src_liveconnect_nsISecureLiveconnect.h b/www/firefox/files/patch-js_src_liveconnect_nsISecureLiveconnect.h new file mode 100644 index 000000000000..a672de913dd6 --- /dev/null +++ b/www/firefox/files/patch-js_src_liveconnect_nsISecureLiveconnect.h @@ -0,0 +1,14 @@ +--- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400 ++++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400 +@@ -51,7 +51,11 @@ + #include "nsIFactory.h" + #include "jni.h" + ++#if JS_BYTES_PER_WORD == 8 ++typedef jlong jsobject; ++#else + typedef jint jsobject; ++#endif + + class nsISecureLiveconnect : public nsISupports { + public: diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index c9f55b2d20af..7654bfdf1c60 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -8,7 +8,7 @@ PORTNAME= firefox DISTVERSION= 2.0.0.7 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} diff --git a/www/firefox36/files/patch-embedding_base_nsEmbedAPI.cpp b/www/firefox36/files/patch-embedding_base_nsEmbedAPI.cpp new file mode 100644 index 000000000000..2cc9823fed1c --- /dev/null +++ b/www/firefox36/files/patch-embedding_base_nsEmbedAPI.cpp @@ -0,0 +1,16 @@ +--- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 ++++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 +@@ -53,7 +53,12 @@ static PRBool sRegistryIniti + static PRUint32 sInitCounter = 0; + + #define HACK_AROUND_THREADING_ISSUES +-//#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#if __FreeBSD_version < 700042 ++#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#endif ++#endif + + #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM + // XXX hack class to clean up XPCOM when this module is unloaded diff --git a/www/firefox36/files/patch-js_src_liveconnect_nsISecureLiveconnect.h b/www/firefox36/files/patch-js_src_liveconnect_nsISecureLiveconnect.h new file mode 100644 index 000000000000..a672de913dd6 --- /dev/null +++ b/www/firefox36/files/patch-js_src_liveconnect_nsISecureLiveconnect.h @@ -0,0 +1,14 @@ +--- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400 ++++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400 +@@ -51,7 +51,11 @@ + #include "nsIFactory.h" + #include "jni.h" + ++#if JS_BYTES_PER_WORD == 8 ++typedef jlong jsobject; ++#else + typedef jint jsobject; ++#endif + + class nsISecureLiveconnect : public nsISupports { + public: diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index c28561bacef9..2c98ba2ac702 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -8,6 +8,7 @@ PORTNAME= seamonkey DISTVERSION= 1.1.4 +PORTREVISION= 1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} diff --git a/www/seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp b/www/seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp new file mode 100644 index 000000000000..2cc9823fed1c --- /dev/null +++ b/www/seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp @@ -0,0 +1,16 @@ +--- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 ++++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 +@@ -53,7 +53,12 @@ static PRBool sRegistryIniti + static PRUint32 sInitCounter = 0; + + #define HACK_AROUND_THREADING_ISSUES +-//#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#if __FreeBSD_version < 700042 ++#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#endif ++#endif + + #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM + // XXX hack class to clean up XPCOM when this module is unloaded diff --git a/www/seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h b/www/seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h new file mode 100644 index 000000000000..a672de913dd6 --- /dev/null +++ b/www/seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h @@ -0,0 +1,14 @@ +--- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400 ++++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400 +@@ -51,7 +51,11 @@ + #include "nsIFactory.h" + #include "jni.h" + ++#if JS_BYTES_PER_WORD == 8 ++typedef jlong jsobject; ++#else + typedef jint jsobject; ++#endif + + class nsISecureLiveconnect : public nsISupports { + public: diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index c28561bacef9..2c98ba2ac702 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -8,6 +8,7 @@ PORTNAME= seamonkey DISTVERSION= 1.1.4 +PORTREVISION= 1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} diff --git a/www/seamonkey2/files/patch-embedding_base_nsEmbedAPI.cpp b/www/seamonkey2/files/patch-embedding_base_nsEmbedAPI.cpp new file mode 100644 index 000000000000..2cc9823fed1c --- /dev/null +++ b/www/seamonkey2/files/patch-embedding_base_nsEmbedAPI.cpp @@ -0,0 +1,16 @@ +--- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 ++++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 +@@ -53,7 +53,12 @@ static PRBool sRegistryIniti + static PRUint32 sInitCounter = 0; + + #define HACK_AROUND_THREADING_ISSUES +-//#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#if __FreeBSD_version < 700042 ++#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#endif ++#endif + + #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM + // XXX hack class to clean up XPCOM when this module is unloaded diff --git a/www/seamonkey2/files/patch-js_src_liveconnect_nsISecureLiveconnect.h b/www/seamonkey2/files/patch-js_src_liveconnect_nsISecureLiveconnect.h new file mode 100644 index 000000000000..a672de913dd6 --- /dev/null +++ b/www/seamonkey2/files/patch-js_src_liveconnect_nsISecureLiveconnect.h @@ -0,0 +1,14 @@ +--- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400 ++++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400 +@@ -51,7 +51,11 @@ + #include "nsIFactory.h" + #include "jni.h" + ++#if JS_BYTES_PER_WORD == 8 ++typedef jlong jsobject; ++#else + typedef jint jsobject; ++#endif + + class nsISecureLiveconnect : public nsISupports { + public: diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile index 24988bcc7c21..4e19ab0a21e8 100644 --- a/www/xulrunner/Makefile +++ b/www/xulrunner/Makefile @@ -8,7 +8,7 @@ PORTNAME= xulrunner PORTVERSION= 1.8.0.4 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/ diff --git a/www/xulrunner/files/patch-embedding_base_nsEmbedAPI.cpp b/www/xulrunner/files/patch-embedding_base_nsEmbedAPI.cpp new file mode 100644 index 000000000000..2cc9823fed1c --- /dev/null +++ b/www/xulrunner/files/patch-embedding_base_nsEmbedAPI.cpp @@ -0,0 +1,16 @@ +--- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 ++++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 +@@ -53,7 +53,12 @@ static PRBool sRegistryIniti + static PRUint32 sInitCounter = 0; + + #define HACK_AROUND_THREADING_ISSUES +-//#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#if __FreeBSD_version < 700042 ++#define HACK_AROUND_NONREENTRANT_INITXPCOM ++#endif ++#endif + + #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM + // XXX hack class to clean up XPCOM when this module is unloaded diff --git a/www/xulrunner/files/patch-js_src_liveconnect_nsISecureLiveconnect.h b/www/xulrunner/files/patch-js_src_liveconnect_nsISecureLiveconnect.h new file mode 100644 index 000000000000..a672de913dd6 --- /dev/null +++ b/www/xulrunner/files/patch-js_src_liveconnect_nsISecureLiveconnect.h @@ -0,0 +1,14 @@ +--- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400 ++++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400 +@@ -51,7 +51,11 @@ + #include "nsIFactory.h" + #include "jni.h" + ++#if JS_BYTES_PER_WORD == 8 ++typedef jlong jsobject; ++#else + typedef jint jsobject; ++#endif + + class nsISecureLiveconnect : public nsISupports { + public: |