Hi,
attached at this mail are 2 diff's that update Seamonkey to version 2.40.
Apart some updated patches, not much had to be changed.
Additionally I've removed:
patch-1194520
patch-bug847568
patch-bug991253
patch-media_libav_config__unix.h
patch-z-bug517422
from the files folder. They either didn't applied or correctly and upon
several tries under FreeBSD 10.2 / FreeBSD 10.3 (both amd64 and i386)
these patches didn't seem necessary.
I've updated my local tree several months ago and using "my" version daily
at work and also private without any problems.
If you would be so kind updating the port, someone else might benefit as
well.
Kind regards,
Tommy Scheunemann
Index: seamonkey-i18n/Makefile
===================================================================
--- seamonkey-i18n/Makefile (revision 421530)
+++ seamonkey-i18n/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= seamonkey-i18n
-PORTVERSION= 2.39
+PORTVERSION= 2.40
CATEGORIES= www mail news editors irc
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \
MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack
@@ -15,7 +15,7 @@
EXTRACT_DEPENDS= zip:archivers/zip
-USES= zip:infozip gecko:seamonkey,build
+USES= zip:infozip
USE_XPI= seamonkey linux-seamonkey
NO_ARCH= yes
Index: seamonkey-i18n/Makefile.lang
===================================================================
--- seamonkey-i18n/Makefile.lang (revision 421530)
+++ seamonkey-i18n/Makefile.lang (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
SEAMONKEY_I18N_ALL_= be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it \
- ja-JP-mac ja lt nb-NO nl pl pt-PT ru sk sv-SE tr uk \
+ ja lt nb-NO nl pl pt-PT ru sk sv-SE tr uk \
zh-CN zh-TW
.if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) &&
!exists(${OPTIONS_FILE})) || make(makesum)
@@ -47,9 +47,6 @@
.if ${PORT_OPTIONS:MLANG_IT}
SEAMONKEY_I18N+= it
.endif
-.if ${PORT_OPTIONS:MLANG_JP}
-SEAMONKEY_I18N+= ja-JP-mac
-.endif
.if ${PORT_OPTIONS:MLANG_JA}
SEAMONKEY_I18N+= ja
.endif
Index: seamonkey-i18n/Makefile.option
===================================================================
--- seamonkey-i18n/Makefile.option (revision 421530)
+++ seamonkey-i18n/Makefile.option (working copy)
@@ -15,7 +15,6 @@
LANG_HU \
LANG_IT \
LANG_JA \
- LANG_JP \
LANG_LT \
LANG_NB \
LANG_PL \
Index: seamonkey-i18n/distinfo
===================================================================
--- seamonkey-i18n/distinfo (revision 421530)
+++ seamonkey-i18n/distinfo (working copy)
@@ -1,54 +1,52 @@
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.be.langpack.xpi) =
289803bc8d1669aa8dc116e55ffbef60a611002c39dbe9e461ad3546d82043d5
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.be.langpack.xpi) = 845960
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ca.langpack.xpi) =
7cd996abf7027189f6c3fd09501331b1bcf06a61f596cd7042d2a2a66b58e0e2
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ca.langpack.xpi) = 837800
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.cs.langpack.xpi) =
6204072196d5ef65cfd5a380d7a985f225f17b8bf5c945e7828ca33cdb09b2da
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.cs.langpack.xpi) = 830007
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.de.langpack.xpi) =
a12a02029fef8caa33a99c7bd254bcacf3825b1edbbbc7a2775a8f5a1756425f
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.de.langpack.xpi) = 838258
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-GB.langpack.xpi) =
6b7d78e35df5609cdbc944cc4a36fade59d9d29ba761d31969b20be13eebff0e
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-GB.langpack.xpi) = 800622
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-US.langpack.xpi) =
96c81e0e331f9691d151fb32748e48dea57c0a2c5e7d2bfb69e619c931e7446b
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.en-US.langpack.xpi) = 800201
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-AR.langpack.xpi) =
f9c92da4f70391413c4be4255332add2fa60a54d8e42c3205badffc4579717da
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-AR.langpack.xpi) = 849345
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-ES.langpack.xpi) =
fe0d89ba946aff3ff90e6751491a64acf381d2fb176ed10270d113bc572e22f2
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.es-ES.langpack.xpi) = 817622
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fi.langpack.xpi) =
c1732389c3d532ca50152fda28495387e66c6ab9cfcda0b607936e9601549310
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fi.langpack.xpi) = 804879
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fr.langpack.xpi) =
fa90086e2d3cc968010c222e58d5e4b465c2c374e07223191483b574db772999
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.fr.langpack.xpi) = 810559
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.gl.langpack.xpi) =
20b888b8f9c2c2115e8a3a2157d6f8da353c484d573da0d347ffffd41f99bc76
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.gl.langpack.xpi) = 816387
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.hu.langpack.xpi) =
a13b872cf8ecc3cfaf1d8fc5e9a136ba4abd8ae07f4fff15e6dbe9fdd9e5ad7c
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.hu.langpack.xpi) = 848211
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.it.langpack.xpi) =
65fd240cdad3bc4808f0eb35ccf7cfeb9c5c69ba28d446fce91f225b0161ce97
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.it.langpack.xpi) = 728624
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja-JP-mac.langpack.xpi) =
843e6de0158c52fb3eda6e2dd02b92b45e2dbf7a7b10f7b43aff5672a0ffd295
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja-JP-mac.langpack.xpi) = 902319
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja.langpack.xpi) =
859ee3e4733f944af91d06051cd99fb78f1bb7d60f012e8cf433cf65fb0d17a3
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ja.langpack.xpi) = 886715
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.lt.langpack.xpi) =
bcd3b61379bbd1c28974f4609aefa25ece6b5f64715c4cb52b6eafffb60f23e6
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.lt.langpack.xpi) = 857561
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nb-NO.langpack.xpi) =
9a7280be0ae9bdf0f21ad89749cbd050dcac588989c33b016bf79496ad3660df
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nb-NO.langpack.xpi) = 827941
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nl.langpack.xpi) =
6e880ed775dbf46eb62e3ac9b8a55091790a451f86776aa5ba0de1945d8a23aa
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.nl.langpack.xpi) = 795152
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pl.langpack.xpi) =
00cc6c894fc6dab4a22e9d38fb6037850f8e57a13f8150d64e8faf3878f204c8
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pl.langpack.xpi) = 860260
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pt-PT.langpack.xpi) =
7be70081c211aed53e98228ed9f9d20741f227bbafb696acf44a5eae20a286f1
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.pt-PT.langpack.xpi) = 830427
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ru.langpack.xpi) =
9ad1066cb6cc07a49bbd0b2e8295db65e490a07af7c36485ae607d788817ec5e
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.ru.langpack.xpi) = 889891
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sk.langpack.xpi) =
f70af092108244bc70d3daa53fd41bd3a47c1af518afeca2b6f431952643c6e7
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sk.langpack.xpi) = 856745
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sv-SE.langpack.xpi) =
4ee82e2d89fd9846b4fc9465797c2f04facea76b10bf00d82ade5a581b6c5c59
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.sv-SE.langpack.xpi) = 823333
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.tr.langpack.xpi) =
9d5e12b135b8157ab0febe7d2253466cc90ee410322234ebe23a3b4de83461b3
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.tr.langpack.xpi) = 813628
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.uk.langpack.xpi) =
6b4bed5fd385b1666579cf69cf094f7f81e4533be62915b02a9154ed9bbed6fe
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.uk.langpack.xpi) = 875396
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-CN.langpack.xpi) =
7cdb2dc31da908a506fca78c93008cf1b6ce9ef3dddb0fcb38b383bf9e5be556
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-CN.langpack.xpi) = 838756
-SHA256 (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-TW.langpack.xpi) =
a3ae379666ff757e0424918491ae1aa710d08aa586d0fd4526bf4dd838c1461c
-SIZE (xpi/seamonkey-i18n-2.39/seamonkey-2.39.zh-TW.langpack.xpi) = 860307
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.be.langpack.xpi) =
257bd56c3db3d62600e8fcb4e621df1cb3cede2e73354a0f588516152598e9b8
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.be.langpack.xpi) = 846940
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ca.langpack.xpi) =
06d423fc182c0d6b674572a94c0628febbe314883dc0be7f481583ae21ce9485
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ca.langpack.xpi) = 838972
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.cs.langpack.xpi) =
b2485aaed83ad46edb565fd6d35b785fc350ae96a7c32df91eb028807d8f442e
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.cs.langpack.xpi) = 831462
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.de.langpack.xpi) =
8d72d02bcec01e63a6b4630bcfd092fa1dcdf21b8424f4de878d4460e6ba1865
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.de.langpack.xpi) = 839670
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-GB.langpack.xpi) =
b19890d7c446ffd98a9c94f95986cbbed9842f4149ce549d3463128957f1ed9f
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-GB.langpack.xpi) = 801900
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-US.langpack.xpi) =
45c6f3aee27022a7523268d21f38924dbfa3553f2dfca25e8e11ef41c1119392
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.en-US.langpack.xpi) = 801237
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-AR.langpack.xpi) =
096bfcbd124463398d1776955587036f7d8d969582053d8980dde18e34e21738
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-AR.langpack.xpi) = 850745
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-ES.langpack.xpi) =
8d95036953298f880de663961a4b686bed9b233dfdc247a5107465d97d671b68
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.es-ES.langpack.xpi) = 819863
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fi.langpack.xpi) =
fbbca3abdc2fca3a7d18500e606ef75e3ee4ecbaefce3fc6bec211422521ac0e
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fi.langpack.xpi) = 806026
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fr.langpack.xpi) =
faed1301c6f7eebf6999521feb7a8161f4ec5c6dab01ae717f9bb7df360a6382
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.fr.langpack.xpi) = 812115
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.gl.langpack.xpi) =
36d8a69aa1a526dd8ecc6a2fe2da55b5b4d3e4bcbbd2d13af0f76fa79ae21fc4
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.gl.langpack.xpi) = 817071
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.hu.langpack.xpi) =
b259e45414ea7247c586605797064743efd203ad22ef4a6ca734d9d39ea0ddcd
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.hu.langpack.xpi) = 849367
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.it.langpack.xpi) =
6818ac8634aa959c049791bd96e228ee68fb4af214d73b2ded67cdf9e8fba159
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.it.langpack.xpi) = 730855
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ja.langpack.xpi) =
73c868aad2fdcc3ddf3cbb84bdca2ec7e43c7fcf0ac1d5ec243717123dcaf353
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ja.langpack.xpi) = 888099
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.lt.langpack.xpi) =
eb99109e0b25415e460c31fe6be35d41ada6040ca91bb90fb29af951f0b21b6a
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.lt.langpack.xpi) = 858221
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nb-NO.langpack.xpi) =
2762bcddb6b4d36b2d14bb961e6b3604420e099216d5efc60b8835bc2709251d
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nb-NO.langpack.xpi) = 829131
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nl.langpack.xpi) =
fa6f780f2fec5b43c75bc46778ddcfa983c989fe16a0c1995c0bc65a375188f9
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.nl.langpack.xpi) = 796595
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pl.langpack.xpi) =
96d1eaf1bafce2a4b11abfc7b3cccc3409b073e7353416ec7eaec48f61d0ed83
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pl.langpack.xpi) = 861834
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pt-PT.langpack.xpi) =
1ef665be4063a864564ac13d6cf87892bc5c3c57a9e4115efd03403382e14b8b
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.pt-PT.langpack.xpi) = 831873
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ru.langpack.xpi) =
68f6ca318be2cd1f78245db311ac9c0e0ae877697c0e310284615b352338a61e
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.ru.langpack.xpi) = 892052
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sk.langpack.xpi) =
af8c126fe02cb3a8b9783c4a1f8d4bdec8b684195a2a8b5be537df88e2ec2861
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sk.langpack.xpi) = 858148
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sv-SE.langpack.xpi) =
fc970bfc8b52119c147d564076904df9b3722fb922bc9703709ceb5be2bd6144
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.sv-SE.langpack.xpi) = 824804
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.tr.langpack.xpi) =
c5dce74507307008127e3402e0c9a877f333f2b1085b1c912c77969f4a433632
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.tr.langpack.xpi) = 814264
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.uk.langpack.xpi) =
9932ca0ac00312a9fd9bab3199f7e55564beb6f5f339647c7a6c0cdd4cd82241
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.uk.langpack.xpi) = 875815
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-CN.langpack.xpi) =
28f634be2ed10526dbf6bf310b28f4da921d5809bce8216418c34ad07ac75443
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-CN.langpack.xpi) = 839892
+SHA256 (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-TW.langpack.xpi) =
eaec998d922789be13cfc42660ab96abd0b1ec47cb4394b8a9f725969141ba89
+SIZE (xpi/seamonkey-i18n-2.40/seamonkey-2.40.zh-TW.langpack.xpi) = 861767
Index: seamonkey/Makefile
===================================================================
--- seamonkey/Makefile (revision 421530)
+++ seamonkey/Makefile (working copy)
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= seamonkey
-DISTVERSION= 2.39
-MOZILLA_VER= 42 # above + 3
-PORTREVISION= 10
+DISTVERSION= 2.40
+MOZILLA_VER= 43 # above + 3
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
@@ -32,8 +31,8 @@
LIB_DEPENDS= libv4l2.so:multimedia/libv4l
-EM_VERSION= 1.9.1
-L_VERSION= 4.4
+EM_VERSION= 1.9.2
+L_VERSION= 4.5
SSP_UNSAFE= yes
USE_GECKO= gecko
Index: seamonkey/distinfo
===================================================================
--- seamonkey/distinfo (revision 421530)
+++ seamonkey/distinfo (working copy)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.39.source.tar.xz) =
c871de0a64cb60acf785df0ea3859b729353e5d1e3274947840386766859930e
-SIZE (seamonkey-2.39.source.tar.xz) = 182627632
-SHA256 (enigmail-1.9.1.tar.gz) =
0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993
-SIZE (enigmail-1.9.1.tar.gz) = 1736876
+SHA256 (seamonkey-2.40.source.tar.xz) =
7ecccc039d03f38d197b123b59ea42eac4c0c10e4bdec779b3665d79b435fa01
+SIZE (seamonkey-2.40.source.tar.xz) = 193702432
+SHA256 (enigmail-1.9.2.tar.gz) =
81c92937911005a5b94956d6d330a6f4114ad91da2dc10137bb0a3cbafd0ca42
+SIZE (enigmail-1.9.2.tar.gz) = 1741350
Index: seamonkey/files/extra-patch-bug1125514
===================================================================
--- seamonkey/files/extra-patch-bug1125514 (revision 421530)
+++ seamonkey/files/extra-patch-bug1125514 (working copy)
@@ -1,11 +1,6 @@
-changeset: 258513:ffbd5f5f46f1
-user: Guilherme Goncalves <[email protected]>
-date: Thu Aug 20 10:05:29 2015 +0900
-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
+--- 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 @@
{
unsigned narenas;
size_t active, allocated, mapped, page, pdirty;
@@ -13,13 +8,12 @@
size_t lg_chunk;
// Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
-@@ -149,17 +150,19 @@ jemalloc_stats_impl(jemalloc_stats_t *st
+@@ -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);
@@ -27,10 +21,3 @@
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;
- }
Index: seamonkey/files/patch-bug1026499
===================================================================
--- seamonkey/files/patch-bug1026499 (revision 421530)
+++ seamonkey/files/patch-bug1026499 (working copy)
@@ -1,19 +1,6 @@
-commit 8d0efe4
-Author: Martin Husemann <[email protected]>
-Date: Wed Jun 18 18:12:22 2014 +0200
-
- 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')
+--- 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 @@
Type.VOIDPTR = Type('void', ptr=1)
class TypeArray(Node):
@@ -23,7 +10,6 @@
+ '''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)
@@ -30,11 +16,9 @@
class TypeEnum(Node):
def __init__(self, name=None):
-diff --git ipc/ipdl/ipdl/cxx/cgen.py ipc/ipdl/ipdl/cxx/cgen.py
-index 48b0988..bc914cf 100644
---- mozilla/ipc/ipdl/ipdl/cxx/cgen.py
-+++ mozilla/ipc/ipdl/ipdl/cxx/cgen.py
-@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor):
+--- 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 @@
def visitDecl(self, d):
# C-syntax arrays make code generation much more annoying
if isinstance(d.type, TypeArray):
@@ -42,7 +26,7 @@
d.type.basetype.accept(self)
else:
d.type.accept(self)
-@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor):
+@@ -114,7 +115,9 @@
if isinstance(d.type, TypeArray):
self.write('[')
d.type.nmemb.accept(self)
@@ -53,16 +37,3 @@
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|
Index: seamonkey/files/patch-bug702179
===================================================================
--- seamonkey/files/patch-bug702179 (revision 421530)
+++ seamonkey/files/patch-bug702179 (working copy)
@@ -1,9 +1,9 @@
--- mozilla/js/src/moz.build.orig 2015-10-29 22:17:54 UTC
+++ mozilla/js/src/moz.build
-@@ -613,7 +613,3 @@ CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+@@ -637,7 +637,3 @@
- if CONFIG['GNU_CXX']:
- FAIL_ON_WARNINGS = True
+ if not CONFIG['GNU_CXX']:
+ ALLOW_COMPILER_WARNINGS = True
-
-NO_EXPAND_LIBS = True
-
Index: seamonkey/files/patch-mozilla-dom-events-MessageEvent.h
===================================================================
--- seamonkey/files/patch-mozilla-dom-events-MessageEvent.h (revision
421530)
+++ seamonkey/files/patch-mozilla-dom-events-MessageEvent.h (working copy)
@@ -1,11 +1,10 @@
--- mozilla/dom/events/MessageEvent.h.orig 2015-11-04 02:56:28.000000000
+0100
+++ mozilla/dom/events/MessageEvent.h 2016-01-24 16:47:37.869781000 +0100
-@@ -16,9 +16,6 @@ namespace mozilla {
+@@ -16,8 +16,6 @@
namespace dom {
struct MessageEventInit;
-class MessagePort;
--class MessagePortBase;
-class MessagePortList;
class OwningWindowProxyOrMessagePortOrClient;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
