Really update to firefox 32.0 release

3 files changed, 4 insertions, 81 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 44cd325e6b2c..be3cd1a1fd00 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	33.0b1
+DISTVERSION=	32.0
 DISTVERSIONSUFFIX=.source
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
@@ -56,7 +56,7 @@ MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 
-WRKSRC:=	${WRKDIR}/mozilla-beta
+WRKSRC:=	${WRKDIR}/mozilla-release
 
 # avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1>
 # http://svnweb.freebsd.org/changeset/base/255804
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 99b780181d3c..652cb6ea4468 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-33.0b1.source.tar.bz2) = 90c5c2db2d13bc5a56a318c37508674707d13b91173363d67416c495581f3cbe
-SIZE (firefox-33.0b1.source.tar.bz2) = 154837284
+SHA256 (firefox-32.0.source.tar.bz2) = 3265971e15809ab904403b474fa9eccf15f34697deb16fc400c5c3684afd50eb
+SIZE (firefox-32.0.source.tar.bz2) = 149914070
diff --git a/www/firefox/files/patch-bug779713 b/www/firefox/files/patch-bug779713
deleted file mode 100644
index 37e0bc2fb5c0..000000000000
--- a/www/firefox/files/patch-bug779713
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git mfbt/Alignment.h mfbt/Alignment.h
-index e0843ca..353ec36 100644
---- mfbt/Alignment.h
-+++ mfbt/Alignment.h
-@@ -9,11 +9,20 @@
- #ifndef mozilla_Alignment_h
- #define mozilla_Alignment_h
- 
-+#include "mozilla/Attributes.h"
-+
- #include <stddef.h>
- #include <stdint.h>
- 
- namespace mozilla {
- 
-+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
-+#define MOZ_ALIGNOF(T) alignof(T)
-+#elif defined(__GNUC__)
-+#define MOZ_ALIGNOF(T) __alignof__(T)
-+#elif defined(_MSC_VER)
-+#define MOZ_ALIGNOF(T) __alignof(T)
-+#else
- /*
-  * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
-  * bytes of alignment a given type needs.
-@@ -32,6 +41,7 @@ public:
- };
- 
- #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
-+#endif
- 
- /*
-  * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
-@@ -43,7 +53,10 @@ public:
-  * will declare a two-character array |arr| aligned to 8 bytes.
-  */
- 
--#if defined(__GNUC__)
-+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
-+#  define MOZ_ALIGNED_DECL(_type, _align) \
-+     alignas(_align) _type
-+#elif defined(__GNUC__)
- #  define MOZ_ALIGNED_DECL(_type, _align) \
-      _type __attribute__((aligned(_align)))
- #elif defined(_MSC_VER)
-diff --git mfbt/Attributes.h mfbt/Attributes.h
-index d317766..ddb13da 100644
---- mfbt/Attributes.h
-+++ mfbt/Attributes.h
-@@ -51,6 +51,7 @@
-  * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
-  */
- #  if _MSC_VER >= 1800
-+#    define MOZ_HAVE_CXX11_ALIGNAS
- #    define MOZ_HAVE_CXX11_DELETE
- #  endif
- #  if _MSC_VER >= 1700
-@@ -74,6 +75,9 @@
- #  ifndef __has_extension
- #    define __has_extension __has_feature /* compatibility, for older versions of clang */
- #  endif
-+#  if __has_extension(cxx_alignas)
-+#    define MOZ_HAVE_CXX11_ALIGNAS
-+#  endif
- #  if __has_extension(cxx_constexpr)
- #    define MOZ_HAVE_CXX11_CONSTEXPR
- #  endif
-@@ -95,6 +99,9 @@
- #  endif
- #elif defined(__GNUC__)
- #  if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
-+#    if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
-+#      define MOZ_HAVE_CXX11_ALIGNAS
-+#    endif
- #    if MOZ_GCC_VERSION_AT_LEAST(4, 7, 0)
- #      define MOZ_HAVE_CXX11_OVERRIDE
- #      define MOZ_HAVE_CXX11_FINAL       final