svn commit: r380888 - in head: Mk/Uses www/linux-seamonkey www/seamonkey www/seamonkey-i18n www/seamonkey/files

Jan Beich jbeich at FreeBSD.org
Tue Mar 10 03:00:31 UTC 2015 

Author: jbeich
Date: Tue Mar 10 03:00:25 2015
New Revision: 380888
URL: https://svnweb.freebsd.org/changeset/ports/380888
QAT: https://qat.redports.org/buildarchive/r380888/

Log:
  - Update SeaMonkey to 2.33
  - Check if NS_NewNativeLocalFile() succeeds before using [1]
  
  Changes:	http://www.seamonkey-project.org/releases/seamonkey2.33/
  Obtained from:	PkgSrc [1]
  MFH:		2015Q1
  X-MFH-With:	r380090
  Security:	https://vuxml.freebsd.org/freebsd/99029172-8253-407d-9d8b-2cfeab9abf81.html

Added:
  head/www/seamonkey/files/patch-bug1122547   (contents, props changed)
  head/www/seamonkey/files/patch-bug1128161
     - copied, changed from r380885, head/www/firefox/files/patch-bug1128161
Deleted:
  head/www/seamonkey/files/patch-bug1041795
  head/www/seamonkey/files/patch-bug1061736
  head/www/seamonkey/files/patch-bug1082199
  head/www/seamonkey/files/patch-bug1083461
  head/www/seamonkey/files/patch-bug1122586
  head/www/seamonkey/files/patch-bug858919
Modified:
  head/Mk/Uses/gecko.mk
  head/www/linux-seamonkey/Makefile
  head/www/linux-seamonkey/distinfo
  head/www/seamonkey-i18n/Makefile
  head/www/seamonkey-i18n/distinfo
  head/www/seamonkey/Makefile
  head/www/seamonkey/distinfo
  head/www/seamonkey/files/patch-bug1021761
  head/www/seamonkey/files/patch-bug847568
  head/www/seamonkey/files/patch-bug991253
  head/www/seamonkey/files/patch-ijg-libjpeg
  head/www/seamonkey/files/patch-system-openh264
  head/www/seamonkey/files/patch-z-bug517422

Modified: head/Mk/Uses/gecko.mk
==============================================================================
--- head/Mk/Uses/gecko.mk	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/Mk/Uses/gecko.mk	Tue Mar 10 03:00:25 2015	(r380888)
@@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLE
 
 .elif ${gecko_ARGS:Mseamonkey}
 
-_GECKO_DEFAULT_VERSION=	32
-_GECKO_VERSIONS=		32
+_GECKO_DEFAULT_VERSION=	33
+_GECKO_VERSIONS=		33
 _GECKO_TYPE=	seamonkey
 
 .if exists(${LOCALBASE}/bin/seamonkey)
@@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLE
 .endif
 
 # Dependence lines for different Seamonkey versions
-32_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+33_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
 
 .elif ${gecko_ARGS:Mthunderbird}
 

Modified: head/www/linux-seamonkey/Makefile
==============================================================================
--- head/www/linux-seamonkey/Makefile	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/linux-seamonkey/Makefile	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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
 

Modified: head/www/linux-seamonkey/distinfo
==============================================================================
--- head/www/linux-seamonkey/distinfo	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/linux-seamonkey/distinfo	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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

Modified: head/www/seamonkey-i18n/Makefile
==============================================================================
--- head/www/seamonkey-i18n/Makefile	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey-i18n/Makefile	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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=

Modified: head/www/seamonkey-i18n/distinfo
==============================================================================
--- head/www/seamonkey-i18n/distinfo	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey-i18n/distinfo	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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

Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey/Makefile	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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 at 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}/
 		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}/
 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

Modified: head/www/seamonkey/distinfo
==============================================================================
--- head/www/seamonkey/distinfo	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey/distinfo	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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

Modified: head/www/seamonkey/files/patch-bug1021761
==============================================================================
--- head/www/seamonkey/files/patch-bug1021761	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey/files/patch-bug1021761	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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']

Added: head/www/seamonkey/files/patch-bug1122547
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/seamonkey/files/patch-bug1122547	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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()) >

Copied and modified: head/www/seamonkey/files/patch-bug1128161 (from r380885, head/www/firefox/files/patch-bug1128161)
==============================================================================
--- head/www/firefox/files/patch-bug1128161	Mon Mar  9 22:31:48 2015	(r380885, copy source)
+++ head/www/seamonkey/files/patch-bug1128161	Tue Mar 10 03:00:25 2015	(r380888)
@@ -9,8 +9,8 @@ Date:   Tue Feb 3 11:20:17 2015 +1300
 
 diff --git dom/media/mediasource/MediaSourceUtils.cpp dom/media/mediasource/MediaSourceUtils.cpp
 index 44a40f5..83bba60 100644
---- dom/media/mediasource/MediaSourceUtils.cpp
-+++ dom/media/mediasource/MediaSourceUtils.cpp
+--- mozilla/dom/media/mediasource/MediaSourceUtils.cpp
++++ mozilla/dom/media/mediasource/MediaSourceUtils.cpp
 @@ -11,7 +11,6 @@
  
  namespace mozilla {

Modified: head/www/seamonkey/files/patch-bug847568
==============================================================================
--- head/www/seamonkey/files/patch-bug847568	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey/files/patch-bug847568	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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']
  

Modified: head/www/seamonkey/files/patch-bug991253
==============================================================================
--- head/www/seamonkey/files/patch-bug991253	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey/files/patch-bug991253	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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;

Modified: head/www/seamonkey/files/patch-ijg-libjpeg
==============================================================================
--- head/www/seamonkey/files/patch-ijg-libjpeg	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey/files/patch-ijg-libjpeg	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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.

Modified: head/www/seamonkey/files/patch-system-openh264
==============================================================================
--- head/www/seamonkey/files/patch-system-openh264	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey/files/patch-system-openh264	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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;

Modified: head/www/seamonkey/files/patch-z-bug517422
==============================================================================
--- head/www/seamonkey/files/patch-z-bug517422	Tue Mar 10 01:13:57 2015	(r380887)
+++ head/www/seamonkey/files/patch-z-bug517422	Tue Mar 10 03:00:25 2015	(r380888)
@@ -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 med
 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']

More information about the svn-ports-head mailing list