svn commit: r319816 - in head/www/firefox: . files

[Florian Smeets]

Author: flo
Date: Mon Jun  3 22:45:05 2013
New Revision: 319816
URL: http://svnweb.freebsd.org/changeset/ports/319816

Log:
  - fix build with lang/gcc46 and lang/gcc47 [1]
  - fix segfaults [2]
  
  PR:		ports/178765 [2]
  Submitted by:	Jan Beich <jbeich at tormail.org> [1], dim [2]

Added:
  head/www/firefox/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm   (contents, props changed)
Modified:
  head/www/firefox/Makefile
  head/www/firefox/files/patch-bug824317

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Mon Jun  3 22:26:05 2013	(r319815)
+++ head/www/firefox/Makefile	Mon Jun  3 22:45:05 2013	(r319816)
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	21.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source

Modified: head/www/firefox/files/patch-bug824317
==============================================================================
--- head/www/firefox/files/patch-bug824317	Mon Jun  3 22:26:05 2013	(r319815)
+++ head/www/firefox/files/patch-bug824317	Mon Jun  3 22:45:05 2013	(r319816)
@@ -2,13 +2,14 @@ diff --git a/xpcom/string/public/nsAlgor
 index fa50194a..c5f5737 100644
 --- xpcom/string/public/nsAlgorithm.h
 +++ xpcom/string/public/nsAlgorithm.h
-@@ -42,7 +42,10 @@ NS_MAX( const T& a, const T& b )
+@@ -42,7 +42,11 @@ NS_MAX( const T& a, const T& b )
      return a > b ? a : b;
    }
- 
+
 -#if defined(_MSC_VER) && (_MSC_VER < 1600)
 +#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || \
-+    ((defined(__GLIBCXX__) && __GLIBCXX__ < 20121005) && \
++    (((defined(__GNUC_MINOR__) && __GNUC_MINOR__ < 8) || \
++      (defined(__GLIBCXX__) && __GLIBCXX__ < 20121005)) && \
 +     (defined(_GLIBCXX_USE_LONG_LONG) && \
 +      (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC)))
  namespace std {

Added: head/www/firefox/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox/files/patch-toolkit-components-osfile-osfile_unix_allthreads.jsm	Mon Jun  3 22:45:05 2013	(r319816)
@@ -0,0 +1,11 @@
+--- toolkit/components/osfile/osfile_unix_allthreads.jsm.orig	2013-05-11 21:19:53.000000000 +0200
++++ toolkit/components/osfile/osfile_unix_allthreads.jsm	2013-06-02 17:15:05.000000000 +0200
+@@ -40,7 +40,7 @@ if (typeof Components != "undefined") {
+   // Open libc
+   let libc;
+   let libc_candidates =  [ "libSystem.B.dylib",
+-                           "libc.so.6",
++                           "libc.so.7",
+                            "libc.so" ];
+   for (let i = 0; i < libc_candidates.length; ++i) {
+     try {