Remove changes for bugzilla ticket #1026499 which has been resolved

differently upstream.

5 files changed, 3 insertions, 98 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 47470783fb3..ce8f5fb45dc 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.235 2015/12/16 09:34:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.236 2015/12/19 12:50:55 martin Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	43.0
@@ -10,6 +10,7 @@ CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
+PKGREVISION=	1
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.source//}
 
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 591fb48d383..6c01939e0a4 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.225 2015/12/18 23:51:16 ryoon Exp $
+$NetBSD: distinfo,v 1.226 2015/12/19 12:50:55 martin Exp $
 
 SHA1 (firefox-43.0.source.tar.xz) = 65913f9dd61b49b341a66a514c9cac23b602c7c8
 RMD160 (firefox-43.0.source.tar.xz) = 9694b5389feaf88c8a11d6b9fb87cec18e6a27af
@@ -63,8 +63,6 @@ SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 7af18973c005d7b14
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 45f2f22b4f567ffddd4458f635179b5201e87e64
 SHA1 (patch-ipc_glue_StringUtil.cpp) = f238adebb5bdf57f7109a781c6f3fb195763f3c0
 SHA1 (patch-ipc_glue_moz.build) = 5c3f99ede7ab2d8ad58e92b31576971de87cb528
-SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = 047b7012dffdcfc2b07d2d249fb3523e7d4643f8
-SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105
 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
 SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
@@ -114,7 +112,6 @@ SHA1 (patch-media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spre
 SHA1 (patch-memory_build_mozjemalloc__compat.c) = c27c745fd6e0bbb120ef34d8a984937d5f2e1319
 SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = f61a8ef233963d5d9639a4ce68e8584bc7d7c1b2
 SHA1 (patch-memory_volatile_VolatileBufferOSX.cpp) = ebea8a615443206376cb4264ed43b5c74e029b7d
-SHA1 (patch-mfbt_Alignment.h) = 5c3d4f92a39874f2fdbc11321f63205c03b35ce0
 SHA1 (patch-mfbt_Attributes.h) = bf3378667704d7c9194b00024bb51ed23fd92286
 SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503
 SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 6aff0f8ed42575d8ca36a524e12e9a1f7351004a
diff --git a/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_ast.py b/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
deleted file mode 100644
index b99c1a8c303..00000000000
--- a/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ipc_ipdl_ipdl_cxx_ast.py,v 1.2 2014/07/24 14:57:12 ryoon Exp $
-
-Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
-Make sure storage provided for attributes is properly aligned
-in the generated C++ code.
-
---- ipc/ipdl/ipdl/cxx/ast.py.orig	2014-07-17 01:45:18.000000000 +0000
-+++ ipc/ipdl/ipdl/cxx/ast.py
-@@ -336,12 +336,13 @@ Type.VOID = Type('void')
- Type.VOIDPTR = Type('void', ptr=1)
- 
- class TypeArray(Node):
--    def __init__(self, basetype, nmemb):
--        '''the type |basetype DECLNAME[nmemb]|.  |nmemb| is an Expr'''
-+    def __init__(self, basetype, nmemb, alignType):
-+        '''the type |basetype DECLNAME[nmemb]|.  |nmemb| is an Expr, |alignType| is a type'''
-         self.basetype = basetype
-         self.nmemb = nmemb
-+        self.alignType = alignType
-     def __deepcopy__(self, memo):
--        return TypeArray(deepcopy(self.basetype, memo), nmemb)
-+        return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType)
- 
- class TypeEnum(Node):
-     def __init__(self, name=None):
diff --git a/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py b/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
deleted file mode 100644
index 22b3e525b34..00000000000
--- a/www/firefox/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ipc_ipdl_ipdl_cxx_cgen.py,v 1.2 2014/07/24 14:57:12 ryoon Exp $
-
-Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
-Make sure storage provided for attributes is properly aligned
-in the generated C++ code.
-
---- ipc/ipdl/ipdl/cxx/cgen.py.orig	2014-07-17 01:45:18.000000000 +0000
-+++ ipc/ipdl/ipdl/cxx/cgen.py
-@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor):
-     def visitDecl(self, d):
-         # C-syntax arrays make code generation much more annoying
-         if isinstance(d.type, TypeArray):
-+            self.write('MOZ_ALIGNED_DECL(')
-             d.type.basetype.accept(self)
-         else:
-             d.type.accept(self)
-@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor):
-         if isinstance(d.type, TypeArray):
-             self.write('[')
-             d.type.nmemb.accept(self)
--            self.write(']')
-+            self.write('], MOZ_ALIGNOF(')
-+            d.type.alignType.accept(self)
-+            self.write('))')
- 
-     def visitParam(self, p):
-         self.visitDecl(p)
diff --git a/www/firefox/patches/patch-mfbt_Alignment.h b/www/firefox/patches/patch-mfbt_Alignment.h
deleted file mode 100644
index 4b64b88411b..00000000000
--- a/www/firefox/patches/patch-mfbt_Alignment.h
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-mfbt_Alignment.h,v 1.3 2015/11/03 15:52:57 ryoon Exp $
-
-Make MOZ_ALIGNOF() use gcc's builtin __alignof__.
-From https://bugzilla.mozilla.org/show_bug.cgi?id=1026499
-
---- mfbt/Alignment.h.orig	2015-10-22 22:30:35.000000000 +0000
-+++ mfbt/Alignment.h
-@@ -15,6 +15,13 @@
- 
- 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.
-@@ -33,6 +40,7 @@ public:
- };
- 
- #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
-+#endif
- 
- /*
-  * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
-@@ -44,7 +52,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)