20 files changed, 208 insertions, 869 deletions

diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 6c4884ad29ac..1a6699917c1c 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.33b1
+DISTVERSION=	2.33
 CATEGORIES=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 
diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo
index a2819eea1e26..be11da4d2d32 100644
--- a/www/linux-seamonkey/distinfo
+++ b/www/linux-seamonkey/distinfo
@@ -1,5 +1,5 @@
-SHA256 (seamonkey-2.33b1.tar.bz2) = 58bec4bc4e0b8990b0fbaff9bb0ea50fb6f7f82f064ae46f365d6c17bd60a5a0
-SIZE (seamonkey-2.33b1.tar.bz2) = 41385948
+SHA256 (seamonkey-2.33.tar.bz2) = 1c78a3ddfe6b8ec52789834cb8f6b0a852f40f14f0d8b1c95fd75da514b557d0
+SIZE (seamonkey-2.33.tar.bz2) = 41449095
 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile
index e81f383f610a..4bab98821a56 100644
--- a/www/seamonkey-i18n/Makefile
+++ b/www/seamonkey-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey-i18n
-PORTVERSION=	2.32.1
+PORTVERSION=	2.33
 CATEGORIES=	www mail news editors irc
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo
index 75c2ecf4ccfe..830376caf346 100644
--- a/www/seamonkey-i18n/distinfo
+++ b/www/seamonkey-i18n/distinfo
@@ -1,54 +1,54 @@
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.be.langpack.xpi) = 071cf7e3711c812bd2d3476719b94bf45e8e2402500d228ef10c6f213ea94349
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.be.langpack.xpi) = 841561
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.ca.langpack.xpi) = 4c2892f0335fe766395a8eee4b5a98b01ae51dcd0a2185e917634e847cef2a75
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.ca.langpack.xpi) = 832918
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.cs.langpack.xpi) = 7b998b027629ee182440b2dd95c79794ce07df0613ff89a613818fa96fd3befc
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.cs.langpack.xpi) = 830453
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.de.langpack.xpi) = c28b1e9ac083ae1294d5506e0e42b6c96f966162edebf9d8ab0dcb531bdf2902
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.de.langpack.xpi) = 838043
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.en-GB.langpack.xpi) = 97b1a5cef9168cc9bb941513c9ea8b168d5ca8e8264884f3d08dd1b14a6e4d8e
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.en-GB.langpack.xpi) = 804020
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.en-US.langpack.xpi) = 4af4c1cd08222a9730d78d954ac702b41f2f1e8aeac81da27e2ae6e2ce706d72
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.en-US.langpack.xpi) = 803487
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.es-AR.langpack.xpi) = 5572f847020ce7c910abd4b646e8ec058f285809cb63621a1d1d128d4779d96b
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.es-AR.langpack.xpi) = 852547
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.es-ES.langpack.xpi) = 67005656af02b97dc755a06d75a9d068a71ac452803a6b30c9f09500a5a259ae
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.es-ES.langpack.xpi) = 829555
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.fi.langpack.xpi) = 92937c9396e9fbe6d1cb15a1acef3d17aa6e724f7cedf7e0cd1d5d66e2af1183
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.fi.langpack.xpi) = 799883
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.fr.langpack.xpi) = bc3be546d2aa5f12070352c40080fb31edf02ff56279d18db42f3d14b8810393
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.fr.langpack.xpi) = 810713
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.gl.langpack.xpi) = c89b93f62bdcd1ff3ff31080339a2f455231adf38008249e0001d14993291aa0
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.gl.langpack.xpi) = 814447
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.hu.langpack.xpi) = 33f6b3086a6245d8b0f3de6a357db81ca591e0b85138a4dc8141519f0d017aed
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.hu.langpack.xpi) = 844073
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.it.langpack.xpi) = 48c9538983c8b29990818ae1bfcb39fbe3da88d128c43f3368e9439cf7961853
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.it.langpack.xpi) = 742071
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.ja-JP-mac.langpack.xpi) = a5c3318a722d58763f78bf2617674611b5863169f06e99d3270332d51a0cca85
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.ja-JP-mac.langpack.xpi) = 900394
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.ja.langpack.xpi) = a697fb1fddbce8770b14ca4a31f8f3665ae914ad80719380c5d2c6747b2fa921
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.ja.langpack.xpi) = 884923
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.lt.langpack.xpi) = 65e7e22d708dfc016ef74d882149eccc7b03d762a3ebd59c3dd47843c47f4b82
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.lt.langpack.xpi) = 852679
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.nb-NO.langpack.xpi) = a524ad1fb47598064e29f1423efba61bb8126b6fb6926481faacc75b72604f37
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.nb-NO.langpack.xpi) = 822960
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.nl.langpack.xpi) = afedca958633a8c2b83a761f17dea920676620aa9399c7904fbafa09b7e3d122
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.nl.langpack.xpi) = 796643
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.pl.langpack.xpi) = 2ba516038a5e39245a5289895a86eef243475db9666964d6b70e4bd743245e1d
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.pl.langpack.xpi) = 868115
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.pt-PT.langpack.xpi) = e006cd617032451f72a027fe47df21da8e12ab3b3e113ef068089cdce19416c9
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.pt-PT.langpack.xpi) = 833785
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.ru.langpack.xpi) = 496ba265bf476968386d0c695f1e293dc8c0e915e7be2fb2047bc299d4744e75
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.ru.langpack.xpi) = 899662
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.sk.langpack.xpi) = c91f47301af4a3292fc70d7a40c3562324eef2c8753b6dd8aa94e8359047deda
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.sk.langpack.xpi) = 857466
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.sv-SE.langpack.xpi) = 6499664d7a552b39268088dd6caffc26288f4d01a4d0fff20dfad5c8e3c4241a
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.sv-SE.langpack.xpi) = 825106
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.tr.langpack.xpi) = c3bc4b8e84748f218b86bc8027b083e5871ba884c1ed299970f65d86dd44a125
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.tr.langpack.xpi) = 811616
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.uk.langpack.xpi) = fe04a413ef5fdd99993779715f23477a60d669da45c91700c85010137d5b33c9
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.uk.langpack.xpi) = 873320
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.zh-CN.langpack.xpi) = 3cfde96f15c7d5163ae23367deebfa065ca44fab83944a0b1323e65f3947a7f7
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.zh-CN.langpack.xpi) = 834253
-SHA256 (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.zh-TW.langpack.xpi) = 00817a69bc711d80d7c457b2bdcac8e468c6858b3f09529e228aea10827fabac
-SIZE (xpi/seamonkey-i18n-2.32.1/seamonkey-2.32.1.zh-TW.langpack.xpi) = 860366
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.be.langpack.xpi) = 2238efdbdab78bb9bf861f7b2fa066a87f68e44aeb91706d1e37acb48594d064
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.be.langpack.xpi) = 842835
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.ca.langpack.xpi) = 96e1981251e18c6c4dc668f72ddc6e319eefe6c374ffb5b742b22ff108304647
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.ca.langpack.xpi) = 834198
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.cs.langpack.xpi) = 9c586aca5be7f6d0bf19aa42d46e42a6db7bf788ea631bc4ec783412a54d6717
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.cs.langpack.xpi) = 831809
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.de.langpack.xpi) = b29e6e87976af82d896c66412e0d0f6b6c5e70d59e2748d20cf03247046d148b
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.de.langpack.xpi) = 838260
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.en-GB.langpack.xpi) = ac5ccb724c7f181f517570896e78c93f6030db25047384f761923e3dc0958cc5
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.en-GB.langpack.xpi) = 804287
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.en-US.langpack.xpi) = e1f6844ee0c64b34ff45e1a171056d2bd21caaeb1709d4956a9d496d9d3c240a
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.en-US.langpack.xpi) = 803778
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.es-AR.langpack.xpi) = 98aa814d47318f553c6e14579ebef225c0b3b9f5c15197cdb174c0f9c89bca5b
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.es-AR.langpack.xpi) = 852872
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.es-ES.langpack.xpi) = 99d5830151dfee802a82ce5227968ba72cfc7d381c052f16468248abc1f74e6e
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.es-ES.langpack.xpi) = 830036
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.fi.langpack.xpi) = 39098fbfcf13c0b32b4b38984883c24c75b03b85f9e377ce4438535177a9a73d
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.fi.langpack.xpi) = 801205
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.fr.langpack.xpi) = 13c40276cc42208018d6fd6b60c4b9d4e1cbc7e3030222761ef932d803eca0d3
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.fr.langpack.xpi) = 812073
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.gl.langpack.xpi) = 1330db68b2f23f5d3917c1695a5a0ee75eefc214d8b7490159adbcba92c94870
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.gl.langpack.xpi) = 815202
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.hu.langpack.xpi) = ed69c27316abc24b43abb4765754e9bf474ea8e18655f245c39f74c1ab4d2bf2
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.hu.langpack.xpi) = 844134
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.it.langpack.xpi) = 1ed902239e5146aedce464c8b9f37596e277a4d33af10ff9fa46b2f41d6b4d1b
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.it.langpack.xpi) = 742286
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.ja-JP-mac.langpack.xpi) = 8342d5a496ae788b96a9ccb277add6197f2edcd4da6e399186c0723c12b4bec6
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.ja-JP-mac.langpack.xpi) = 901809
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.ja.langpack.xpi) = 5160585f6516777b8940ecec944993dfcbe2d73e817a8be67b9e3adaa9b16a93
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.ja.langpack.xpi) = 886324
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.lt.langpack.xpi) = ee9157d4358da464f381b64cf682dd326c533c141ba4c2e766221eab82216b52
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.lt.langpack.xpi) = 853979
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.nb-NO.langpack.xpi) = 07d5d40165602d84506d24ef5b448a9355ce22b3d3442d43562de5fe975ed1da
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.nb-NO.langpack.xpi) = 824262
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.nl.langpack.xpi) = f638771efb6c753a8a2e26387ba4148aff57a59c6f37afa0d271c127541627ac
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.nl.langpack.xpi) = 796769
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.pl.langpack.xpi) = f65b8fc6af1c3018da08b18a95cd2390104fdf6b10f3e05b1dc42c113e713937
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.pl.langpack.xpi) = 867981
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.pt-PT.langpack.xpi) = cf1a24afa80c185b933117eb1b783578a48da29488c50b7eded66aa5032d6805
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.pt-PT.langpack.xpi) = 834973
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.ru.langpack.xpi) = 5f36f54bc96cf39e0a89b7fc508d183f7f5a2a653040d0b27ccd3148e42416ff
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.ru.langpack.xpi) = 899955
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.sk.langpack.xpi) = 5aa47c412e5172eba4e36d13f9b2e3d8047036b6faa868d5cf718787daa329cc
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.sk.langpack.xpi) = 857562
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.sv-SE.langpack.xpi) = a90aa9049da48775315ef9aaf491f35c9ea081970a2b960c399abc2a10345414
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.sv-SE.langpack.xpi) = 826422
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.tr.langpack.xpi) = eaa9eb06f9fd71475ae141806a5a4013b09ff751700db3440273f6543316fcd3
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.tr.langpack.xpi) = 812396
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.uk.langpack.xpi) = 5d5a3cdcc3fa2d97a0cedc418e00d9007fabe4b91d86f6c46be5a1237fb05278
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.uk.langpack.xpi) = 874104
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.zh-CN.langpack.xpi) = de3c78fa58095989d6fa6e43e8b45323424d6aa36bd847e6705235fb961c215f
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.zh-CN.langpack.xpi) = 834420
+SHA256 (xpi/seamonkey-i18n-2.33/seamonkey-2.33.zh-TW.langpack.xpi) = f1b1f80db15bce7858543175a1d9af401abeaa86fedfcf1c0c5c9e506dd27817
+SIZE (xpi/seamonkey-i18n-2.33/seamonkey-2.33.zh-TW.langpack.xpi) = 860685
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index a3da1436a70c..e83e8cb85d92 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.32.1
-PORTREVISION=	1
+DISTVERSION=	2.33
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -14,7 +13,7 @@ MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
 BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
-		nss>=3.17.2:${PORTSDIR}/security/nss \
+		nss>=3.17.3:${PORTSDIR}/security/nss \
 		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
 		cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
 		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
@@ -23,7 +22,7 @@ BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
 		libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
 		opus>=1.1:${PORTSDIR}/audio/opus \
 		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
-		sqlite3>=3.8.6:${PORTSDIR}/databases/sqlite3 \
+		sqlite3>=3.8.7.4:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
@@ -33,7 +32,7 @@ BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 EM_VERSION=	1.7.2
-L_VERSION=	3.7
+L_VERSION=	3.8
 
 SSP_UNSAFE=	yes
 USE_GECKO=	gecko
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index fd51199e89d9..dd9e64e1a990 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.32.1.source.tar.bz2) = 45bcbfaeb3dd34800692ac1c4bcbf7f87e4c4fdcfebeb00bde9e3351a7ebaa85
-SIZE (seamonkey-2.32.1.source.tar.bz2) = 199617565
+SHA256 (seamonkey-2.33.source.tar.bz2) = eac4477cb4fb36663dc86c185da04e576b7d3df046d8c5352287518b4bd8e823
+SIZE (seamonkey-2.33.source.tar.bz2) = 203205893
 SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6
 SIZE (enigmail-1.7.2.tar.gz) = 1420346
diff --git a/www/seamonkey/files/patch-bug1021761 b/www/seamonkey/files/patch-bug1021761
index 7305ac77fee7..15c899907dd9 100644
--- a/www/seamonkey/files/patch-bug1021761
+++ b/www/seamonkey/files/patch-bug1021761
@@ -2,7 +2,7 @@ diff --git configure.in configure.in
 index 48e60c0..ec08417 100644
 --- mozilla/configure.in
 +++ mozilla/configure.in
-@@ -5438,6 +5438,60 @@ fi
+@@ -5591,6 +5591,67 @@ fi
  AC_SUBST(MOZ_WEBM_ENCODER)
  
  dnl ==================================
@@ -16,33 +16,40 @@ index 48e60c0..ec08417 100644
 +    ;;
 +esac
 +
-+MOZ_ARG_DISABLE_BOOL(oss,
-+[  --disable-oss           Disable OpenSoundSystem support],
-+   MOZ_OSS=,
-+   MOZ_OSS=1)
++MOZ_ARG_WITH_STRING(oss,
++[  --with-oss[=PFX]        Enable OpenSoundSystem support [installed at prefix PFX]],
++   OSSPREFIX=$withval)
++
++if test -n "$OSSPREFIX"; then
++    if test "$OSSPREFIX" != "no"; then
++        MOZ_OSS=1
++    else
++        MOZ_OSS=
++    fi
++fi
 +
 +_SAVE_CFLAGS=$CFLAGS
 +_SAVE_LIBS=$LIBS
 +if test -n "$MOZ_OSS"; then
 +    dnl Prefer 4Front implementation
 +    AC_MSG_CHECKING([MOZ_OSS_CFLAGS])
-+    if test -z "$MOZ_OSS_CFLAGS"; then
-+        for oss_conf in /etc/oss.conf /usr/local/etc/oss.conf; do
-+            if test -e "$oss_conf"; then
-+                . "$oss_conf"
-+            fi
-+        done
++    if test "$OSSPREFIX" != "yes"; then
++        oss_conf=${OSSPREFIX%/usr}/etc/oss.conf
++        if test -f "$oss_conf"; then
++            . "$oss_conf"
++        else
++            OSSLIBDIR=$OSSPREFIX/lib/oss
++        fi
 +        if test -d "$OSSLIBDIR"; then
-+            MOZ_OSS_CFLAGS="-I$OSSLIBDIR/include"
++            MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include"
 +        fi
 +    fi
 +    AC_MSG_RESULT([$MOZ_OSS_CFLAGS])
 +
 +    CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS"
-+    MOZ_CHECK_HEADERS(sys/soundcard.h linux/soundcard.h soundcard.h)
++    MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h)
 +
 +    if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \
-+            "$ac_cv_header_linux_soundcard_h" != "yes" -a \
 +            "$ac_cv_header_soundcard_h" != "yes"; then
 +        AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET.  Disable with --disable-ogg --disable-wave --disable-webm.])
 +    fi
@@ -50,7 +57,7 @@ index 48e60c0..ec08417 100644
 +    dnl Assume NetBSD implementation over SunAudio
 +    AC_CHECK_LIB(ossaudio, _oss_ioctl,
 +        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound")
-+         MOZ_OSS_LIBS="-lossaudio"])
++         MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"])
 +fi
 +CFLAGS=$_SAVE_CFLAGS
 +LIBS=$_SAVE_LIBS
@@ -63,30 +70,6 @@ index 48e60c0..ec08417 100644
  dnl = Check alsa availability on Linux
  dnl ==================================
  
-@@ -5451,12 +5505,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
-    MOZ_ALSA=1,
-    MOZ_ALSA=)
- 
-+MOZ_ARG_DISABLE_BOOL(alsa-dlopen,
-+[  --disable-alsa-dlopen   Disable runtime linking of libasound.so],
-+   DISABLE_LIBASOUND_DLOPEN=1,
-+   DISABLE_LIBASOUND_DLOPEN=)
-+
- if test -n "$MOZ_ALSA"; then
-     PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
-          [echo "$MOZ_ALSA_PKG_ERRORS"
-           AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
- fi
- 
-+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then
-+    AC_DEFINE(DISABLE_LIBASOUND_DLOPEN)
-+else
-+    MOZ_ALSA_LIBS=
-+fi
-+
- AC_SUBST(MOZ_ALSA)
- 
- dnl ========================================================
 diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS
 index b441e8a..950d9e5 100644
 --- mozilla/media/libcubeb/AUTHORS
@@ -660,7 +643,7 @@ new file mode 100644
 index 0000000..5e38e27
 --- /dev/null
 +++ mozilla/media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,404 @@
+@@ -0,0 +1,402 @@
 +/*
 + * Copyright © 2014 Mozilla Foundation
 + *
@@ -669,8 +652,6 @@ index 0000000..5e38e27
 + */
 +#if defined(HAVE_SYS_SOUNDCARD_H)
 +#include <sys/soundcard.h>
-+#elif defined(HAVE_LINUX_SOUNDCARD_H)
-+#include <linux/soundcard.h>
 +#else
 +#include <soundcard.h>
 +#endif
@@ -1089,17 +1070,33 @@ index 8b7a0dd..31212ce 100644
 +CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
  CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
  CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
+diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build
+index 991f03f..3d99eb5 100644
+--- mozilla/media/webrtc/signaling/test/moz.build
++++ mozilla/media/webrtc/signaling/test/moz.build
+@@ -112,8 +112,8 @@ if CONFIG['JS_SHARED_LIBRARY']:
+ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
+ OS_LIBS += CONFIG['REALTIME_LIBS']
+ 
+-if CONFIG['MOZ_ALSA']:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
++if CONFIG['MOZ_OSS']:
++    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
+ 
+ if CONFIG['MOZ_NATIVE_JPEG']:
+     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
 diff --git toolkit/library/moz.build toolkit/library/moz.build
 index e191f13..4fb268a 100644
 --- mozilla/toolkit/library/moz.build
 +++ mozilla/toolkit/library/moz.build
-@@ -239,6 +239,9 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
  if not CONFIG['MOZ_TREE_PIXMAN']:
      OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
  
+-if CONFIG['MOZ_ALSA']:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
 +if CONFIG['MOZ_OSS']:
 +    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
-+
- if CONFIG['MOZ_ALSA']:
-     OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
  
+ if CONFIG['HAVE_CLOCK_MONOTONIC']:
+     OS_LIBS += CONFIG['REALTIME_LIBS']
diff --git a/www/seamonkey/files/patch-bug1041795 b/www/seamonkey/files/patch-bug1041795
deleted file mode 100644
index 5164776bdde7..000000000000
--- a/www/seamonkey/files/patch-bug1041795
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git config/rules.mk config/rules.mk
-index 4d67eda..783942f 100644
---- mozilla/config/rules.mk
-+++ mozilla/config/rules.mk
-@@ -858,7 +858,7 @@ ifdef DTRACE_PROBE_OBJ
- ifndef DTRACE_LIB_DEPENDENT
- NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS))
- $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS)
--	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
-+	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
- endif
- endif
- endif
-@@ -876,7 +876,7 @@ ifndef INCREMENTAL_LINKER
- endif
- ifdef DTRACE_LIB_DEPENDENT
- ifndef XP_MACOSX
--	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
-+	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
- endif
- 	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
- 	@$(RM) $(DTRACE_PROBE_OBJ)
-diff --git js/src/Makefile.in js/src/Makefile.in
-index 28ca5e8..96793d7 100644
---- mozilla/js/src/Makefile.in
-+++ mozilla/js/src/Makefile.in
-@@ -342,7 +342,7 @@ endif
- 
- ifdef HAVE_DTRACE
- $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
--	dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
-+	dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
- 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
- 	    -e '/const/!s/char \*/const char */g' \
- 	    javascript-trace.h.in > javascript-trace.h
-diff --git probes/Makefile.in probes/Makefile.in
-index 6d18f34..deec83f 100644
---- mozilla/probes/Makefile.in
-+++ mozilla/probes/Makefile.in
-@@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h
- 
- # Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE
- $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile
--	dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
-+	dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
- 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
- 	    mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h
- 	rm mozilla-trace.h.tmp
diff --git a/www/seamonkey/files/patch-bug1061736 b/www/seamonkey/files/patch-bug1061736
deleted file mode 100644
index 4d8925a04f6a..000000000000
--- a/www/seamonkey/files/patch-bug1061736
+++ /dev/null
@@ -1,50 +0,0 @@
-commit a7add79
-Author: Gavin Sharp <gavin@gavinsharp.com>
-Date:   Mon Oct 27 18:43:51 2014 -0700
-
-    Bug 1061736: add DuckDuckGo as a search engine option in Firefox. r=dolske
----
- browser/locales/Makefile.in                 |  2 +-
- browser/locales/en-US/searchplugins/ddg.xml | 21 +++++++++++++++++++++
- 2 files changed, 22 insertions(+), 1 deletion(-)
-
-diff --git browser/locales/Makefile.in browser/locales/Makefile.in
-index eb3c30b..b172876 100644
---- suite/locales/Makefile.in
-+++ suite/locales/Makefile.in
-@@ -118,7 +118,7 @@ libs:: $(addprefix generic/profile/,$(PR
- libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
- 
--SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt))
-+SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt)) ddg
- 
- libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
-diff --git browser/locales/en-US/searchplugins/ddg.xml browser/locales/en-US/searchplugins/ddg.xml
-new file mode 100644
-index 0000000..d68deb4
---- /dev/null
-+++ suite/locales/en-US/searchplugins/ddg.xml
-@@ -0,0 +1,21 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> 
-+  <ShortName>DuckDuckGo</ShortName> 
-+  <Description>Search DuckDuckGo</Description> 
-+  <InputEncoding>UTF-8</InputEncoding> 
-+  <Image height="16" width="16">data:image/icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA11RgALs6oACbQ9wAj0v8AI9L/ACfQ9wAu0agANdUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzzN4CNdL/oK/z//////////////////////+jsPv/BDXX/wAz0t4AAAAAAAAAAAAAAAAAAAAAAAAAAAAyzvNSduD//////8jK/v+P+Lf/IbQL/17RPP+J3Y//wOKX//////9YeuX/ADLO8wAAAAAAAAAAAAAAAAAw091piOX/8/X9/1Fx5P9xhu//WOWZ/0W9Lv9Lwjn/J8BB/xyDAP9bdfL/9fP//2mI5v8AMNPdAAAAAAc610YRQ9f//////0Zr4P8AGdD/sb32////////////wrv//wAh1/8MPab/ACPc/05r4///////EkPX/wc610YANtWkrr/y/6S48P8AJ9L/AB3R/+/w/v///////////3+D7f8AQeL/AYTw/wFr5/8AMNb/p7Tv/6698v8AM9WkADLW//////8yXt//AC3V/wAw1/////////////z///8A0P7/AKb1/wWI7P8AuPf/AJ3w/zZW3P//////ADHV/wAx2P//////AzrZ/wAu1/84ZOL////////////e////AND//wC1+f8Atff/AZbv/wY62f8ELNf//////wAw1/8AMtn//////wAw2f8ALNn/kKrz////+//cwbH////////////R////Rcb8/wDO/f8A/P//AHzo//////8AMNj/ADXa//////8vXuL/ACna/4yq9///79T/jUkg/9i+r///////r2Q0/7Cozv8BKdr/AirY/zdZ4P//////ADTa/wI72tOuv/T/prr0/wAl2v+JqPb//7yW/+bUxv/9+/n////u//W+n/+Op/L/ADPd/wAv2v+ru/T/r7/0/wI72tMLQd1DEEjg//////9Cbef/ADng///////////////////////R3///AC3g/wAy3v9SeOn//////xFI4P8LQd1DAAAAAAM64PNmiuz/9/j//2mN7f/m7P3///////////9Cb+n/ACXd/wAt3v9rju3//////2iL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/P8J0vz/ELDz/xt85v8mSdj/JknY/yZJ2P8lStowJUjXYCZJ2P8nSdhwJErZryZK2f8oSNcgJUnajyZK2f8mStn/JkrZ/yZK2f8mStn/iJPA////////////////////////////0ff+/xjV/P8J0vz/Drn1/xiO6/8Yjuv/GI7r/xCw8/8Lyvr/CdL8/xmF6P8mStn/JkrZ/yVJ2o8oSNcgJkrZ/yRK2a8jStrfI0rZ3wAAAAAlSdq/Jkra/yZK2v8mStr/Jkra/yZK2v+xtsf///////////////////////////8o2Pz/CdL8/wvK+v8mStr/Jkra/yZK2v8mStr/Jkra/yZK2v8iW97/Jkra/yZK2v8mStr/JUnavwAAAAAjStnfI0ra3yZK2v8lSdq/AAAAACZH2O8mStr/Jkra/yZK2v8mStr/L1HY/9HR0f///////////////////////////yjY/P8J0vz/CdL8/xCw9P8QsPT/ELD0/xSf7/8ddeX/Jkra/yZK2v8mStr/Jkra/yZK2v8mR9jvAAAAACVJ2r8mStr/Jkvb/yVJ2r8AAAAAJkvb/yZL2/8mS9v/Jkvb/yZL2/9KZtL/4+Pj////////////////////////////4Pn//0fd/f8J0vz/CdL8/wnS/P8J0vz/CdL8/wnS/P8Lyvr/Fpfu/yJc3/8mS9v/Jkvb/yZL2/8AAAAAJUnavyZL2/8mS9z/JUncvwAAAAAmS9z/Jkvc/yZL3P8mS9z/Jkvc/26AyP/x8fH//////////////////////////////////////9H3/v/C9P7/o+7+/2fa+/8Oufb/CdL8/wnS/P8J0vz/CdL8/xiP7P8mS9z/Jkvc/wAAAAAlSdy/Jkvc/yZM3P8lTNy/AAAAACZJ2e8mTNz/Jkzc/yZM3P8mTNz/iJTB////////////qnth/5VaOf/x6eX///////////////////////Hp5f/x6eX/ydL2/yZM3P8kVN7/G37o/xKo8v8QsfT/HXbm/yZM3P8mSdnvAAAAACVM3L8mTNz/I0vc3yZJ2u8AAAAAJUzevyZM3f8mTN3/Jkzd/yZM3f+fqc3///////////+VWjn/v5yI/+re1///////////////////////jk8s/7iRe//J0vb/Jkzd/yZM3f8mTN3/Jkzd/yZM3f8mTN3/Jkzd/yVM3r8AAAAAI0vc3yNL3N8kTd2vJk3d/yhQ3yAlTd2PJk3d/yZN3f8mTd3/Jk3d/6St0v////////////Hp5f/q3tf///////////////////////////+xhm7/49PK/6Cx8P8mTd3/Jk3d/yZN3f8mTd3/Jk3d/yZN3f8mTd3/JU3djyhQ3yAmTd3/JE3drydN33AmTd7/J03fcCVK3zAmTd7/Jk3e/yZN3v8mTd7/pK7S///////Sp5r/////////////////////////////////////////////////T27k/yZN3v8mTd7/Jk3e/yZN3v8mTd7/Jk3e/yZN3v8lSt8wJ03fcCZN3v8nTd9wKFDfICZO3/8mTt3PAAAAACVN3r8mTt//Jk7f/yZO3/+EltX//////+fRyv/SqaD/59LO///////////////////////at63/vIBy/7Glxf8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8mTt//JU3evwAAAAAmTt3PJk7f/yhQ3yAAAAAAJE/dryZO3/8oUN9AKFDfQCZO3/8mTt//Jk7f/zhb2v/o6/T/////////////////////////////////////////////////XHrn/yZO3/8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8oUN9AKFDfQCZO3/8kT92vAAAAAAAAAAAoUN9AJk7g/yZO4M8AAAAAJk/hnyZO4P8mTuD/Jk7g/05v5v/k6fv//////////////////////////////////////3eR7P8mTuD/Jk7g/yZO4P8mTuD/Jk7g/yZO4P8mTuD/Jk/hnwAAAAAmTuDPJk7g/yhQ30AAAAAAAAAAAAAAAAAjT+GfJU/h/yVO4Y8gUN8QIk7gzyVP4f8lT+H/SWnW/0lp1v+bq+H/8fHx/////////////////6Cy8v9OcOb/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yJO4M8gUN8QJU7hjyVP4f8jT+GfAAAAAAAAAAAAAAAAAAAAACBQ3xAlTOHvJU/h/yVQ4mAgUN8QIk7hzyVP4f+ktOv///////////////////////H0/f9phur/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yVP4f8iTuHPIFDfECVQ4mAlT+H/JUzh7yBQ3xAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ3zAlUOLvJVDi/yVQ4mAgUN8QI1Din4mb2//J0/j/ydP4/6299P93ku3/M1vk/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/I1DinyBQ3xAlUOJgJVDi/yVQ4u8lUN8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAlUOLvJVDi/yVQ4o8AAAAAJFDjQCVQ4r8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDivyRQ40AAAAAAJVDijyVQ4v8lUOLvJVDkMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAjUeTfJVHj/yNR5N8kUONAAAAAACVQ5DAmUuOAJVHivyNR5N8lUeP/JVHj/yNR5N8lUeK/JlLjgCVQ5DAAAAAAJFDjQCNR5N8lUeP/I1Hk3yVQ5DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBQ3xAjUuSfJVHk/yVR5P8jUeTfJFLkcChQ5yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoUOcgJFLkcCNR5N8lUeT/JVHk/yNS5J8gUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkUONAI1LknyVS5P8lUuT/JVLk/yVS5O8lUeS/JVHkvyVR5L8lUeS/JVLk7yVS5P8lUuT/JVLk/yRS468kUONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFDfECVS5GAjUuWfIlPlzyVS5f8lUuX/JVLl/yVS5f8iU+XPI1LlnyVS5GAgUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/ggBB/wgAEP4AAAB8AAAAPAAAADiAAAEYAAAAEQAAAIAAAAAAAAAAAgAAAEIAAABCAAAAQgAAAEIAAABCAAAAQAAAAAAAAAABAAAAiAAAABiAAAEcAAAAPAAAAD4AAAB/CAAQ/4IAQf/AfgP/8AAP//wAP/</Image>
-+  <Image height="26" width="65">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAaCAYAAADovjFxAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxRTYyNzYzMzFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxRTYyNzYzMjFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDE4MDExNzQwNzIwNjgxMTg3MUZCQUIxMEI4RjU1NzYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3Jp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</Image>
-+  <Image height="52" width="130">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAA0CAYAAABGkOCVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo4RTdBNDY4ODFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4RTdBNDY4NzFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OTE3MzgzQ0I2QjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3Jp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</Image>
-+  <Url type="text/html" method="get" template="https://duckduckgo.com/">
-+    <Param name="q" value="{searchTerms}"/>
-+    <MozParam name="t" condition="purpose" purpose="contextmenu" value="ffcm"/>
-+    <MozParam name="t" condition="purpose" purpose="keyword"     value="ffab"/>
-+    <MozParam name="t" condition="purpose" purpose="searchbar"   value="ffsb"/>
-+    <MozParam name="t" condition="purpose" purpose="homepage"    value="ffhp"/>
-+    <MozParam name="t" condition="purpose" purpose="newtab"      value="ffnt"/>
-+  </Url>
-+  <Url type="application/x-suggestions+json" template="https://ac.duckduckgo.com/ac/">
-+    <Param name="q" value="{searchTerms}"/>
-+    <Param name="type" value="list"/>
-+  </Url>
-+</OpenSearchDescription> 
diff --git a/www/seamonkey/files/patch-bug1082199 b/www/seamonkey/files/patch-bug1082199
deleted file mode 100644
index e24fe4726c2c..000000000000
--- a/www/seamonkey/files/patch-bug1082199
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 258ec90
-Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
-Date:   Fri Oct 17 15:55:00 2014 +0200
-
-    Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium
----
- memory/build/mozjemalloc_compat.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 78bb13a..70265a7 100644
---- mozilla/memory/build/mozjemalloc_compat.c
-+++ mozilla/memory/build/mozjemalloc_compat.c
-@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats)
-   size_t active, allocated, mapped, page, pdirty;
-   size_t lg_chunk;
- 
-+  // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
-+  // src/ctl.c
-+  uint64_t epoch = 0;
-+  size_t esz = sizeof(epoch);
-+  int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz);
-+
-   CTL_GET("arenas.narenas", narenas);
-   CTL_GET("arenas.page", page);
-   CTL_GET("stats.active", active);
diff --git a/www/seamonkey/files/patch-bug1083461 b/www/seamonkey/files/patch-bug1083461
deleted file mode 100644
index 8b8031a6cb2a..000000000000
--- a/www/seamonkey/files/patch-bug1083461
+++ /dev/null
@@ -1,159 +0,0 @@
-commit 87f367b
-Author: L. David Baron <dbaron@dbaron.org>
-Date:   Sun Oct 19 23:31:39 2014 -0400
-
-    Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers.  r=bzbarsky
-    
-    --HG--
-    extra : transplant_source : %CD%5D%9BE%FE%DE%A4%F2%B8%CF%D7%AE%84%90%3B%E8%A0d%D7%2B
----
- layout/style/StyleAnimationValue.cpp |  6 ++++--
- layout/style/nsCSSValue.cpp          | 28 ++++++++++++++++------------
- layout/style/nsCSSValue.h            | 22 ++++++++++++++++------
- 3 files changed, 36 insertions(+), 20 deletions(-)
-
-diff --git layout/style/StyleAnimationValue.cpp layout/style/StyleAnimationValue.cpp
-index 40bc8bf..1898fe6 100644
---- mozilla/layout/style/StyleAnimationValue.cpp
-+++ mozilla/layout/style/StyleAnimationValue.cpp
-@@ -3851,11 +3851,13 @@ StyleAnimationValue::operator==(const StyleAnimationValue& aOther) const
-     case eUnit_Filter:
-     case eUnit_Shadow:
-     case eUnit_BackgroundPosition:
--      return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList;
-+      return nsCSSValueList::Equal(mValue.mCSSValueList,
-+                                   aOther.mValue.mCSSValueList);
-     case eUnit_Transform:
-       return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList;
-     case eUnit_CSSValuePairList:
--      return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList;
-+      return nsCSSValuePairList::Equal(mValue.mCSSValuePairList,
-+                                       aOther.mValue.mCSSValuePairList);
-     case eUnit_UnparsedString:
-       return (NS_strcmp(GetStringBufferValue(),
-                         aOther.GetStringBufferValue()) == 0);
-diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp
-index dcb8496..fefb4f9 100644
---- mozilla/layout/style/nsCSSValue.cpp
-+++ mozilla/layout/style/nsCSSValue.cpp
-@@ -264,13 +264,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const
-       return *mValue.mRect == *aOther.mValue.mRect;
-     }
-     else if (eCSSUnit_List == mUnit) {
--      return *mValue.mList == *aOther.mValue.mList;
-+      return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList);
-     }
-     else if (eCSSUnit_SharedList == mUnit) {
-       return *mValue.mSharedList == *aOther.mValue.mSharedList;
-     }
-     else if (eCSSUnit_PairList == mUnit) {
--      return *mValue.mPairList == *aOther.mValue.mPairList;
-+      return nsCSSValuePairList::Equal(mValue.mPairList,
-+                                       aOther.mValue.mPairList);
-     }
-     else if (eCSSUnit_GridTemplateAreas == mUnit) {
-       return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas;
-@@ -1875,13 +1876,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult,
-   }
- }
- 
--bool
--nsCSSValueList::operator==(const nsCSSValueList& aOther) const
-+/* static */ bool
-+nsCSSValueList::Equal(const nsCSSValueList* aList1,
-+                      const nsCSSValueList* aList2)
- {
--  if (this == &aOther)
-+  if (aList1 == aList2) {
-     return true;
-+  }
- 
--  const nsCSSValueList *p1 = this, *p2 = &aOther;
-+  const nsCSSValueList *p1 = aList1, *p2 = aList2;
-   for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) {
-     if (p1->mValue != p2->mValue)
-       return false;
-@@ -1934,8 +1937,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult
- bool
- nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const
- {
--  return !mHead == !aOther.mHead &&
--         (!mHead || *mHead == *aOther.mHead);
-+  return nsCSSValueList::Equal(mHead, aOther.mHead);
- }
- 
- size_t
-@@ -2148,13 +2150,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty,
-   }
- }
- 
--bool
--nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const
-+/* static */ bool
-+nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1,
-+                          const nsCSSValuePairList* aList2)
- {
--  if (this == &aOther)
-+  if (aList1 == aList2) {
-     return true;
-+  }
- 
--  const nsCSSValuePairList *p1 = this, *p2 = &aOther;
-+  const nsCSSValuePairList *p1 = aList1, *p2 = aList2;
-   for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) {
-     if (p1->mXValue != p2->mXValue ||
-         p1->mYValue != p2->mYValue)
-diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h
-index 8418a2d..f0c4e63 100644
---- mozilla/layout/style/nsCSSValue.h
-+++ mozilla/layout/style/nsCSSValue.h
-@@ -871,9 +871,8 @@ struct nsCSSValueList {
-   void AppendToString(nsCSSProperty aProperty, nsAString& aResult,
-                       nsCSSValue::Serialization aValueSerialization) const;
- 
--  bool operator==(nsCSSValueList const& aOther) const;
--  bool operator!=(const nsCSSValueList& aOther) const
--  { return !(*this == aOther); }
-+  static bool Equal(const nsCSSValueList* aList1,
-+                    const nsCSSValueList* aList2);
- 
-   size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
- 
-@@ -886,6 +885,12 @@ private:
-   {
-     MOZ_COUNT_CTOR(nsCSSValueList);
-   }
-+
-+  // We don't want operator== or operator!= because they wouldn't be
-+  // null-safe, which is generally what we need.  Use |Equal| method
-+  // above instead.
-+  bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE;
-+  bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE;
- };
- 
- // nsCSSValueList_heap differs from nsCSSValueList only in being
-@@ -1264,9 +1269,8 @@ struct nsCSSValuePairList {
-   void AppendToString(nsCSSProperty aProperty, nsAString& aResult,
-                       nsCSSValue::Serialization aValueSerialization) const;
- 
--  bool operator==(const nsCSSValuePairList& aOther) const;
--  bool operator!=(const nsCSSValuePairList& aOther) const
--  { return !(*this == aOther); }
-+  static bool Equal(const nsCSSValuePairList* aList1,
-+                    const nsCSSValuePairList* aList2);
- 
-   size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
- 
-@@ -1280,6 +1284,12 @@ private:
-   {
-     MOZ_COUNT_CTOR(nsCSSValuePairList);
-   }
-+
-+  // We don't want operator== or operator!= because they wouldn't be
-+  // null-safe, which is generally what we need.  Use |Equal| method
-+  // above instead.
-+  bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE;
-+  bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE;
- };
- 
- // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being
diff --git a/www/seamonkey/files/patch-bug1122547 b/www/seamonkey/files/patch-bug1122547
new file mode 100644
index 000000000000..1ccacf9ce842
--- /dev/null
+++ b/www/seamonkey/files/patch-bug1122547
@@ -0,0 +1,20 @@
+diff --git media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
+index e68a104..a090241 100644
+--- mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
++++ mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
+@@ -159,12 +159,13 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(
+   // Assume that render timing errors are due to changes in the video stream.
+   if (next_render_time_ms < 0) {
+     timing_error = true;
+-  } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) {
++  } else if (std::abs(static_cast<int>(next_render_time_ms - now_ms)) >
++             max_video_delay_ms_) {
+     WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding,
+                  VCMId(vcm_id_, receiver_id_),
+                  "This frame is out of our delay bounds, resetting jitter "
+                  "buffer: %d > %d",
+-                 static_cast<int>(std::abs(next_render_time_ms - now_ms)),
++                 std::abs(static_cast<int>(next_render_time_ms - now_ms)),
+                  max_video_delay_ms_);
+     timing_error = true;
+   } else if (static_cast<int>(timing_->TargetVideoDelay()) >
diff --git a/www/seamonkey/files/patch-bug1122586 b/www/seamonkey/files/patch-bug1122586
deleted file mode 100644
index 1d130ca76770..000000000000
--- a/www/seamonkey/files/patch-bug1122586
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp
-index 36a6ccf..96d3bd0 100644
---- mozilla/content/media/MediaDecoderStateMachine.cpp
-+++ mozilla/content/media/MediaDecoderStateMachine.cpp
-@@ -18,6 +18,7 @@
- #include "nsTArray.h"
- #include "MediaDecoder.h"
- #include "MediaDecoderReader.h"
-+#include "mozilla/MathAlgorithms.h"
- #include "mozilla/mozalloc.h"
- #include "VideoUtils.h"
- #include "mozilla/dom/TimeRanges.h"
-@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS,
- // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration
- // less than this are ignored, as they're assumed to be the result of
- // instability in the duration estimation.
--static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
-+static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
- 
- static TimeDuration UsecsToDuration(int64_t aUsecs) {
-   return TimeDuration::FromMicroseconds(aUsecs);
-@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration)
-   AssertCurrentThreadInMonitor();
-   int64_t duration = GetDuration();
-   if (aDuration != duration &&
--      std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
-+      mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
-     SetDuration(aDuration);
-     nsCOMPtr<nsIRunnable> event =
-       NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged);
diff --git a/www/seamonkey/files/patch-bug1128161 b/www/seamonkey/files/patch-bug1128161
new file mode 100644
index 000000000000..56349a2ea252
--- /dev/null
+++ b/www/seamonkey/files/patch-bug1128161
@@ -0,0 +1,28 @@
+commit 6af7f0e6
+Author: Chris Double <chris.double@double.co.nz>
+Date:   Tue Feb 3 11:20:17 2015 +1300
+
+    Bug 1128161 - Fix build error when logging is disabled - r=ajones
+---
+ dom/media/mediasource/MediaSourceUtils.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git dom/media/mediasource/MediaSourceUtils.cpp dom/media/mediasource/MediaSourceUtils.cpp
+index 44a40f5..83bba60 100644
+--- mozilla/dom/media/mediasource/MediaSourceUtils.cpp
++++ mozilla/dom/media/mediasource/MediaSourceUtils.cpp
+@@ -11,7 +11,6 @@
+ 
+ namespace mozilla {
+ 
+-#if defined(PR_LOGGING)
+ nsCString
+ DumpTimeRanges(dom::TimeRanges* aRanges)
+ {
+@@ -31,6 +30,5 @@ DumpTimeRanges(dom::TimeRanges* aRanges)
+ 
+   return dump;
+ }
+-#endif
+ 
+ } // namespace mozilla
diff --git a/www/seamonkey/files/patch-bug847568 b/www/seamonkey/files/patch-bug847568
index 4b63e91a02d4..148b2de3df21 100644
--- a/www/seamonkey/files/patch-bug847568
+++ b/www/seamonkey/files/patch-bug847568
@@ -83,10 +83,10 @@ index ac38f40..87536b7 100644
  dnl Check for pixman and cairo
  dnl ========================================================
  
-diff --git content/base/src/moz.build content/base/src/moz.build
+diff --git dom/base/moz.build dom/base/moz.build
 index a660ba4..6b2f602 100644
---- mozilla/content/base/src/moz.build
-+++ mozilla/content/base/src/moz.build
+--- mozilla/dom/base/moz.build
++++ mozilla/dom/base/moz.build
 @@ -196,6 +196,9 @@ SOURCES += [
      'nsObjectLoadingContent.cpp',
  ]
@@ -237,6 +237,6 @@ index 67f0db9..d42137a 100644
 +if CONFIG['MOZ_NATIVE_HARFBUZZ']:
 +    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
 +
- if CONFIG['MOZ_ALSA']:
-     OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+ if CONFIG['MOZ_OSS']:
+     OS_LIBS += CONFIG['MOZ_OSS_LIBS']
  
diff --git a/www/seamonkey/files/patch-bug858919 b/www/seamonkey/files/patch-bug858919
deleted file mode 100644
index fa66d350307b..000000000000
--- a/www/seamonkey/files/patch-bug858919
+++ /dev/null
@@ -1,394 +0,0 @@
-commit a33d4f7
-Author: Martin Stransky <stransky@redhat.com>
-Date:   Fri Nov 14 04:04:00 2014 +0100
-
-    Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt
----
- toolkit/components/alerts/nsAlertsService.cpp  | 10 +--
- toolkit/system/gnome/moz.build                 |  2 +
- toolkit/system/gnome/nsAlertsIconListener.cpp  | 64 ++++++++++++------
- toolkit/system/gnome/nsAlertsIconListener.h    | 89 ++++++++++++++++++++++++++
- toolkit/system/gnome/nsGnomeModule.cpp         |  5 ++
- toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++
- toolkit/system/gnome/nsSystemAlertsService.h   | 27 ++++++++
- 7 files changed, 226 insertions(+), 25 deletions(-)
-
-diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp
-index 93f4536..f8b5e07 100644
---- mozilla/toolkit/components/alerts/nsAlertsService.cpp
-+++ mozilla/toolkit/components/alerts/nsAlertsService.cpp
-@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl
-   nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID));
-   nsresult rv;
-   if (sysAlerts) {
--    return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
--                                            aAlertCookie, aAlertListener, aAlertName,
--                                            aBidi, aLang, aData,
--                                            IPC::Principal(aPrincipal));
-+    rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
-+                                          aAlertCookie, aAlertListener, aAlertName,
-+                                          aBidi, aLang, aData,
-+                                          IPC::Principal(aPrincipal));
-+    if (NS_SUCCEEDED(rv))
-+      return NS_OK;
-   }
- 
-   if (!ShouldShowAlert()) {
-diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build
-index c033f8b..9242209 100644
---- mozilla/toolkit/system/gnome/moz.build
-+++ mozilla/toolkit/system/gnome/moz.build
-@@ -5,7 +5,9 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- SOURCES += [
-+    'nsAlertsIconListener.cpp',
-     'nsGnomeModule.cpp',
-+    'nsSystemAlertsService.cpp',
- ]
- 
- if CONFIG['MOZ_ENABLE_GCONF']:
-diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp
-index f39335e..55f4356 100644
---- mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
-+++ mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
-@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure,
-   NS_RELEASE(alert);
- }
- 
-+static GdkPixbuf*
-+GetPixbufFromImgRequest(imgIRequest* aRequest)
-+{
-+  nsCOMPtr<imgIContainer> image;
-+  nsresult rv = aRequest->GetImage(getter_AddRefs(image));
-+  if (NS_FAILED(rv)) {
-+    return nullptr;
-+  }
-+
-+  nsCOMPtr<nsIImageToPixbuf> imgToPixbuf =
-+    do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1");
-+
-+  return imgToPixbuf->ConvertImageToPixbuf(image);
-+}
-+
- NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver,
-                   nsIObserver, nsISupportsWeakReference)
- 
-@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe
- nsresult
- nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest)
- {
-+  NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!");
-+
-   uint32_t imgStatus = imgIRequest::STATUS_ERROR;
-   nsresult rv = aRequest->GetImageStatus(&imgStatus);
-   NS_ENSURE_SUCCESS(rv, rv);
-   if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) {
-     // We have an error getting the image. Display the notification with no icon.
-     ShowAlert(nullptr);
--  }
- 
--  if (mIconRequest) {
-+    // Cancel any pending request
-     mIconRequest->Cancel(NS_BINDING_ABORTED);
-     mIconRequest = nullptr;
-   }
-+
-   return NS_OK;
- }
- 
- nsresult
- nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest)
- {
--  if (aRequest != mIconRequest)
--    return NS_ERROR_FAILURE;
-+  NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!");
- 
-   if (mLoadedFrame)
-     return NS_OK; // only use one frame
- 
--  nsCOMPtr<imgIContainer> image;
--  nsresult rv = aRequest->GetImage(getter_AddRefs(image));
--  if (NS_FAILED(rv))
--    return rv;
--
--  nsCOMPtr<nsIImageToPixbuf> imgToPixbuf =
--    do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1");
--
--  GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image);
--  if (!imagePixbuf)
--    return NS_ERROR_FAILURE;
-+  GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest);
-+  if (!imagePixbuf) {
-+    ShowAlert(nullptr);
-+  } else {
-+    ShowAlert(imagePixbuf);
-+    g_object_unref(imagePixbuf);
-+  }
- 
--  ShowAlert(imagePixbuf);
-+  mLoadedFrame = true;
- 
--  g_object_unref(imagePixbuf);
-+  // Cancel any pending request (multipart image loading/decoding for instance)
-+  mIconRequest->Cancel(NS_BINDING_ABORTED);
-+  mIconRequest = nullptr;
- 
--  mLoadedFrame = true;
-   return NS_OK;
- }
- 
-@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf)
-   mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE);
-   gboolean result = notify_notification_show(mNotification, nullptr);
- 
-+  if (result && mAlertListener)
-+    mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get());
-+
-   return result ? NS_OK : NS_ERROR_FAILURE;
- }
- 
-@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl)
-   if (!il)
-     return ShowAlert(nullptr);
- 
--  return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr,
--                            this, nullptr, nsIRequest::LOAD_NORMAL, nullptr,
--                            nullptr, getter_AddRefs(mIconRequest));
-+  nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr,
-+                                   this, nullptr, nsIRequest::LOAD_NORMAL, nullptr,
-+                                   0 /* use default */, getter_AddRefs(mIconRequest));
-+  if (NS_FAILED(rv))
-+    return rv;
-+
-+  mIconRequest->StartDecoding();
-+
-+  return NS_OK;
- }
- 
- void
-diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h
-new file mode 100644
-index 0000000..ac96db9
---- /dev/null
-+++ mozilla/toolkit/system/gnome/nsAlertsIconListener.h
-@@ -0,0 +1,89 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef nsAlertsIconListener_h__
-+#define nsAlertsIconListener_h__
-+
-+#include "nsCOMPtr.h"
-+#include "imgINotificationObserver.h"
-+#include "nsStringAPI.h"
-+#include "nsIObserver.h"
-+#include "nsWeakReference.h"
-+
-+#include <gdk-pixbuf/gdk-pixbuf.h>
-+
-+class imgIRequest;
-+
-+struct NotifyNotification;
-+
-+class nsAlertsIconListener : public imgINotificationObserver,
-+                             public nsIObserver,
-+                             public nsSupportsWeakReference
-+{
-+public:
-+  NS_DECL_ISUPPORTS
-+  NS_DECL_IMGINOTIFICATIONOBSERVER
-+  NS_DECL_NSIOBSERVER
-+
-+  nsAlertsIconListener();
-+
-+  nsresult InitAlertAsync(const nsAString & aImageUrl,
-+                          const nsAString & aAlertTitle, 
-+                          const nsAString & aAlertText,
-+                          bool aAlertTextClickable,
-+                          const nsAString & aAlertCookie,
-+                          nsIObserver * aAlertListener);
-+
-+  void SendCallback();
-+  void SendClosed();
-+
-+protected:
-+  virtual ~nsAlertsIconListener();
-+
-+  nsresult OnStopRequest(imgIRequest* aRequest);
-+  nsresult OnStopFrame(imgIRequest* aRequest);
-+
-+  /**
-+   * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols
-+   * is that notify_notification_new takes three arguments in libnotify.so.4 and
-+   * four in libnotify.so.1.
-+   * Passing the fourth argument as NULL is binary compatible.
-+   */
-+  typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer);
-+  typedef bool (*notify_is_initted_t)(void);
-+  typedef bool (*notify_init_t)(const char*);
-+  typedef GList* (*notify_get_server_caps_t)(void);
-+  typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*);
-+  typedef bool (*notify_notification_show_t)(void*, char*);
-+  typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*);
-+  typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc);
-+
-+  nsCOMPtr<imgIRequest> mIconRequest;
-+  nsCString mAlertTitle;
-+  nsCString mAlertText;
-+
-+  nsCOMPtr<nsIObserver> mAlertListener;
-+  nsString mAlertCookie;
-+
-+  bool mLoadedFrame;
-+  bool mAlertHasAction;
-+
-+  static void* libNotifyHandle;
-+  static bool libNotifyNotAvail;
-+  static notify_is_initted_t notify_is_initted;
-+  static notify_init_t notify_init;
-+  static notify_get_server_caps_t notify_get_server_caps;
-+  static notify_notification_new_t notify_notification_new;
-+  static notify_notification_show_t notify_notification_show;
-+  static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf;
-+  static notify_notification_add_action_t notify_notification_add_action;
-+  NotifyNotification* mNotification;
-+  gulong mClosureHandler;
-+
-+  nsresult StartRequest(const nsAString & aImageUrl);
-+  nsresult ShowAlert(GdkPixbuf* aPixbuf);
-+};
-+
-+#endif
-diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp
-index 5ccc8e5..f893893 100644
---- mozilla/toolkit/system/gnome/nsGnomeModule.cpp
-+++ mozilla/toolkit/system/gnome/nsGnomeModule.cpp
-@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
- NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
- #endif
-+#include "nsSystemAlertsService.h"
-+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init)
- 
- #ifdef MOZ_ENABLE_GCONF
- NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID);
-@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID);
- NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID);
- NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID);
- #endif
-+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID);
- 
- static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
- #ifdef MOZ_ENABLE_GCONF
-@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
-   { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor },
-   { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor },
- #endif
-+  { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor },
-   { nullptr }
- };
- 
-@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = {
-   { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID },
-   { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID },
- #endif
-+  { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID },
-   { nullptr }
- };
- 
-diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp
-new file mode 100644
-index 0000000..b91b402
---- /dev/null
-+++ mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp
-@@ -0,0 +1,54 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#include "nsXULAppAPI.h"
-+#include "nsSystemAlertsService.h"
-+#include "nsAlertsIconListener.h"
-+#include "nsAutoPtr.h"
-+
-+NS_IMPL_ADDREF(nsSystemAlertsService)
-+NS_IMPL_RELEASE(nsSystemAlertsService)
-+
-+NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService)
-+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService)
-+   NS_INTERFACE_MAP_ENTRY(nsIAlertsService)
-+NS_INTERFACE_MAP_END_THREADSAFE
-+
-+nsSystemAlertsService::nsSystemAlertsService()
-+{
-+}
-+
-+nsSystemAlertsService::~nsSystemAlertsService()
-+{}
-+
-+nsresult
-+nsSystemAlertsService::Init()
-+{
-+  return NS_OK;
-+}
-+
-+NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, 
-+                                                           const nsAString & aAlertText, bool aAlertTextClickable,
-+                                                           const nsAString & aAlertCookie,
-+                                                           nsIObserver * aAlertListener,
-+                                                           const nsAString & aAlertName,
-+                                                           const nsAString & aBidi,
-+                                                           const nsAString & aLang,
-+                                                           const nsAString & aData,
-+                                                           nsIPrincipal * aPrincipal)
-+{
-+  nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener();
-+  if (!alertListener)
-+    return NS_ERROR_OUT_OF_MEMORY;
-+
-+  return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
-+                                       aAlertCookie, aAlertListener);
-+}
-+
-+NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName,
-+                                                nsIPrincipal* aPrincipal)
-+{
-+  return NS_ERROR_NOT_IMPLEMENTED;
-+}
-diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h
-new file mode 100644
-index 0000000..b0bd625
---- /dev/null
-+++ mozilla/toolkit/system/gnome/nsSystemAlertsService.h
-@@ -0,0 +1,27 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef nsSystemAlertsService_h__
-+#define nsSystemAlertsService_h__
-+
-+#include "nsIAlertsService.h"
-+#include "nsCOMPtr.h"
-+
-+class nsSystemAlertsService : public nsIAlertsService
-+{
-+public:
-+  NS_DECL_NSIALERTSSERVICE
-+  NS_DECL_ISUPPORTS
-+
-+  nsSystemAlertsService();
-+
-+  nsresult Init();
-+
-+protected:
-+  virtual ~nsSystemAlertsService();
-+
-+};
-+
-+#endif /* nsSystemAlertsService_h__ */
diff --git a/www/seamonkey/files/patch-bug991253 b/www/seamonkey/files/patch-bug991253
index 32241fdfe270..06adabf4e833 100644
--- a/www/seamonkey/files/patch-bug991253
+++ b/www/seamonkey/files/patch-bug991253
@@ -1,14 +1,16 @@
 --- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~
 +++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp
-@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList()
+@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo
      }
    }
  
 +  // load system hunspell dictionaries
-+  nsIFile* hunDir;
++  nsCOMPtr<nsIFile> hunDir;
 +  NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"),
-+			true, &hunDir);
-+  LoadDictionariesFromDir(hunDir);
++                        true, getter_AddRefs(hunDir));
++  if (hunDir) {
++      LoadDictionariesFromDir(hunDir);
++  }
 +
    // find dictionaries from extensions requiring restart
    nsCOMPtr<nsISimpleEnumerator> dictDirs;
diff --git a/www/seamonkey/files/patch-ijg-libjpeg b/www/seamonkey/files/patch-ijg-libjpeg
index 06e9099ba36c..714576fd56ff 100644
--- a/www/seamonkey/files/patch-ijg-libjpeg
+++ b/www/seamonkey/files/patch-ijg-libjpeg
@@ -51,26 +51,26 @@ index 8fa8200..1d2a259 100644
  
  static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
  
-@@ -324,6 +340,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
-       case JCS_GRAYSCALE:
-       case JCS_RGB:
-       case JCS_YCbCr:
+@@ -367,6 +382,7 @@ nsJPEGDecoder::WriteInternal(const char*
+         case JCS_GRAYSCALE:
+         case JCS_RGB:
+         case JCS_YCbCr:
 +#ifdef JCS_EXTENSIONS
-         // if we're not color managing we can decode directly to
-         // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
-         if (mCMSMode != eCMSMode_All) {
-@@ -332,6 +349,9 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
-         } else {
-             mInfo.out_color_space = JCS_RGB;
-         }
+           // if we're not color managing we can decode directly to
+           // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
+           if (mCMSMode != eCMSMode_All) {
+@@ -375,6 +391,9 @@ nsJPEGDecoder::WriteInternal(const char*
+           } else {
+               mInfo.out_color_space = JCS_RGB;
+           }
 +#else
-+        mInfo.out_color_space = JCS_RGB;
++          mInfo.out_color_space = JCS_RGB;
 +#endif
-         break;
-       case JCS_CMYK:
-       case JCS_YCCK:
-@@ -399,6 +419,15 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
-       return; /* I/O suspension */
+           break;
+         case JCS_CMYK:
+         case JCS_YCCK:
+@@ -433,6 +452,15 @@ nsJPEGDecoder::WriteInternal(const char*
+       return; // I/O suspension
      }
  
 +#ifndef JCS_EXTENSIONS
@@ -83,10 +83,10 @@ index 8fa8200..1d2a259 100644
 +    }
 +#endif
  
-     /* If this is a progressive JPEG ... */
-     mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
-@@ -544,7 +573,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend)
-       uint32_t *imageRow = ((uint32_t*)mImageData) +
+     // If this is a progressive JPEG ...
+     mState = mInfo.buffered_image ?
+@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
+       uint32_t* imageRow = ((uint32_t*)mImageData) +
                             (mInfo.output_scanline * mInfo.output_width);
  
 +#ifdef JCS_EXTENSIONS
@@ -94,10 +94,10 @@ index 8fa8200..1d2a259 100644
 +#else
 +      if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) {
 +#endif
-         /* Special case: scanline will be directly converted into packed ARGB */
+         // Special case: scanline will be directly converted into packed ARGB
          if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
-           *suspend = true; /* suspend */
-@@ -854,6 +887,282 @@ term_source (j_decompress_ptr jd)
+           *suspend = true; // suspend
+@@ -920,6 +952,282 @@ term_source (j_decompress_ptr jd)
  } // namespace mozilla
  
  
@@ -377,6 +377,6 @@ index 8fa8200..1d2a259 100644
 +#endif
 +
 +
- /**************** Inverted CMYK -> RGB conversion **************/
- /*
-  * Input is (Inverted) CMYK stored as 4 bytes per pixel.
+ ///*************** Inverted CMYK -> RGB conversion *************************
+ /// Input is (Inverted) CMYK stored as 4 bytes per pixel.
+ /// Output is RGB stored as 3 bytes per pixel.
diff --git a/www/seamonkey/files/patch-system-openh264 b/www/seamonkey/files/patch-system-openh264
index c75b8bd83125..0e9c9ff7284a 100644
--- a/www/seamonkey/files/patch-system-openh264
+++ b/www/seamonkey/files/patch-system-openh264
@@ -1,9 +1,9 @@
 # Revert bug 1045209 to allow using absolute path
 
-diff --git content/media/gmp/GMPChild.cpp content/media/gmp/GMPChild.cpp
+diff --git dom/media/gmp/GMPChild.cpp dom/media/gmp/GMPChild.cpp
 index 1dde3ac..12c88cf 100644
---- mozilla/content/media/gmp/GMPChild.cpp
-+++ mozilla/content/media/gmp/GMPChild.cpp
+--- mozilla/dom/media/gmp/GMPChild.cpp
++++ mozilla/dom/media/gmp/GMPChild.cpp
 @@ -76,21 +76,14 @@ GetFileBase(const std::string& aPluginPa
    }
  #endif
@@ -30,10 +30,10 @@ index 1dde3ac..12c88cf 100644
    return true;
  }
  
-diff --git content/media/gmp/GMPParent.cpp content/media/gmp/GMPParent.cpp
+diff --git dom/media/gmp/GMPParent.cpp dom/media/gmp/GMPParent.cpp
 index aa60acf..90878ca 100644
---- mozilla/content/media/gmp/GMPParent.cpp
-+++ mozilla/content/media/gmp/GMPParent.cpp
+--- mozilla/dom/media/gmp/GMPParent.cpp
++++ mozilla/dom/media/gmp/GMPParent.cpp
 @@ -90,23 +90,16 @@
    mService = aService;
    mDirectory = aPluginDir;
diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422
index 57310a8e6741..6c7b6647ee9e 100644
--- a/www/seamonkey/files/patch-z-bug517422
+++ b/www/seamonkey/files/patch-z-bug517422
@@ -268,10 +268,10 @@ index 87db361..7947626 100644
  dnl = Disable VP8 decoder support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(webm,
-diff --git content/media/AudioStream.h content/media/AudioStream.h
+diff --git dom/media/AudioStream.h dom/media/AudioStream.h
 index 085676d..00c54fb 100644
---- mozilla/content/media/AudioStream.h
-+++ mozilla/content/media/AudioStream.h
+--- mozilla/dom/media/AudioStream.h
++++ mozilla/dom/media/AudioStream.h
 @@ -17,7 +17,7 @@
  #include "CubebUtils.h"
  
@@ -281,10 +281,10 @@ index 085676d..00c54fb 100644
  }
  
  namespace mozilla {
-diff --git content/media/moz.build content/media/moz.build
+diff --git dom/media/moz.build dom/media/moz.build
 index 7526cff..e0a0ca0 100644
---- mozilla/content/media/moz.build
-+++ mozilla/content/media/moz.build
+--- mozilla/dom/media/moz.build
++++ mozilla/dom/media/moz.build
 @@ -212,3 +212,24 @@ if CONFIG['ANDROID_VERSION'] > '15':
  
  CFLAGS += CONFIG['GSTREAMER_CFLAGS']
@@ -382,9 +382,9 @@ diff --git media/libtheora/moz.build media/libtheora/moz.build
 index 14265b1..3069e99 100644
 --- mozilla/media/libtheora/moz.build
 +++ mozilla/media/libtheora/moz.build
-@@ -6,3 +6,5 @@
- 
- DIRS += ['include', 'lib']
+@@ -93,3 +93,5 @@ if CONFIG['GNU_AS']:
+         if CONFIG['OS_TARGET'] == 'Android':
+             DEFINES['__linux__'] = True
  
 +if CONFIG['MOZ_NATIVE_OGG']:
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']