Attachment #174528 for bug #210931




# $FreeBSD$

PORTNAME=	seamonkey
DISTVERSION=	2.40
MOZILLA_VER=	43 # above + 3
PORTREVISION=	10
CATEGORIES?=	www mail news editors irc ipv6
MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source


LIB_DEPENDS=	libv4l2.so:multimedia/libv4l

EM_VERSION=	1.9.2
L_VERSION=	4.5

SSP_UNSAFE=	yes
USE_GECKO=	gecko

Lines 1-4 Link Here

(-)seamonkey/distinfo (-4 / +4 lines)
1	SHA256 (seamonkey-2.39.source.tar.xz) = c871de0a64cb60acf785df0ea3859b729353e5d1e3274947840386766859930e	1	SHA256 (seamonkey-2.40.source.tar.xz) = 7ecccc039d03f38d197b123b59ea42eac4c0c10e4bdec779b3665d79b435fa01
2	SIZE (seamonkey-2.39.source.tar.xz) = 182627632	2	SIZE (seamonkey-2.40.source.tar.xz) = 193702432
3	SHA256 (enigmail-1.9.1.tar.gz) = 0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993	3	SHA256 (enigmail-1.9.2.tar.gz) = 81c92937911005a5b94956d6d330a6f4114ad91da2dc10137bb0a3cbafd0ca42
4	SIZE (enigmail-1.9.1.tar.gz) = 1736876	4	SIZE (enigmail-1.9.2.tar.gz) = 1741350




--- memory/build/mozjemalloc_compat.c	2016-05-17 12:20:24.513295000 +0000
+++ memory/build/mozjemalloc_compat.c	2016-05-17 12:21:52.188052000 +0000
@@ -136,6 +136,7 @@
summary:     Bug 1125514 - Use jemalloc's metadata statistics to compute bookkeeping. r=glandium

--- mozilla/memory/build/mozjemalloc_compat.c~
+++ mozilla/memory/build/mozjemalloc_compat.c
@@ -136,6 +136,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
 {
   unsigned narenas;
   size_t active, allocated, mapped, page, pdirty;

   size_t lg_chunk;
 
   // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
@@ -149,10 +150,12 @@
   CTL_GET("stats.active", active);
   CTL_GET("stats.allocated", allocated);
   CTL_GET("stats.mapped", mapped);
+  CTL_GET("stats.metadata", meta);
   CTL_GET("opt.lg_chunk", lg_chunk);
-  CTL_GET("stats.bookkeeping", stats->bookkeeping);
 
   /* get the summation for all arenas, i == narenas */
   CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);

 
   stats->chunksize = (size_t) 1 << lg_chunk;
   stats->mapped = mapped;
   stats->allocated = allocated;
   stats->waste = active - allocated;
   stats->page_cache = pdirty * page;
+  stats->bookkeeping = meta - ameta;
   stats->bin_unused = compute_bin_unused(narenas);
   stats->waste -= stats->bin_unused;
 }




--- mozilla/ipc/ipdl/ipdl/cxx/ast.py	2016-05-17 13:29:25.826885000 +0000
+++ mozilla/ipc/ipdl/ipdl/cxx/ast.py	2016-05-17 13:30:00.779914000 +0000
@@ -339,12 +339,12 @@

    Bug 1026499 - Use MOZ_ALIGNED_DECL to declare union members in ipdl value declarations. r=bsmedberg
---
 ipc/ipdl/ipdl/cxx/ast.py  | 7 ++++---
 ipc/ipdl/ipdl/cxx/cgen.py | 5 ++++-
 ipc/ipdl/ipdl/lower.py    | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git ipc/ipdl/ipdl/cxx/ast.py ipc/ipdl/ipdl/cxx/ast.py
index 3180a65..c2d945b 100644
--- mozilla/ipc/ipdl/ipdl/cxx/ast.py
+++ mozilla/ipc/ipdl/ipdl/cxx/ast.py
@@ -336,12 +336,13 @@ Type.VOID = Type('void')
 Type.VOIDPTR = Type('void', ptr=1)
 
 class TypeArray(Node):

+        '''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):
--- mozilla/ipc/ipdl/ipdl/cxx/cgen.py	2016-05-17 13:30:18.992497000 +0000
+++ mozilla/ipc/ipdl/ipdl/cxx/cgen.py	2016-05-17 13:31:13.828885000 +0000
@@ -104,6 +104,7 @@
+++ mozilla/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):

             d.type.basetype.accept(self)
         else:
             d.type.accept(self)
@@ -114,7 +115,9 @@
         if isinstance(d.type, TypeArray):
             self.write('[')
             d.type.nmemb.accept(self)

 
     def visitParam(self, p):
         self.visitDecl(p)
diff --git ipc/ipdl/ipdl/lower.py ipc/ipdl/ipdl/lower.py
index e97a34c..9360f3c 100644
--- mozilla/ipc/ipdl/ipdl/lower.py
+++ mozilla/ipc/ipdl/ipdl/lower.py
@@ -768,7 +768,7 @@ IPDL union type."""
         if self.recursive:
             return self.ptrToType()
         else:
-            return TypeArray(Type('char'), ExprSizeof(self.internalType()))
+            return TypeArray(Type('char'), ExprSizeof(self.internalType()), self.internalType())
 
     def unionValue(self):
         # NB: knows that Union's storage C union is named |mValue|

Lines 1-9 Link Here

(-)seamonkey/files/patch-bug702179 (-3 / +3 lines)
1	--- mozilla/js/src/moz.build.orig 2015-10-29 22:17:54 UTC	1	--- mozilla/js/src/moz.build.orig 2015-10-29 22:17:54 UTC
2	+++ mozilla/js/src/moz.build	2	+++ mozilla/js/src/moz.build
3	@@ -613,7 +613,3 @@ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']	3	@@ -637,7 +637,3 @@
4		4
5	if CONFIG['GNU_CXX']:	5	if not CONFIG['GNU_CXX']:
6	FAIL_ON_WARNINGS = True	6	ALLOW_COMPILER_WARNINGS = True
7	-	7	-
8	-NO_EXPAND_LIBS = True	8	-NO_EXPAND_LIBS = True
9	-	9	-

Lines 1-11 Link Here

(-)seamonkey/files/patch-mozilla-dom-events-MessageEvent.h (-2 / +1 lines)
1	--- mozilla/dom/events/MessageEvent.h.orig 2015-11-04 02:56:28.000000000 +0100	1	--- mozilla/dom/events/MessageEvent.h.orig 2015-11-04 02:56:28.000000000 +0100
2	+++ mozilla/dom/events/MessageEvent.h 2016-01-24 16:47:37.869781000 +0100	2	+++ mozilla/dom/events/MessageEvent.h 2016-01-24 16:47:37.869781000 +0100
3	@@ -16,9 +16,6 @@ namespace mozilla {	3	@@ -16,8 +16,6 @@
4	namespace dom {	4	namespace dom {
5		5
6	struct MessageEventInit;	6	struct MessageEventInit;
7	-class MessagePort;	7	-class MessagePort;
8	-class MessagePortBase;
9	-class MessagePortList;	8	-class MessagePortList;
10	class OwningWindowProxyOrMessagePortOrClient;	9	class OwningWindowProxyOrMessagePortOrClient;
11		10

Return to bug 210931

Lines 2-10 Link Here

(-)seamonkey/Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= seamonkey	4	PORTNAME= seamonkey
5	DISTVERSION= 2.39	5	DISTVERSION= 2.40
6	MOZILLA_VER= 42 # above + 3	6	MOZILLA_VER= 43 # above + 3
7	PORTREVISION= 10
8	CATEGORIES?= www mail news editors irc ipv6	7	CATEGORIES?= www mail news editors irc ipv6
9	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \	8	MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
10	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source	9	MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
Lines 32-39 Link Here
32		31
33	LIB_DEPENDS= libv4l2.so:multimedia/libv4l	32	LIB_DEPENDS= libv4l2.so:multimedia/libv4l
34		33
35	EM_VERSION= 1.9.1	34	EM_VERSION= 1.9.2
36	L_VERSION= 4.4	35	L_VERSION= 4.5
37		36
38	SSP_UNSAFE= yes	37	SSP_UNSAFE= yes
39	USE_GECKO= gecko	38	USE_GECKO= gecko

Lines 1-11 Link Here

(-)seamonkey/files/extra-patch-bug1125514 (-17 / +4 lines)
1	changeset: 258513:ffbd5f5f46f1	1	--- memory/build/mozjemalloc_compat.c 2016-05-17 12:20:24.513295000 +0000
2	user: Guilherme Goncalves <guilherme.p.gonc@gmail.com>	2	+++ memory/build/mozjemalloc_compat.c 2016-05-17 12:21:52.188052000 +0000
3	date: Thu Aug 20 10:05:29 2015 +0900	3	@@ -136,6 +136,7 @@
4	summary: Bug 1125514 - Use jemalloc's metadata statistics to compute bookkeeping. r=glandium
5
6	--- mozilla/memory/build/mozjemalloc_compat.c~
7	+++ mozilla/memory/build/mozjemalloc_compat.c
8	@@ -136,6 +136,7 @@ jemalloc_stats_impl(jemalloc_stats_t *st
9	{	4	{
10	unsigned narenas;	5	unsigned narenas;
11	size_t active, allocated, mapped, page, pdirty;	6	size_t active, allocated, mapped, page, pdirty;
Lines 13-25 Link Here
13	size_t lg_chunk;	8	size_t lg_chunk;
14		9
15	// Refresh jemalloc's stats by updating its epoch, see ctl_refresh in	10	// Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
16	@@ -149,17 +150,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st	11	@@ -149,10 +150,12 @@
17	CTL_GET("stats.active", active);	12	CTL_GET("stats.active", active);
18	CTL_GET("stats.allocated", allocated);	13	CTL_GET("stats.allocated", allocated);
19	CTL_GET("stats.mapped", mapped);	14	CTL_GET("stats.mapped", mapped);
20	+ CTL_GET("stats.metadata", meta);	15	+ CTL_GET("stats.metadata", meta);
21	CTL_GET("opt.lg_chunk", lg_chunk);	16	CTL_GET("opt.lg_chunk", lg_chunk);
22	- CTL_GET("stats.bookkeeping", stats->bookkeeping);
23		17
24	/* get the summation for all arenas, i == narenas */	18	/* get the summation for all arenas, i == narenas */
25	CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);	19	CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
Lines 27-36 Link Here
27		21
28	stats->chunksize = (size_t) 1 << lg_chunk;	22	stats->chunksize = (size_t) 1 << lg_chunk;
29	stats->mapped = mapped;	23	stats->mapped = mapped;
30	stats->allocated = allocated;
31	stats->waste = active - allocated;
32	stats->page_cache = pdirty * page;
33	+ stats->bookkeeping = meta - ameta;
34	stats->bin_unused = compute_bin_unused(narenas);
35	stats->waste -= stats->bin_unused;
36	}

Lines 1-19 Link Here

(-)seamonkey/files/patch-bug1026499 (-36 / +7 lines)
1	commit 8d0efe4	1	--- mozilla/ipc/ipdl/ipdl/cxx/ast.py 2016-05-17 13:29:25.826885000 +0000
2	Author: Martin Husemann <martin@NetBSD.org>	2	+++ mozilla/ipc/ipdl/ipdl/cxx/ast.py 2016-05-17 13:30:00.779914000 +0000
3	Date: Wed Jun 18 18:12:22 2014 +0200	3	@@ -339,12 +339,12 @@
4
5	Bug 1026499 - Use MOZ_ALIGNED_DECL to declare union members in ipdl value declarations. r=bsmedberg
6	---
7	ipc/ipdl/ipdl/cxx/ast.py \| 7 ++++---
8	ipc/ipdl/ipdl/cxx/cgen.py \| 5 ++++-
9	ipc/ipdl/ipdl/lower.py \| 2 +-
10	4 files changed, 10 insertions(+), 5 deletions(-)
11
12	diff --git ipc/ipdl/ipdl/cxx/ast.py ipc/ipdl/ipdl/cxx/ast.py
13	index 3180a65..c2d945b 100644
14	--- mozilla/ipc/ipdl/ipdl/cxx/ast.py
15	+++ mozilla/ipc/ipdl/ipdl/cxx/ast.py
16	@@ -336,12 +336,13 @@ Type.VOID = Type('void')
17	Type.VOIDPTR = Type('void', ptr=1)	4	Type.VOIDPTR = Type('void', ptr=1)
18		5
19	class TypeArray(Node):	6	class TypeArray(Node):
Lines 23-29 Link Here
23	+ '''the type \|basetype DECLNAME[nmemb]\|. \|nmemb\| is an Expr, \|alignType\| is a type'''	10	+ '''the type \|basetype DECLNAME[nmemb]\|. \|nmemb\| is an Expr, \|alignType\| is a type'''
24	self.basetype = basetype	11	self.basetype = basetype
25	self.nmemb = nmemb	12	self.nmemb = nmemb
26	+ self.alignType = alignType
27	def __deepcopy__(self, memo):	13	def __deepcopy__(self, memo):
28	- return TypeArray(deepcopy(self.basetype, memo), nmemb)	14	- return TypeArray(deepcopy(self.basetype, memo), nmemb)
29	+ return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType)	15	+ return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType)
Lines 30-40 Link Here
30		16
31	class TypeEnum(Node):	17	class TypeEnum(Node):
32	def __init__(self, name=None):	18	def __init__(self, name=None):
33	diff --git ipc/ipdl/ipdl/cxx/cgen.py ipc/ipdl/ipdl/cxx/cgen.py	19	--- mozilla/ipc/ipdl/ipdl/cxx/cgen.py 2016-05-17 13:30:18.992497000 +0000
34	index 48b0988..bc914cf 100644	20	+++ mozilla/ipc/ipdl/ipdl/cxx/cgen.py 2016-05-17 13:31:13.828885000 +0000
35	--- mozilla/ipc/ipdl/ipdl/cxx/cgen.py	21	@@ -104,6 +104,7 @@
36	+++ mozilla/ipc/ipdl/ipdl/cxx/cgen.py
37	@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor):
38	def visitDecl(self, d):	22	def visitDecl(self, d):
39	# C-syntax arrays make code generation much more annoying	23	# C-syntax arrays make code generation much more annoying
40	if isinstance(d.type, TypeArray):	24	if isinstance(d.type, TypeArray):
Lines 42-48 Link Here
42	d.type.basetype.accept(self)	26	d.type.basetype.accept(self)
43	else:	27	else:
44	d.type.accept(self)	28	d.type.accept(self)
45	@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor):	29	@@ -114,7 +115,9 @@
46	if isinstance(d.type, TypeArray):	30	if isinstance(d.type, TypeArray):
47	self.write('[')	31	self.write('[')
48	d.type.nmemb.accept(self)	32	d.type.nmemb.accept(self)
Lines 53-68 Link Here
53		37
54	def visitParam(self, p):	38	def visitParam(self, p):
55	self.visitDecl(p)	39	self.visitDecl(p)
56	diff --git ipc/ipdl/ipdl/lower.py ipc/ipdl/ipdl/lower.py
57	index e97a34c..9360f3c 100644
58	--- mozilla/ipc/ipdl/ipdl/lower.py
59	+++ mozilla/ipc/ipdl/ipdl/lower.py
60	@@ -768,7 +768,7 @@ IPDL union type."""
61	if self.recursive:
62	return self.ptrToType()
63	else:
64	- return TypeArray(Type('char'), ExprSizeof(self.internalType()))
65	+ return TypeArray(Type('char'), ExprSizeof(self.internalType()), self.internalType())
66
67	def unionValue(self):
68	# NB: knows that Union's storage C union is named \|mValue\|