From f8ae57259d2b6995d3f55494b27d00983b0eab62 Mon Sep 17 00:00:00 2001
From: flo <flo@FreeBSD.org>
Date: Fri, 7 Sep 2012 22:10:01 +0000
Subject: - Update firefox to 15.0.1 - Sync changes from gecko repository@r995 
 general  - don't specify prefix for libevent when using pkg-config  - ia64
 and sparc64 use 8k pagesize by default  - add visibility hack for clang 3.2
 with libc++  - fix build using clang 3.2 (on FreeBSD 10-CURRENT)  - rename a
 few more patches to ease tracking of bugzilla bugs  www/seamonkey  - unbreak
 unsetting LDAP and MAILNEWS options after bug 707305  - use compile time
 debugging WITH_DEBUG  security/nss  - unbreak install WITH_DEBUG  - unbreak
 powerpc64  devel/nspr  - use absolute paths when specifiying srcdir to make
 gdb(1) happy

In collaboration with:	andreast, zeising, Jan Beich <jbeich@tormail.org>
---
 www/libxul/files/patch-bug351181           | 31 ++++++++++++++++++++++++++++++
 www/libxul/files/patch-bug653551           | 24 +++++++++++++++++++++++
 www/libxul/files/patch-js-src-configure.in | 13 -------------
 www/libxul/files/patch-js_src_jsnum.cpp    | 31 ------------------------------
 4 files changed, 55 insertions(+), 44 deletions(-)
 create mode 100644 www/libxul/files/patch-bug351181
 create mode 100644 www/libxul/files/patch-bug653551
 delete mode 100644 www/libxul/files/patch-js-src-configure.in
 delete mode 100644 www/libxul/files/patch-js_src_jsnum.cpp

(limited to 'www/libxul')

diff --git a/www/libxul/files/patch-bug351181 b/www/libxul/files/patch-bug351181
new file mode 100644
index 000000000000..c997f4c6b8ba
--- /dev/null
+++ b/www/libxul/files/patch-bug351181
@@ -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__) && __FreeBSD_version >= 601000
++#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
diff --git a/www/libxul/files/patch-bug653551 b/www/libxul/files/patch-bug653551
new file mode 100644
index 000000000000..733da79a9fd8
--- /dev/null
+++ b/www/libxul/files/patch-bug653551
@@ -0,0 +1,24 @@
+commit 47ea30f
+Author: Landry Breuil <landry@openbsd.org>
+Date:   Thu Feb 2 15:31:56 2012 +0900
+
+    Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha
+---
+ js/src/configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git js/src/configure.in js/src/configure.in
+index 84390cf..d663c46 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -2471,8 +2471,10 @@ arm*-*)
+     NANOJIT_ARCH=ARM
+     ;;
+ sparc*-*)
++    if test ! "$HAVE_64BIT_OS" ; then
+     ENABLE_JIT=1
+     NANOJIT_ARCH=Sparc
++    fi
+     ;;
+ esac
+ 
diff --git a/www/libxul/files/patch-js-src-configure.in b/www/libxul/files/patch-js-src-configure.in
deleted file mode 100644
index 962541ba9cff..000000000000
--- a/www/libxul/files/patch-js-src-configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- js/src/configure.in.orig	2009-09-30 21:50:26.000000000 +0200
-+++ js/src/configure.in	2009-09-30 21:50:44.000000000 +0200
-@@ -2467,10 +2467,6 @@
-     ENABLE_JIT=1
-     NANOJIT_ARCH=ARM
-     ;;
--sparc*-*)
--    ENABLE_JIT=1
--    NANOJIT_ARCH=Sparc
--    ;;
- esac
- 
- MOZ_ARG_DISABLE_BOOL(jit,
diff --git a/www/libxul/files/patch-js_src_jsnum.cpp b/www/libxul/files/patch-js_src_jsnum.cpp
deleted file mode 100644
index c997f4c6b8ba..000000000000
--- a/www/libxul/files/patch-js_src_jsnum.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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__) && __FreeBSD_version >= 601000
-+#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
-- 
cgit