diff options
| author | flo <flo@FreeBSD.org> | 2012-02-01 05:17:58 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2012-02-01 05:17:58 +0800 |
| commit | 71210bb13c712ba8eb65fb77a936b9165b7712cd (patch) | |
| tree | e2f316d9b25a3693830cf03f5c34a637c6a5f40f /www/firefox/files | |
| parent | 04d567d1eee3b691147a20920f98dd959307010e (diff) | |
| download | freebsd-ports-graphics-71210bb13c712ba8eb65fb77a936b9165b7712cd.tar.gz freebsd-ports-graphics-71210bb13c712ba8eb65fb77a936b9165b7712cd.tar.zst freebsd-ports-graphics-71210bb13c712ba8eb65fb77a936b9165b7712cd.zip | |
update to 10.0
In collaboration with: beat
Diffstat (limited to 'www/firefox/files')
| -rw-r--r-- | www/firefox/files/patch-browser-app-nsBrowserApp.cpp | 4 | ||||
| -rw-r--r-- | www/firefox/files/patch-js-src-configure.in | 20 | ||||
| -rw-r--r-- | www/firefox/files/patch-js-src-jscpucfg.h | 22 |
3 files changed, 34 insertions, 12 deletions
diff --git a/www/firefox/files/patch-browser-app-nsBrowserApp.cpp b/www/firefox/files/patch-browser-app-nsBrowserApp.cpp index d0a9dd4c431..8737fd9a2fa 100644 --- a/www/firefox/files/patch-browser-app-nsBrowserApp.cpp +++ b/www/firefox/files/patch-browser-app-nsBrowserApp.cpp @@ -89,10 +89,10 @@ -#ifdef XP_WIN - // exePath comes from mozilla::BinaryPath::Get, which returns a UTF-8 - // encoded path, so it is safe to convert it -- nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), PR_FALSE, +- nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false, - getter_AddRefs(appini)); -#else -- nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), PR_FALSE, +- nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), false, - getter_AddRefs(appini)); -#endif + nsresult rv = XRE_GetBinaryPath(argv[0], getter_AddRefs(appini)); diff --git a/www/firefox/files/patch-js-src-configure.in b/www/firefox/files/patch-js-src-configure.in index bc5c9235275..27c02de1c14 100644 --- a/www/firefox/files/patch-js-src-configure.in +++ b/www/firefox/files/patch-js-src-configure.in @@ -1,6 +1,6 @@ ---- js/src/configure.in.orig 2011-12-21 00:28:21.000000000 +0100 -+++ js/src/configure.in 2012-01-29 13:08:44.000000000 +0100 -@@ -1432,7 +1432,7 @@ +--- js/src/configure.in.orig 2012-01-29 11:24:33.000000000 +0100 ++++ js/src/configure.in 2012-01-30 23:30:02.051087215 +0100 +@@ -1410,7 +1410,7 @@ CPU_ARCH=sparc ;; @@ -9,7 +9,7 @@ CPU_ARCH="$OS_TEST" ;; -@@ -1454,7 +1454,7 @@ +@@ -1432,7 +1432,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= case "$OS_TEST" in @@ -18,7 +18,7 @@ INTEL_ARCHITECTURE=1 esac -@@ -2491,6 +2491,16 @@ +@@ -2713,6 +2713,16 @@ AC_DEFINE(JS_CPU_X86) AC_DEFINE(JS_NUNBOX32) ;; @@ -33,17 +33,17 @@ + AC_DEFINE(JS_PUNBOX64) + ;; x86_64*-*) - ENABLE_TRACEJIT=1 NANOJIT_ARCH=X64 -@@ -2512,6 +2522,7 @@ + ENABLE_METHODJIT=1 +@@ -2732,6 +2742,7 @@ AC_DEFINE(JS_NUNBOX32) ;; sparc*-*) + if test ! "$HAVE_64BIT_OS" ; then - ENABLE_TRACEJIT=1 NANOJIT_ARCH=Sparc ENABLE_METHODJIT=1 -@@ -2520,6 +2531,7 @@ + ENABLE_MONOIC=1 +@@ -2739,6 +2750,7 @@ ENABLE_METHODJIT_TYPED_ARRAY=1 AC_DEFINE(JS_CPU_SPARC) AC_DEFINE(JS_NUNBOX32) @@ -51,7 +51,7 @@ ;; esac -@@ -2575,6 +2587,10 @@ +@@ -2795,6 +2807,10 @@ i?86-*) AC_DEFINE(AVMPLUS_IA32) ;; diff --git a/www/firefox/files/patch-js-src-jscpucfg.h b/www/firefox/files/patch-js-src-jscpucfg.h new file mode 100644 index 00000000000..85fe261572c --- /dev/null +++ b/www/firefox/files/patch-js-src-jscpucfg.h @@ -0,0 +1,22 @@ +--- js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100 ++++ js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100 +@@ -77,6 +77,19 @@ + #define IS_BIG_ENDIAN 1 + #endif + ++#elif defined(__FreeBSD__) ++#include <sys/endian.h> ++ ++#if defined(BYTE_ORDER) ++#if BYTE_ORDER == LITTLE_ENDIAN ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++#elif BYTE_ORDER == BIG_ENDIAN ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++#endif ++#endif ++ + #elif defined(JS_HAVE_ENDIAN_H) + #include <endian.h> + |