Date: Fri, 14 Mar 2014 06:59:45 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1553 - in trunk: devel/nspr devel/nspr/files www/firefox www/firefox-i18n www/firefox-nightly www/firefox-nightly/files www/linux-firefox www/linux-seamonkey www/seamonkey www/seamonkey-i18n www/seamonkey/files Message-ID: <201403140659.s2E6xj9R004830@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Mar 14 06:59:45 2014
New Revision: 1553
Log:
update
Deleted:
trunk/www/firefox-nightly/files/patch-revert-bug975011
trunk/www/seamonkey/files/patch-bug970031
Modified:
trunk/devel/nspr/Makefile
trunk/devel/nspr/distinfo
trunk/devel/nspr/files/patch-tests
trunk/www/firefox-i18n/Makefile
trunk/www/firefox-i18n/distinfo
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-z-bug517422
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/linux-firefox/Makefile
trunk/www/linux-firefox/distinfo
trunk/www/linux-seamonkey/Makefile
trunk/www/linux-seamonkey/distinfo
trunk/www/seamonkey-i18n/Makefile
trunk/www/seamonkey-i18n/distinfo
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/distinfo
trunk/www/seamonkey/files/patch-bug806917
trunk/www/seamonkey/files/patch-bug973744
Modified: trunk/devel/nspr/Makefile
==============================================================================
--- trunk/devel/nspr/Makefile Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/devel/nspr/Makefile Fri Mar 14 06:59:45 2014 (r1553)
@@ -2,7 +2,7 @@
# $FreeBSD: head/devel/nspr/Makefile 336446 2013-12-14 13:42:06Z flo $
PORTNAME= nspr
-DISTVERSION= 4.10.3
+DISTVERSION= 4.10.4
CATEGORIES= devel
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
Modified: trunk/devel/nspr/distinfo
==============================================================================
--- trunk/devel/nspr/distinfo Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/devel/nspr/distinfo Fri Mar 14 06:59:45 2014 (r1553)
@@ -1,2 +1,2 @@
-SHA256 (nspr-4.10.3.tar.gz) = f25779b1a665dab0090b9c977dc6c29a63320f442956ed78629b66b405cb01e5
-SIZE (nspr-4.10.3.tar.gz) = 1104478
+SHA256 (nspr-4.10.4.tar.gz) = eb3fcc5e4cbd90f244c19ea05c2dfb4d22df4acc777d34ec6946dbfae560d838
+SIZE (nspr-4.10.4.tar.gz) = 1107127
Modified: trunk/devel/nspr/files/patch-tests
==============================================================================
--- trunk/devel/nspr/files/patch-tests Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/devel/nspr/files/patch-tests Fri Mar 14 06:59:45 2014 (r1553)
@@ -279,9 +279,8 @@
while ( rh != NULL )
{
- PR_GET_COUNTER_NAME_FROM_HANDLE( rh, qname, rname, desc );
-- tCtr = PR_GET_COUNTER(tCtr, rh);
+ PR_GET_COUNTER_NAME_FROM_HANDLE( rh, &qn, &rn, &dn );
-+ PR_GET_COUNTER(tCtr, rh);
+ PR_GET_COUNTER(tCtr, rh);
PR_LOG( lm, msgLevel,
( "QName: %s RName: %s Desc: %s Value: %ld\n",
@@ -134,13 +134,13 @@
Modified: trunk/www/firefox-i18n/Makefile
==============================================================================
--- trunk/www/firefox-i18n/Makefile Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/firefox-i18n/Makefile Fri Mar 14 06:59:45 2014 (r1553)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox-i18n/Makefile 336446 2013-12-14 13:42:06Z flo $
PORTNAME= firefox-i18n
-PORTVERSION= 28.0b9
+PORTVERSION= 28.0
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
PKGNAMEPREFIX=
Modified: trunk/www/firefox-i18n/distinfo
==============================================================================
--- trunk/www/firefox-i18n/distinfo Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/firefox-i18n/distinfo Fri Mar 14 06:59:45 2014 (r1553)
@@ -1,170 +1,170 @@
-SHA256 (xpi/firefox-i18n-28.0b9/ach.xpi) = 8bdf720da3590b5380b51a74c01902cb1a1a25922340d9e98abd502952d92878
-SIZE (xpi/firefox-i18n-28.0b9/ach.xpi) = 365713
-SHA256 (xpi/firefox-i18n-28.0b9/af.xpi) = 4733800a2054caeb8d51e59725d41554e11ddaeed4df457c6f70784376cb9da7
-SIZE (xpi/firefox-i18n-28.0b9/af.xpi) = 359591
-SHA256 (xpi/firefox-i18n-28.0b9/ar.xpi) = 9eaca3947b04348b8d1e9669fc2ddd1642cff3db5940cbd412712ea22df879e4
-SIZE (xpi/firefox-i18n-28.0b9/ar.xpi) = 388976
-SHA256 (xpi/firefox-i18n-28.0b9/as.xpi) = 366e567be10be09a32b7bc2442d9d624f2361bfc1cfbda93d031fb8f18bdd918
-SIZE (xpi/firefox-i18n-28.0b9/as.xpi) = 404108
-SHA256 (xpi/firefox-i18n-28.0b9/ast.xpi) = 8b9cfd8b0a0ed1fbde97d0dbfa42432e43b9d78e66e123dbe5690f14d7d907f8
-SIZE (xpi/firefox-i18n-28.0b9/ast.xpi) = 316224
-SHA256 (xpi/firefox-i18n-28.0b9/be.xpi) = 0207f5f9b06a69630b67070902dc6844af04a9fcad728558a559d9be40d0ad07
-SIZE (xpi/firefox-i18n-28.0b9/be.xpi) = 342306
-SHA256 (xpi/firefox-i18n-28.0b9/bg.xpi) = 43a11f6d97b196b726d4acef4305feb95d650f7888ef1d886239fabc41566c61
-SIZE (xpi/firefox-i18n-28.0b9/bg.xpi) = 393205
-SHA256 (xpi/firefox-i18n-28.0b9/bn-BD.xpi) = 54b81a91747d498ba7f5efeb0965dba12d1f95e9c7aaf33e32a0be60517e339b
-SIZE (xpi/firefox-i18n-28.0b9/bn-BD.xpi) = 418542
-SHA256 (xpi/firefox-i18n-28.0b9/bn-IN.xpi) = f03645ca8b83b64d08ff6c1abadcdcb41affaaa5874d85c8ce0ed914e4cffb35
-SIZE (xpi/firefox-i18n-28.0b9/bn-IN.xpi) = 413543
-SHA256 (xpi/firefox-i18n-28.0b9/br.xpi) = 81559deed608eb366e48c98a2365bba6712d028ffb575a038f15c0feec6798d4
-SIZE (xpi/firefox-i18n-28.0b9/br.xpi) = 353934
-SHA256 (xpi/firefox-i18n-28.0b9/bs.xpi) = b08958c24147528eb5911d374fc53ac48953bd6722e2152df830de1664f65720
-SIZE (xpi/firefox-i18n-28.0b9/bs.xpi) = 363405
-SHA256 (xpi/firefox-i18n-28.0b9/ca.xpi) = d1307707d475f461fbf2373368370233d799b06b0621b0b2d2285e25694a263d
-SIZE (xpi/firefox-i18n-28.0b9/ca.xpi) = 362970
-SHA256 (xpi/firefox-i18n-28.0b9/cs.xpi) = 17f12a80469ef6e51560fa4ece8c4140b2a9d096b7a5a6d6511c9763dda90d60
-SIZE (xpi/firefox-i18n-28.0b9/cs.xpi) = 356819
-SHA256 (xpi/firefox-i18n-28.0b9/csb.xpi) = 1616031bc124438effe539ff394dc4c71f86d451b9230afec9adb0281cbe1ab3
-SIZE (xpi/firefox-i18n-28.0b9/csb.xpi) = 347623
-SHA256 (xpi/firefox-i18n-28.0b9/cy.xpi) = 49f31e886c3ebc57a425f642a10f3e6392942e84d91b8e23ff2ac643c3dde8ae
-SIZE (xpi/firefox-i18n-28.0b9/cy.xpi) = 354722
-SHA256 (xpi/firefox-i18n-28.0b9/da.xpi) = 7d9bd184450cc4c3676c4582c9aac6e6c1ddafa88a8babe0a91bcde4a58d21f5
-SIZE (xpi/firefox-i18n-28.0b9/da.xpi) = 348726
-SHA256 (xpi/firefox-i18n-28.0b9/de.xpi) = 00b2889d9d249fdf313c608fd991d55796a1144bf649d939fa9ec8183035b6de
-SIZE (xpi/firefox-i18n-28.0b9/de.xpi) = 355506
-SHA256 (xpi/firefox-i18n-28.0b9/el.xpi) = e59a868c5cfd18839ccc3e12c58c484e1e3786e852abd3c5c9bec90f5a3bcfd7
-SIZE (xpi/firefox-i18n-28.0b9/el.xpi) = 389426
-SHA256 (xpi/firefox-i18n-28.0b9/en-GB.xpi) = fa8cc036549f3f048289bbfe34bb9d24ca5696bce093fd28a7b9780133051207
-SIZE (xpi/firefox-i18n-28.0b9/en-GB.xpi) = 342864
-SHA256 (xpi/firefox-i18n-28.0b9/en-US.xpi) = cc21285b04200e558d1b38fc7f044a82d998226edaca2312a80ba6e802fef2a1
-SIZE (xpi/firefox-i18n-28.0b9/en-US.xpi) = 345903
-SHA256 (xpi/firefox-i18n-28.0b9/en-ZA.xpi) = fe12339834b269b777cb986521b09cfd865e93821ac05bf72d6cec87d697c51f
-SIZE (xpi/firefox-i18n-28.0b9/en-ZA.xpi) = 338118
-SHA256 (xpi/firefox-i18n-28.0b9/eo.xpi) = 5f6339aeec20bb9e1f34d9f8bdae3a96da00c96a8a55e98c62adda414ed8ee9f
-SIZE (xpi/firefox-i18n-28.0b9/eo.xpi) = 361752
-SHA256 (xpi/firefox-i18n-28.0b9/es-AR.xpi) = 3cad8ed2c605299222ba2aa571dca39bb530a1d31cb389ae9af85c52415b3e3e
-SIZE (xpi/firefox-i18n-28.0b9/es-AR.xpi) = 357326
-SHA256 (xpi/firefox-i18n-28.0b9/es-CL.xpi) = 9921cc125203d75d28a83ace701623c7741aeeb8ced29498a9d2587e17c92352
-SIZE (xpi/firefox-i18n-28.0b9/es-CL.xpi) = 306620
-SHA256 (xpi/firefox-i18n-28.0b9/es-ES.xpi) = 60cab75b527302d4c50679ab7551932bdcad39eda9efee4bf753c9d8fe6806c1
-SIZE (xpi/firefox-i18n-28.0b9/es-ES.xpi) = 300694
-SHA256 (xpi/firefox-i18n-28.0b9/es-MX.xpi) = fab451d6e9def0e7844c20b0d5ea4746411f2248a0222e16a442ecc5aa3eaad9
-SIZE (xpi/firefox-i18n-28.0b9/es-MX.xpi) = 361860
-SHA256 (xpi/firefox-i18n-28.0b9/et.xpi) = 3e657696fa6cd082991821fb9a21e0aae837a197bf17f20aa4f45ee4f3bf192f
-SIZE (xpi/firefox-i18n-28.0b9/et.xpi) = 345631
-SHA256 (xpi/firefox-i18n-28.0b9/eu.xpi) = c20bfe672d55bd5a4ca834d41ee4a56e7f17559c0cbe0bfa1eccac347e80c296
-SIZE (xpi/firefox-i18n-28.0b9/eu.xpi) = 361447
-SHA256 (xpi/firefox-i18n-28.0b9/fa.xpi) = 0dfe637871779b98558537a8d2bd305d6b343781c8b0c01cbb8d28a8f10a6098
-SIZE (xpi/firefox-i18n-28.0b9/fa.xpi) = 401706
-SHA256 (xpi/firefox-i18n-28.0b9/ff.xpi) = aa70510477b8ff68e603b07d6b038f32ffb32cbce02708b32e4e4fc0077da865
-SIZE (xpi/firefox-i18n-28.0b9/ff.xpi) = 354041
-SHA256 (xpi/firefox-i18n-28.0b9/fi.xpi) = cb794ca729651f71bd8939aaec44a3f0655c404f17fd9303e1afebfb52102b65
-SIZE (xpi/firefox-i18n-28.0b9/fi.xpi) = 352830
-SHA256 (xpi/firefox-i18n-28.0b9/fr.xpi) = 755aa63cf9f74115cfc50b506feae9e3b7d0f0d5c6522d80988d64d3e2bd7f7d
-SIZE (xpi/firefox-i18n-28.0b9/fr.xpi) = 368928
-SHA256 (xpi/firefox-i18n-28.0b9/fy-NL.xpi) = 9cd560e1c5a5b3236555d41f0ca2ce50c62fccbb7b6d8dc5c3b40c8fb26c14f2
-SIZE (xpi/firefox-i18n-28.0b9/fy-NL.xpi) = 362229
-SHA256 (xpi/firefox-i18n-28.0b9/ga-IE.xpi) = de8e71dfc1669ae9b05761f9659b8f378d5f5b1c3c751c7242ea4e25f0e8b1ab
-SIZE (xpi/firefox-i18n-28.0b9/ga-IE.xpi) = 370257
-SHA256 (xpi/firefox-i18n-28.0b9/gd.xpi) = 2a3459e4a3b5b03f47cf0bf5205d9ba1c3294e388fc1fb5f387ad5b024f87c38
-SIZE (xpi/firefox-i18n-28.0b9/gd.xpi) = 365218
-SHA256 (xpi/firefox-i18n-28.0b9/gl.xpi) = b1b40ac5d9e2c5c334389e8b250b8056425c50da9388b0203ebd11e56e671b27
-SIZE (xpi/firefox-i18n-28.0b9/gl.xpi) = 356139
-SHA256 (xpi/firefox-i18n-28.0b9/gu-IN.xpi) = c645ebdb3e49f3fa587c03e9b2abd7a768e28ead342344fdc1273a9f382f80aa
-SIZE (xpi/firefox-i18n-28.0b9/gu-IN.xpi) = 383833
-SHA256 (xpi/firefox-i18n-28.0b9/he.xpi) = d18087094462dd9a0040704c7e7d23a97186292b6eb8a20a0a9b3c12207af202
-SIZE (xpi/firefox-i18n-28.0b9/he.xpi) = 377881
-SHA256 (xpi/firefox-i18n-28.0b9/hi-IN.xpi) = a3e7ce276ab183e799a3d0f201504cdfd3097b19242f8d36a22208110a06c029
-SIZE (xpi/firefox-i18n-28.0b9/hi-IN.xpi) = 402397
-SHA256 (xpi/firefox-i18n-28.0b9/hr.xpi) = 6dd7b813e1acf0f031a2995a9281f245ec0f7a6a8922ae4fc84b81a3712bf26b
-SIZE (xpi/firefox-i18n-28.0b9/hr.xpi) = 368423
-SHA256 (xpi/firefox-i18n-28.0b9/hu.xpi) = 133a9a1d58304d7f6ba80c488257d6dc011bf78e9a1b8855cd025b1fef90d3b7
-SIZE (xpi/firefox-i18n-28.0b9/hu.xpi) = 365034
-SHA256 (xpi/firefox-i18n-28.0b9/hy-AM.xpi) = d98bca4f18da7b52e4f25bfae1f4bcd2c37fcfdcc36c08184c2e7b03d5a4b528
-SIZE (xpi/firefox-i18n-28.0b9/hy-AM.xpi) = 411721
-SHA256 (xpi/firefox-i18n-28.0b9/id.xpi) = 03bc56f4ceec1847b2dd3a141dda8f4ba4da69d78b2175147ae9565af94112c2
-SIZE (xpi/firefox-i18n-28.0b9/id.xpi) = 342616
-SHA256 (xpi/firefox-i18n-28.0b9/is.xpi) = 6fc678b23a4a0d4faa27047233d68e6caeccd881e17c4846d4b959e47aca4e4c
-SIZE (xpi/firefox-i18n-28.0b9/is.xpi) = 357819
-SHA256 (xpi/firefox-i18n-28.0b9/it.xpi) = 4a735e11a15cca9f6a84fd6a97db029886633f5b43b6c94d98f6f19633d80baa
-SIZE (xpi/firefox-i18n-28.0b9/it.xpi) = 298280
-SHA256 (xpi/firefox-i18n-28.0b9/ja.xpi) = 446d60d5ff0134ab5d29bed874320e64901705956c43c185693a6642f35ae9ae
-SIZE (xpi/firefox-i18n-28.0b9/ja.xpi) = 397188
-SHA256 (xpi/firefox-i18n-28.0b9/kk.xpi) = 34182003bec2c088e599864c5be4b1b7bb5e58a47221a2e7eb8674adca319edc
-SIZE (xpi/firefox-i18n-28.0b9/kk.xpi) = 400320
-SHA256 (xpi/firefox-i18n-28.0b9/km.xpi) = 04f086cf3926335a3fc357fca7c7ab0b281e3f44a2f56cb1e6a4306a4284d35d
-SIZE (xpi/firefox-i18n-28.0b9/km.xpi) = 430429
-SHA256 (xpi/firefox-i18n-28.0b9/kn.xpi) = 0430407f2230acb1bb7129fbaa18fa55373e3a983207a3fb3f0b8742cb583b76
-SIZE (xpi/firefox-i18n-28.0b9/kn.xpi) = 414256
-SHA256 (xpi/firefox-i18n-28.0b9/ko.xpi) = 43154ceb38bd9bd3380f9b2c6c5e2a187d8ff8ef0a9de382183a9a7fca566b58
-SIZE (xpi/firefox-i18n-28.0b9/ko.xpi) = 364493
-SHA256 (xpi/firefox-i18n-28.0b9/ku.xpi) = d35c57d011a6e54cc5e5619ad8de58d2724368ad59e345e664297594edefc2de
-SIZE (xpi/firefox-i18n-28.0b9/ku.xpi) = 370340
-SHA256 (xpi/firefox-i18n-28.0b9/lij.xpi) = d59988db0b934d8c1df6c75c9dfc95fe8ecf6814051af80d52c38129e40f6bb2
-SIZE (xpi/firefox-i18n-28.0b9/lij.xpi) = 343234
-SHA256 (xpi/firefox-i18n-28.0b9/lt.xpi) = 6467a9aa6d09cd040fd7af46a6962c5ec3c4e01d7bb9eb5bdf8127b1d4d3403d
-SIZE (xpi/firefox-i18n-28.0b9/lt.xpi) = 375231
-SHA256 (xpi/firefox-i18n-28.0b9/lv.xpi) = 26526cb6ad3539bc344797d79b5aae4b63927816608ca9e15e62372c2852ba90
-SIZE (xpi/firefox-i18n-28.0b9/lv.xpi) = 352617
-SHA256 (xpi/firefox-i18n-28.0b9/mai.xpi) = 9e21aee0e8b9ddb2731a16576d6a799011e931878e286be66818889230489d02
-SIZE (xpi/firefox-i18n-28.0b9/mai.xpi) = 402492
-SHA256 (xpi/firefox-i18n-28.0b9/mk.xpi) = f827d94c647d4f34089db96a0a0d60c8bd47c9f6aef52d44ace6c1088a00f7c3
-SIZE (xpi/firefox-i18n-28.0b9/mk.xpi) = 403252
-SHA256 (xpi/firefox-i18n-28.0b9/ml.xpi) = f3875cdef43bb331394945c52d8b39ae37916bef737582ae14234020e6ed5051
-SIZE (xpi/firefox-i18n-28.0b9/ml.xpi) = 422958
-SHA256 (xpi/firefox-i18n-28.0b9/mr.xpi) = c127f49cedac394edf55cbb2d05e57753fc7c367f08c33be96fbfcfdcb1ca8e2
-SIZE (xpi/firefox-i18n-28.0b9/mr.xpi) = 400782
-SHA256 (xpi/firefox-i18n-28.0b9/nb-NO.xpi) = 24bd2d080917d0157cb330419d2b855496eb13da26b981be95cabc9bc3c84413
-SIZE (xpi/firefox-i18n-28.0b9/nb-NO.xpi) = 352714
-SHA256 (xpi/firefox-i18n-28.0b9/nl.xpi) = bead262e197d58612e7b845f1cfce78c400c62a0e4e5c9692b4822c7b53b82a6
-SIZE (xpi/firefox-i18n-28.0b9/nl.xpi) = 354064
-SHA256 (xpi/firefox-i18n-28.0b9/nn-NO.xpi) = 4af8b193cdf6ca0dd1ee286c9dacdeca6a959f2594d88fcc7d74bca1e27a80c0
-SIZE (xpi/firefox-i18n-28.0b9/nn-NO.xpi) = 350910
-SHA256 (xpi/firefox-i18n-28.0b9/or.xpi) = 189ed8be495f2d2713137549828006773529d22524d547feda87c93ce2beed58
-SIZE (xpi/firefox-i18n-28.0b9/or.xpi) = 415918
-SHA256 (xpi/firefox-i18n-28.0b9/pa-IN.xpi) = a420b2cadb019a205da7814b540e9cbcc9c98b23d7c7d42b6dd661cd3bd74aac
-SIZE (xpi/firefox-i18n-28.0b9/pa-IN.xpi) = 390711
-SHA256 (xpi/firefox-i18n-28.0b9/pl.xpi) = a966854ec7c71b3f8a93914f3e43337481051ad78507967c41663748628321e5
-SIZE (xpi/firefox-i18n-28.0b9/pl.xpi) = 350844
-SHA256 (xpi/firefox-i18n-28.0b9/pt-BR.xpi) = f7d68609515d87fb37ace68208f913e20df979da1a6b4be231b5c1975695fd19
-SIZE (xpi/firefox-i18n-28.0b9/pt-BR.xpi) = 364789
-SHA256 (xpi/firefox-i18n-28.0b9/pt-PT.xpi) = 243bc617216562d593665f4371d7535fc10aeb34019c412adb0d693847b60afd
-SIZE (xpi/firefox-i18n-28.0b9/pt-PT.xpi) = 351716
-SHA256 (xpi/firefox-i18n-28.0b9/rm.xpi) = fab446ce1bc6b05084384659ff5e3e1509cbbb9c4c6efe73ce6c7f2fd7e51d89
-SIZE (xpi/firefox-i18n-28.0b9/rm.xpi) = 355277
-SHA256 (xpi/firefox-i18n-28.0b9/ro.xpi) = 5c78647102d303bbe12dd00eefba34ae886264678896e1da924162ad216e6deb
-SIZE (xpi/firefox-i18n-28.0b9/ro.xpi) = 389921
-SHA256 (xpi/firefox-i18n-28.0b9/ru.xpi) = 278a65ac972e70ee5b04238163add0be028a3ecbf7677bb15a9e4787ec72333e
-SIZE (xpi/firefox-i18n-28.0b9/ru.xpi) = 338413
-SHA256 (xpi/firefox-i18n-28.0b9/si.xpi) = 3b9bce86e7d988b6a295a66e0d201e9ddbe1647b936768132f7db86d2215203c
-SIZE (xpi/firefox-i18n-28.0b9/si.xpi) = 395719
-SHA256 (xpi/firefox-i18n-28.0b9/sk.xpi) = 4a169d6f2b95c273b7045895f5222914242c3d27cddc2bc04b26f75fb176b471
-SIZE (xpi/firefox-i18n-28.0b9/sk.xpi) = 367793
-SHA256 (xpi/firefox-i18n-28.0b9/sl.xpi) = d197d0bcedbfc5f99fa790eabb809d9832eaf9e56bccf96dcf7549a26743c837
-SIZE (xpi/firefox-i18n-28.0b9/sl.xpi) = 350318
-SHA256 (xpi/firefox-i18n-28.0b9/son.xpi) = 2959186d27fcae5ba29d06d5a44bcfae110e0ec9a013eb15fcf770a50a04448d
-SIZE (xpi/firefox-i18n-28.0b9/son.xpi) = 350561
-SHA256 (xpi/firefox-i18n-28.0b9/sq.xpi) = d45984b041f8cc15050b5b68460ad816d811dff06c1cef3271042610c7a91808
-SIZE (xpi/firefox-i18n-28.0b9/sq.xpi) = 366314
-SHA256 (xpi/firefox-i18n-28.0b9/sr.xpi) = 17382136222797cd0ec4171d63d8e11ae6dcf94176a8fc2e6acc134f355954ed
-SIZE (xpi/firefox-i18n-28.0b9/sr.xpi) = 405137
-SHA256 (xpi/firefox-i18n-28.0b9/sv-SE.xpi) = 315d3f9dccb9055597194f623a746917b327781fbed10c7c5b5f5f9bde1ee982
-SIZE (xpi/firefox-i18n-28.0b9/sv-SE.xpi) = 358317
-SHA256 (xpi/firefox-i18n-28.0b9/ta.xpi) = 64ddfa3ffe0057194a85b0e2c35d658fe1bf4b4bf2128d930e42b3988bc0c5d0
-SIZE (xpi/firefox-i18n-28.0b9/ta.xpi) = 408328
-SHA256 (xpi/firefox-i18n-28.0b9/te.xpi) = f718a407520bc92cba2db2a60662060577de9673421ec5a9439a6fa3a807304b
-SIZE (xpi/firefox-i18n-28.0b9/te.xpi) = 421142
-SHA256 (xpi/firefox-i18n-28.0b9/th.xpi) = c47dc16400f3a7f21c6a60a852bf466684ed275d29cc02138b483114ba55347e
-SIZE (xpi/firefox-i18n-28.0b9/th.xpi) = 406138
-SHA256 (xpi/firefox-i18n-28.0b9/tr.xpi) = 450063e99f4ae881a79e95dd845d57a9a08b2b11cdfdb219606919dbada62062
-SIZE (xpi/firefox-i18n-28.0b9/tr.xpi) = 362002
-SHA256 (xpi/firefox-i18n-28.0b9/uk.xpi) = 327a082ea46666a190e014ee049a2c1999114503562baf21cb2d14f5039aedf3
-SIZE (xpi/firefox-i18n-28.0b9/uk.xpi) = 385138
-SHA256 (xpi/firefox-i18n-28.0b9/vi.xpi) = 2749115ac714eeb1f1f79eb0a05b4ee2aaa52864691a78f9fa34c795823af380
-SIZE (xpi/firefox-i18n-28.0b9/vi.xpi) = 378860
-SHA256 (xpi/firefox-i18n-28.0b9/zh-CN.xpi) = cee35a222e8c9174a52521d0694b0472fa3f264d7363e739542cac3f3b593258
-SIZE (xpi/firefox-i18n-28.0b9/zh-CN.xpi) = 381766
-SHA256 (xpi/firefox-i18n-28.0b9/zh-TW.xpi) = 009e821bd96f3e518ec41c13aa6f742f2f4ec1a261e5ba84e3a4c4eb6ad342fa
-SIZE (xpi/firefox-i18n-28.0b9/zh-TW.xpi) = 375532
-SHA256 (xpi/firefox-i18n-28.0b9/zu.xpi) = 74c9722315adf22c6674183458e26d62986bd8b974fd951d882751caba2ed817
-SIZE (xpi/firefox-i18n-28.0b9/zu.xpi) = 365911
+SHA256 (xpi/firefox-i18n-28.0/ach.xpi) = 52cbc69477c292b8ccef4d5ba4717a4cedadcf60a83c9dc865f8c8481a3edf2b
+SIZE (xpi/firefox-i18n-28.0/ach.xpi) = 365708
+SHA256 (xpi/firefox-i18n-28.0/af.xpi) = 109514e364777495d33f6a459e2d256972451b8dd86c8305dd087af4fce59cd6
+SIZE (xpi/firefox-i18n-28.0/af.xpi) = 359588
+SHA256 (xpi/firefox-i18n-28.0/ar.xpi) = 7ca2b3985ab8da1e36fd006fb4fb96c0727abeb6c21991c1d28f817d7ef36b6e
+SIZE (xpi/firefox-i18n-28.0/ar.xpi) = 388973
+SHA256 (xpi/firefox-i18n-28.0/as.xpi) = 92e4d5305e57a4936a8569e9ac500c16aaebef02d13d90f82a05337a2ab823d2
+SIZE (xpi/firefox-i18n-28.0/as.xpi) = 404105
+SHA256 (xpi/firefox-i18n-28.0/ast.xpi) = 95564bf84f73b97ee19ff0c0048493c7dc21f14083c3f17d52466e3eaf6f5911
+SIZE (xpi/firefox-i18n-28.0/ast.xpi) = 316220
+SHA256 (xpi/firefox-i18n-28.0/be.xpi) = 07ad1ddf44d557f6804f472c350d71de5e2e6438329e6e6fdb914449adc113e3
+SIZE (xpi/firefox-i18n-28.0/be.xpi) = 342303
+SHA256 (xpi/firefox-i18n-28.0/bg.xpi) = a4b28e6416bb4b76667e032f694a5f72bb9e96673970a7d5f2d0e8e2b2af63a9
+SIZE (xpi/firefox-i18n-28.0/bg.xpi) = 393202
+SHA256 (xpi/firefox-i18n-28.0/bn-BD.xpi) = 7ffb345cb6ba7ab1368828ae88b0ec3ff3d57edb619cd5f6e990cd7d7f920f83
+SIZE (xpi/firefox-i18n-28.0/bn-BD.xpi) = 418538
+SHA256 (xpi/firefox-i18n-28.0/bn-IN.xpi) = d0f0495c5c98c7a0347326c0107b967c45543aecfbb4137d43cfeb5a7b53b436
+SIZE (xpi/firefox-i18n-28.0/bn-IN.xpi) = 413539
+SHA256 (xpi/firefox-i18n-28.0/br.xpi) = 30bdb422b90a2d1cd60dd3a1f8439277c3f8661cf07d5ee9ebe51ff2919e7e4e
+SIZE (xpi/firefox-i18n-28.0/br.xpi) = 353930
+SHA256 (xpi/firefox-i18n-28.0/bs.xpi) = 6a0eba0732d029deb52a766253aa8ab3d34d388ed682d1cd2863ec77ff7b2d32
+SIZE (xpi/firefox-i18n-28.0/bs.xpi) = 363402
+SHA256 (xpi/firefox-i18n-28.0/ca.xpi) = dea8d1aa53337a925af02d83a8984da787f790a6e83c65e238d303f36f5e42a8
+SIZE (xpi/firefox-i18n-28.0/ca.xpi) = 362967
+SHA256 (xpi/firefox-i18n-28.0/cs.xpi) = def646bc5ab3ab08a33f62e2f4745c8a2fc65c83f18fa62f6bd4d595d11fddfb
+SIZE (xpi/firefox-i18n-28.0/cs.xpi) = 356815
+SHA256 (xpi/firefox-i18n-28.0/csb.xpi) = b39e9dd55a63e90e9e67e7d349af37a07255cb02903703a4b7006681ac85feee
+SIZE (xpi/firefox-i18n-28.0/csb.xpi) = 347618
+SHA256 (xpi/firefox-i18n-28.0/cy.xpi) = 99a7401ab4da2c825db532818494cccc933a548b19adea547209439fc898ac0a
+SIZE (xpi/firefox-i18n-28.0/cy.xpi) = 354719
+SHA256 (xpi/firefox-i18n-28.0/da.xpi) = 33bab2c020c309aa6e690bdcfc14c786488fe523fb321eec49819f298a7c9558
+SIZE (xpi/firefox-i18n-28.0/da.xpi) = 348722
+SHA256 (xpi/firefox-i18n-28.0/de.xpi) = 9f1439c4df4f6f2b7b22c8c8fcf8ccba410c737d359d52954b61b3af1f48639e
+SIZE (xpi/firefox-i18n-28.0/de.xpi) = 355502
+SHA256 (xpi/firefox-i18n-28.0/el.xpi) = 855f2da9af921f2aa019da7373a1b308cae9783148e92606c2ed33c8a9f2dabc
+SIZE (xpi/firefox-i18n-28.0/el.xpi) = 389423
+SHA256 (xpi/firefox-i18n-28.0/en-GB.xpi) = 6bb8347a46c342046a53ad55d434d4e1c10a56b832e4e757423c795d03716575
+SIZE (xpi/firefox-i18n-28.0/en-GB.xpi) = 342860
+SHA256 (xpi/firefox-i18n-28.0/en-US.xpi) = 9a7e99e43d13fa133c2391c9f3569221ab95d28b310f6a7f0424c2a622b611cd
+SIZE (xpi/firefox-i18n-28.0/en-US.xpi) = 345900
+SHA256 (xpi/firefox-i18n-28.0/en-ZA.xpi) = 188f65e51b5e478059996f10dd4b134d82b3b50b9de22ad212522bbd7e2921a8
+SIZE (xpi/firefox-i18n-28.0/en-ZA.xpi) = 338114
+SHA256 (xpi/firefox-i18n-28.0/eo.xpi) = a525a942d5e0dfa62728deb7e114fcf1b4e98246edbe0d90f7f05fce904aca9e
+SIZE (xpi/firefox-i18n-28.0/eo.xpi) = 361749
+SHA256 (xpi/firefox-i18n-28.0/es-AR.xpi) = 8c04ccad977f33cea74331d7ae12e9621b9b41fd32257f9c41349d47ad26f384
+SIZE (xpi/firefox-i18n-28.0/es-AR.xpi) = 357323
+SHA256 (xpi/firefox-i18n-28.0/es-CL.xpi) = c68d8a9b3a5257ca11ed026e9f6ac598d4cece290ba07e3b8b3e6beefbda0fdc
+SIZE (xpi/firefox-i18n-28.0/es-CL.xpi) = 306617
+SHA256 (xpi/firefox-i18n-28.0/es-ES.xpi) = 51109bc5ec569c2fb64498258419b5bf6e0a812a9c743784f6bcbe00ea3b4082
+SIZE (xpi/firefox-i18n-28.0/es-ES.xpi) = 300690
+SHA256 (xpi/firefox-i18n-28.0/es-MX.xpi) = 46fb97f27d4090baf768d6c03b9a0bf61815dbc2e3e8281853ff020e4dd33b0d
+SIZE (xpi/firefox-i18n-28.0/es-MX.xpi) = 361856
+SHA256 (xpi/firefox-i18n-28.0/et.xpi) = 86b001fe3e4c37bfb9f4aa6cee6662813b955f20e61d4c751fd2086f8e0e2eff
+SIZE (xpi/firefox-i18n-28.0/et.xpi) = 345628
+SHA256 (xpi/firefox-i18n-28.0/eu.xpi) = 6bacfddd09877ddb4b76ed97f5ac81392cc29ef1fbe9807d3ac04212418181c3
+SIZE (xpi/firefox-i18n-28.0/eu.xpi) = 361444
+SHA256 (xpi/firefox-i18n-28.0/fa.xpi) = a911b54135b3066294b34dfc1338c8f2964175629a922a21b2e3b972a8eafff7
+SIZE (xpi/firefox-i18n-28.0/fa.xpi) = 401703
+SHA256 (xpi/firefox-i18n-28.0/ff.xpi) = 27812a70763159a811cf1596febeb6864dd97cf6a4c5ed281d6cf9e2569aab05
+SIZE (xpi/firefox-i18n-28.0/ff.xpi) = 354038
+SHA256 (xpi/firefox-i18n-28.0/fi.xpi) = 5402c2fe5058a1348a7f5bb7337f68b2410eab7f153201e611d45e9612b524f1
+SIZE (xpi/firefox-i18n-28.0/fi.xpi) = 352826
+SHA256 (xpi/firefox-i18n-28.0/fr.xpi) = 22a7cf22da44e3bf3cbe7105c82b8bf560923a4a5493004cd6c3fc4656df3fe8
+SIZE (xpi/firefox-i18n-28.0/fr.xpi) = 368924
+SHA256 (xpi/firefox-i18n-28.0/fy-NL.xpi) = 9ecb605da62d21f91c866faff7002c5e52abbb0eebd6903a678a9dd9abc7cc00
+SIZE (xpi/firefox-i18n-28.0/fy-NL.xpi) = 362225
+SHA256 (xpi/firefox-i18n-28.0/ga-IE.xpi) = 122dc9caf496e7ba3dbb52fa91f1a5ad9fa3411d1e0aced2392b9aa814a4b672
+SIZE (xpi/firefox-i18n-28.0/ga-IE.xpi) = 370253
+SHA256 (xpi/firefox-i18n-28.0/gd.xpi) = a5c3b5f6cfbf29c5a0eb8a63116d6b91ea75cb6761787f607f3de213eb4e0e58
+SIZE (xpi/firefox-i18n-28.0/gd.xpi) = 365215
+SHA256 (xpi/firefox-i18n-28.0/gl.xpi) = 971aab5029b474405283cd725e0ccf42766cae0a7b1af969620a6792eb164e96
+SIZE (xpi/firefox-i18n-28.0/gl.xpi) = 356135
+SHA256 (xpi/firefox-i18n-28.0/gu-IN.xpi) = a88d66d20db0c271941350ae45304ed251e6da695961a6b33046df7479f5fee1
+SIZE (xpi/firefox-i18n-28.0/gu-IN.xpi) = 383829
+SHA256 (xpi/firefox-i18n-28.0/he.xpi) = d132c3720fbfd8e4ef965a78fb293bc2dacf3e98aca4ab2c3d601eb146b8d90d
+SIZE (xpi/firefox-i18n-28.0/he.xpi) = 377878
+SHA256 (xpi/firefox-i18n-28.0/hi-IN.xpi) = 738f62d677f8de19392812fd13a3ffdc6d594ed66ec02f364e745c5aa71dbd15
+SIZE (xpi/firefox-i18n-28.0/hi-IN.xpi) = 402393
+SHA256 (xpi/firefox-i18n-28.0/hr.xpi) = 7fe8a9cb4dc7e4da12da4b8725d38f15d9e27a392e8eb5392fc42192e7086fa8
+SIZE (xpi/firefox-i18n-28.0/hr.xpi) = 368420
+SHA256 (xpi/firefox-i18n-28.0/hu.xpi) = 669e8ecb4a23d4786ef0a9543891a61f86199673a5b6251eb1e7a006458f7cc1
+SIZE (xpi/firefox-i18n-28.0/hu.xpi) = 365031
+SHA256 (xpi/firefox-i18n-28.0/hy-AM.xpi) = 1ace42576c5b55b19fc7a55b9c1dfeeeca05768013a301969508e3344870cadc
+SIZE (xpi/firefox-i18n-28.0/hy-AM.xpi) = 411717
+SHA256 (xpi/firefox-i18n-28.0/id.xpi) = e1f9fde0d3f62613171d20df84d458a51b1ca9db109a931038824ddab6f787ff
+SIZE (xpi/firefox-i18n-28.0/id.xpi) = 342613
+SHA256 (xpi/firefox-i18n-28.0/is.xpi) = 944a37fa34ad20109fc8f0ac0b3673e3b80908226f5fd0ec9a7e960951407119
+SIZE (xpi/firefox-i18n-28.0/is.xpi) = 357816
+SHA256 (xpi/firefox-i18n-28.0/it.xpi) = 376edafdb73cbb8c75b8143723e39a01b1f467d6a568a656189c043595a4dbcf
+SIZE (xpi/firefox-i18n-28.0/it.xpi) = 298277
+SHA256 (xpi/firefox-i18n-28.0/ja.xpi) = 5c80bb42b5bdb7c12c77bf7b3658f55d19ae281f14ade333f1de4af02770381d
+SIZE (xpi/firefox-i18n-28.0/ja.xpi) = 397187
+SHA256 (xpi/firefox-i18n-28.0/kk.xpi) = a1743784c9bf0029eec6daffecb3b7b9ade1548565212bd8cc676161036132dc
+SIZE (xpi/firefox-i18n-28.0/kk.xpi) = 400317
+SHA256 (xpi/firefox-i18n-28.0/km.xpi) = d1980fe1a2c666c89c340904814bf5982804c34739eb7e7db4b97694cd35d5fc
+SIZE (xpi/firefox-i18n-28.0/km.xpi) = 430426
+SHA256 (xpi/firefox-i18n-28.0/kn.xpi) = ebad90b063d8a04955bac4be2e230a945943a6cdd3174c02f45acedeb12506a6
+SIZE (xpi/firefox-i18n-28.0/kn.xpi) = 414253
+SHA256 (xpi/firefox-i18n-28.0/ko.xpi) = e3a368800a0370d61845bb4faa8ac70c7c6b90cceaa485b33fa89908d49d6a53
+SIZE (xpi/firefox-i18n-28.0/ko.xpi) = 364490
+SHA256 (xpi/firefox-i18n-28.0/ku.xpi) = 824dadf39304860073e05b6e7683d687fc612de3aef393f69c0e633dfa6689e9
+SIZE (xpi/firefox-i18n-28.0/ku.xpi) = 370338
+SHA256 (xpi/firefox-i18n-28.0/lij.xpi) = 196b24f5d5f2da3aaa8f3c8387b13d15bede7e690d7b32dc96cec3a895afc744
+SIZE (xpi/firefox-i18n-28.0/lij.xpi) = 343230
+SHA256 (xpi/firefox-i18n-28.0/lt.xpi) = 196ca50007319d4030fb1d0c26b12ccb0b514b5895c50e45fe0091c9b4e41dec
+SIZE (xpi/firefox-i18n-28.0/lt.xpi) = 375228
+SHA256 (xpi/firefox-i18n-28.0/lv.xpi) = fbd42a1d456a903d2d8154fa3e499ea45fa4d29c4348cb049a51818ed1f032ff
+SIZE (xpi/firefox-i18n-28.0/lv.xpi) = 352613
+SHA256 (xpi/firefox-i18n-28.0/mai.xpi) = 09eb145602f2fa14371a23bde5e085d423d7036d945b60e33838ade6935add55
+SIZE (xpi/firefox-i18n-28.0/mai.xpi) = 402487
+SHA256 (xpi/firefox-i18n-28.0/mk.xpi) = 8ad767e9da7fe936791dbb6bf625e643e67195373d5f01a27f21df4132602986
+SIZE (xpi/firefox-i18n-28.0/mk.xpi) = 403249
+SHA256 (xpi/firefox-i18n-28.0/ml.xpi) = fe6437019f5b469addcb5dcb864ecc1d79bda3a2ac586396f8e9c93f60a2ee36
+SIZE (xpi/firefox-i18n-28.0/ml.xpi) = 422955
+SHA256 (xpi/firefox-i18n-28.0/mr.xpi) = 9b7ee540d407f88e3c32416cbf309375ec1697e87f53ca459381c8a19527d4a1
+SIZE (xpi/firefox-i18n-28.0/mr.xpi) = 400779
+SHA256 (xpi/firefox-i18n-28.0/nb-NO.xpi) = 45bf4c908470fb6baffda68f1cc3b08cf721cbfa16bb869aae5ff1cc6ebac856
+SIZE (xpi/firefox-i18n-28.0/nb-NO.xpi) = 352710
+SHA256 (xpi/firefox-i18n-28.0/nl.xpi) = 4fad3219ce6fdc583998ace0eb471472ea589516afc439239e03088dabbcc4e8
+SIZE (xpi/firefox-i18n-28.0/nl.xpi) = 354060
+SHA256 (xpi/firefox-i18n-28.0/nn-NO.xpi) = f7bace2cddec15e17ea7df21f2554cfb53f1e4336857e420d1ef90c89afb679c
+SIZE (xpi/firefox-i18n-28.0/nn-NO.xpi) = 350907
+SHA256 (xpi/firefox-i18n-28.0/or.xpi) = 18c00ca87e852a8fc94697a50fba2c1396544b3d48db848fb81f621208766169
+SIZE (xpi/firefox-i18n-28.0/or.xpi) = 415914
+SHA256 (xpi/firefox-i18n-28.0/pa-IN.xpi) = 8c9907488e6104acdc30b9dd7bd19bc08d9b6dd3335033c3e11864615f7508bd
+SIZE (xpi/firefox-i18n-28.0/pa-IN.xpi) = 390707
+SHA256 (xpi/firefox-i18n-28.0/pl.xpi) = a07d3b532152320047ce6373ab1c569529d58db4d9e383f2496dffb08879552e
+SIZE (xpi/firefox-i18n-28.0/pl.xpi) = 350840
+SHA256 (xpi/firefox-i18n-28.0/pt-BR.xpi) = bcdb92ea42497728356cfd559fde9b946425c01fcb465c3f5329944836f4e5ae
+SIZE (xpi/firefox-i18n-28.0/pt-BR.xpi) = 364786
+SHA256 (xpi/firefox-i18n-28.0/pt-PT.xpi) = e9d9318dc85a39d70c7dc16d97dbedd467b0a833c6acbba96c1a6a1d483c3aff
+SIZE (xpi/firefox-i18n-28.0/pt-PT.xpi) = 351712
+SHA256 (xpi/firefox-i18n-28.0/rm.xpi) = 08bb51d2ad566c5f0740ddbec7482deab023c4f9ea9d5ab2078df05a9fdc65e0
+SIZE (xpi/firefox-i18n-28.0/rm.xpi) = 355274
+SHA256 (xpi/firefox-i18n-28.0/ro.xpi) = df807158b6f8a2b3af4bf832470dd78b65ee9313d707ad72963d1417f87f4399
+SIZE (xpi/firefox-i18n-28.0/ro.xpi) = 389917
+SHA256 (xpi/firefox-i18n-28.0/ru.xpi) = 034b83e88692f0205e73aee8158beb29a7715d7f0ad9b584b2e8056effd3625c
+SIZE (xpi/firefox-i18n-28.0/ru.xpi) = 338409
+SHA256 (xpi/firefox-i18n-28.0/si.xpi) = 456a25e227bc631a0c686cbaea64f83dcc886d4321fd5b3fad94d827046e9f7e
+SIZE (xpi/firefox-i18n-28.0/si.xpi) = 395716
+SHA256 (xpi/firefox-i18n-28.0/sk.xpi) = 9ca51fcaef3d3f83cfbb919517958f6af8d3c799179df9c687b62f4a312882b6
+SIZE (xpi/firefox-i18n-28.0/sk.xpi) = 367790
+SHA256 (xpi/firefox-i18n-28.0/sl.xpi) = a3e352b270f57ee4c5a089471775dc36be66acd8f79d674e28e2ee9e92862b0e
+SIZE (xpi/firefox-i18n-28.0/sl.xpi) = 350314
+SHA256 (xpi/firefox-i18n-28.0/son.xpi) = 194b6a19c4632b0890c159c658a5fb9fafc94572ba62c00171a5d22a47cdc7de
+SIZE (xpi/firefox-i18n-28.0/son.xpi) = 350556
+SHA256 (xpi/firefox-i18n-28.0/sq.xpi) = 3e4fee63edb517e7d830d4588b10260374c1580917a44e5d809afe8362ccde4b
+SIZE (xpi/firefox-i18n-28.0/sq.xpi) = 366311
+SHA256 (xpi/firefox-i18n-28.0/sr.xpi) = 53719a3f2233853c393edd3c9d6951515dd266dd8e5665ffea3b3dccc1a16201
+SIZE (xpi/firefox-i18n-28.0/sr.xpi) = 405134
+SHA256 (xpi/firefox-i18n-28.0/sv-SE.xpi) = 74599894851e7d5ac26946be0976d73b86006a30d39b49d331cc0e2f8f959e37
+SIZE (xpi/firefox-i18n-28.0/sv-SE.xpi) = 358314
+SHA256 (xpi/firefox-i18n-28.0/ta.xpi) = c14bf363528dfe7026e59af9d980cb573fe677c3a5db88729257cf3773fa9415
+SIZE (xpi/firefox-i18n-28.0/ta.xpi) = 408325
+SHA256 (xpi/firefox-i18n-28.0/te.xpi) = a9f7daef496773e1eda0cbca215f73b68e75f8af3b9d1974d4cf333a06464f54
+SIZE (xpi/firefox-i18n-28.0/te.xpi) = 421139
+SHA256 (xpi/firefox-i18n-28.0/th.xpi) = 18053f23ae935567dadf3209c2101b447cba1e821ed272e77fb1a223f54ed388
+SIZE (xpi/firefox-i18n-28.0/th.xpi) = 406135
+SHA256 (xpi/firefox-i18n-28.0/tr.xpi) = af9326890a374d1280ff83e8a0dbfdd72ed23891fa83b5b64f19698a858911a6
+SIZE (xpi/firefox-i18n-28.0/tr.xpi) = 361998
+SHA256 (xpi/firefox-i18n-28.0/uk.xpi) = 8f21286473cb0aa63f49f0c2d0f02130adee640c628ddd689be4f366a7f1bd61
+SIZE (xpi/firefox-i18n-28.0/uk.xpi) = 388297
+SHA256 (xpi/firefox-i18n-28.0/vi.xpi) = 9d6d40b4d87f493e948c0551a6a511f09292266ef3dbd79d385291aef1909f84
+SIZE (xpi/firefox-i18n-28.0/vi.xpi) = 378856
+SHA256 (xpi/firefox-i18n-28.0/zh-CN.xpi) = d2351bf02061b26819d363a5173775bd8bb552be2b99d9e91e154cb2bd669e88
+SIZE (xpi/firefox-i18n-28.0/zh-CN.xpi) = 381762
+SHA256 (xpi/firefox-i18n-28.0/zh-TW.xpi) = 4c2f26828f9e9652d9b8a0720df6813c39c721480c7477b73bc364850944dd9c
+SIZE (xpi/firefox-i18n-28.0/zh-TW.xpi) = 375528
+SHA256 (xpi/firefox-i18n-28.0/zu.xpi) = 8dfcea1363e35f6973b3ad1fba8702814c48b347bd9d112c36ed11ce273de081
+SIZE (xpi/firefox-i18n-28.0/zu.xpi) = 365908
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/firefox-nightly/Makefile Fri Mar 14 06:59:45 2014 (r1553)
@@ -26,7 +26,7 @@
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
# cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
-# nss>=3.15.5:${PORTSDIR}/security/nss \
+# nss>=3.16:${PORTSDIR}/security/nss \
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/firefox-nightly/Makefile.hgrev Fri Mar 14 06:59:45 2014 (r1553)
@@ -1 +1 @@
-HGREV= 172638:6e816e44735d
+HGREV= 173468:88425ad0f06a
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/firefox-nightly/distinfo Fri Mar 14 06:59:45 2014 (r1553)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/6e816e44735d.tar.bz2) = 3e4a20914e6f0bb9b0987c86937eff9cc4d34db7ea451f5696eea9f3dc96bb83
-SIZE (firefox-nightly/6e816e44735d.tar.bz2) = 136999191
+SHA256 (firefox-nightly/88425ad0f06a.tar.bz2) = b402bb5ab07fab56e5fbbf153e3437cecc1b70c670909da8f59a8dc126b5f042
+SIZE (firefox-nightly/88425ad0f06a.tar.bz2) = 137539419
Deleted: trunk/www/firefox-nightly/files/patch-revert-bug975011
==============================================================================
--- trunk/www/firefox-nightly/files/patch-revert-bug975011 Fri Mar 14 06:59:45 2014 (r1552)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,577 +0,0 @@
-commit 2565521
-Author: Steve Fink <sfink@mozilla.com>
-Date: Tue Feb 25 14:15:16 2014 -0800
-
- Bug 975011 - add an option to configure and build NSPR from within js/src build. r=glandium
----
- aclocal.m4 | 1 +
- build/autoconf/nspr-build.m4 | 235 +++++++++++++++++++++++++++++++++++++++++++
- configure.in | 89 +---------------
- js/src/aclocal.m4 | 1 +
- js/src/configure.in | 99 ++----------------
- moz.build | 9 +-
- 6 files changed, 251 insertions(+), 183 deletions(-)
-
-diff --git aclocal.m4 aclocal.m4
-index 1c7296e..e5fdb4a 100644
---- aclocal.m4
-+++ aclocal.m4
-@@ -11,7 +11,6 @@
- builtin(include, build/autoconf/ccache.m4)dnl
- builtin(include, build/autoconf/wrapper.m4)dnl
- builtin(include, build/autoconf/nspr.m4)dnl
--builtin(include, build/autoconf/nspr-build.m4)dnl
- builtin(include, build/autoconf/nss.m4)dnl
- builtin(include, build/autoconf/pkg.m4)dnl
- builtin(include, build/autoconf/codeset.m4)dnl
-diff --git build/autoconf/nspr-build.m4 build/autoconf/nspr-build.m4
-new file mode 100644
-index 0000000..da427fb
---- build/autoconf/nspr-build.m4
-+++ /dev/null
-@@ -1,235 +0,0 @@
--dnl This Source Code Form is subject to the terms of the Mozilla Public
--dnl License, v. 2.0. If a copy of the MPL was not distributed with this
--dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
--
--AC_DEFUN([MOZ_CONFIG_NSPR], [
--
--ifelse([$1],[],,[define(CONFIGURING_JS,yes)])
--
--dnl Possible ways this can be called:
--dnl from toplevel configure:
--dnl JS_STANDALONE= BUILDING_JS=
--dnl from js/src/configure invoked by toplevel configure:
--dnl JS_STANDALONE= BUILDING_JS=1
--dnl from standalone js/src/configure:
--dnl JS_STANDALONE=1 BUILDING_JS=1
--
--dnl ========================================================
--dnl = Find the right NSPR to use.
--dnl ========================================================
--MOZ_ARG_WITH_STRING(nspr-cflags,
--[ --with-nspr-cflags=FLAGS
-- Pass FLAGS to CC when building code that uses NSPR.
-- Use this when there's no accurate nspr-config
-- script available. This is the case when building
-- SpiderMonkey as part of the Mozilla tree: the
-- top-level configure script computes NSPR flags
-- that accomodate the quirks of that environment.],
-- NSPR_CFLAGS=$withval)
--MOZ_ARG_WITH_STRING(nspr-libs,
--[ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
-- See --with-nspr-cflags for more details.],
-- NSPR_LIBS=$withval)
--
--ifdef([CONFIGURING_JS],[
-- MOZ_ARG_ENABLE_BOOL(nspr-build,
--[ --enable-nspr-build Configure and build NSPR from source tree],
-- MOZ_BUILD_NSPR=1,
-- MOZ_BUILD_NSPR=)
--])
--
--if test -z "$BUILDING_JS" || test -n "$JS_STANDALONE"; then
-- _IS_OUTER_CONFIGURE=1
--fi
--
--MOZ_ARG_WITH_BOOL(system-nspr,
--[ --with-system-nspr Use an NSPR that is already built and installed.
-- Use the 'nspr-config' script in the current path,
-- or look for the script in the directories given with
-- --with-nspr-exec-prefix or --with-nspr-prefix.
-- (Those flags are only checked if you specify
-- --with-system-nspr.)],
-- _USE_SYSTEM_NSPR=1 )
--
--JS_POSIX_NSPR=unset
--ifdef([CONFIGURING_JS],[
-- if test -n "$JS_STANDALONE"; then
-- case "$target" in
-- *linux*|*darwin*|*dragonfly*|*freebsd*|*netbsd*|*openbsd*)
-- if test -z "$_HAS_NSPR" && test "$JS_THREADSAFE"; then
-- JS_POSIX_NSPR_DEFAULT=1
-- fi
-- ;;
-- esac
-- fi
--
-- MOZ_ARG_ENABLE_BOOL(posix-nspr-emulation,
--[ --enable-posix-nspr-emulation
-- Enable emulation of NSPR for POSIX systems],
-- JS_POSIX_NSPR=1,
-- JS_POSIX_NSPR=)
--]) dnl ifdef CONFIGURING_JS
--
--dnl Pass at most one of
--dnl --with-system-nspr
--dnl --with-nspr-cflags/libs
--dnl --enable-nsprpub
--dnl --enable-posix-nspr-emulation
--
--AC_MSG_CHECKING([NSPR selection])
--nspr_opts=
--which_nspr=default
--if test "$_USE_SYSTEM_NSPR"; then
-- nspr_opts="x$nspr_opts"
-- which_nspr="system"
--fi
--if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
-- nspr_opts="x$nspr_opts"
-- which_nspr="command-line"
--fi
--if test -n "$MOZ_BUILD_NSPR"; then
-- nspr_opts="x$nspr_opts"
-- which_nspr="source-tree"
--fi
--if test "$JS_POSIX_NSPR" != unset; then
-- nspr_opts="x$nspr_opts"
-- which_nspr="posix-wrapper"
--fi
--if test -z "$nspr_opts" || test "$nspr_opts" = x; then
-- AC_MSG_RESULT($which_nspr)
--else
-- AC_MSG_ERROR([only one way of using NSPR may be selected. See 'configure --help'.])
--fi
--
--if test -z "$nspr_opts"; then
-- if test -z "$BUILDING_JS"; then
-- dnl Toplevel configure defaults to using nsprpub from the source tree
-- MOZ_BUILD_NSPR=1
-- else
-- dnl JS configure defaults to emulated NSPR if available, falling back to nsprpub
-- JS_POSIX_NSPR="$JS_POSIX_NSPR_DEFAULT"
-- if test -z "$JS_POSIX_NSPR"; then
-- MOZ_BUILD_NSPR=1
-- fi
-- fi
--fi
--
--AC_SUBST(MOZ_BUILD_NSPR)
--
--if test "$JS_POSIX_NSPR" = unset; then
-- JS_POSIX_NSPR=
--fi
--
--if test -n "$BUILDING_JS"; then
-- if test "$JS_POSIX_NSPR" = 1; then
-- AC_DEFINE(JS_POSIX_NSPR)
-- fi
-- AC_SUBST(JS_POSIX_NSPR)
--fi
--
--if test -n "$_IS_OUTER_CONFIGURE"; then
--
--if test -n "$_USE_SYSTEM_NSPR" -o -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
-- AM_PATH_NSPR($NSPR_MINVER, [MOZ_NATIVE_NSPR=1], [AC_MSG_ERROR([you do not have NSPR installed or your version is older than $NSPR_MINVER.])])
--fi
--
--if test -n "$MOZ_NATIVE_NSPR"; then
-- _SAVE_CFLAGS=$CFLAGS
-- CFLAGS="$CFLAGS $NSPR_CFLAGS"
-- AC_TRY_COMPILE([#include "prtypes.h"],
-- [#ifndef PR_STATIC_ASSERT
-- #error PR_STATIC_ASSERT not defined or requires including prtypes.h
-- #endif],
-- ,
-- AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it]))
-- AC_TRY_COMPILE([#include "prtypes.h"],
-- [#ifndef PR_UINT64
-- #error PR_UINT64 not defined or requires including prtypes.h
-- #endif],
-- ,
-- AC_MSG_ERROR([system NSPR does not support PR_UINT64 or including prtypes.h does not provide it]))
-- CFLAGS=$_SAVE_CFLAGS
--elif test -z "$JS_POSIX_NSPR"; then
-- if test -z "$LIBXUL_SDK"; then
-- NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
-- if test -n "$GNU_CC"; then
-- NSPR_LIBS="-L${LIBXUL_DIST}/lib -lnspr${NSPR_VERSION} -lplc${NSPR_VERSION} -lplds${NSPR_VERSION}"
-- else
-- NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
-- fi
-- else
-- NSPR_CFLAGS=`"${LIBXUL_DIST}"/sdk/bin/nspr-config --prefix="${LIBXUL_DIST}" --includedir="${LIBXUL_DIST}/include/nspr" --cflags`
-- NSPR_LIBS=`"${LIBXUL_DIST}"/sdk/bin/nspr-config --prefix="${LIBXUL_DIST}" --libdir="${LIBXUL_DIST}"/lib --libs`
-- fi
--fi
--
--AC_SUBST(NSPR_CFLAGS)
--AC_SUBST(NSPR_LIBS)
--
--NSPR_PKGCONF_CHECK="nspr"
--if test -n "$MOZ_NATIVE_NSPR"; then
-- # piggy back on $MOZ_NATIVE_NSPR to set a variable for the nspr check for js.pc
-- NSPR_PKGCONF_CHECK="nspr >= $NSPR_MINVER"
--
-- _SAVE_CFLAGS=$CFLAGS
-- CFLAGS="$CFLAGS $NSPR_CFLAGS"
-- AC_TRY_COMPILE([#include "prlog.h"],
-- [#ifndef PR_STATIC_ASSERT
-- #error PR_STATIC_ASSERT not defined
-- #endif],
-- ,
-- AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
-- CFLAGS=$_SAVE_CFLAGS
--fi
--AC_SUBST(NSPR_PKGCONF_CHECK)
--
--fi # _IS_OUTER_CONFIGURE
--
--])
--
--AC_DEFUN([MOZ_SUBCONFIGURE_NSPR], [
--
--if test -z "$MOZ_NATIVE_NSPR"; then
-- ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-- if test -z "$MOZ_DEBUG"; then
-- ac_configure_args="$ac_configure_args --disable-debug"
-- else
-- ac_configure_args="$ac_configure_args --enable-debug"
-- fi
-- if test "$MOZ_OPTIMIZE" = "1"; then
-- ac_configure_args="$ac_configure_args --enable-optimize"
-- elif test -z "$MOZ_OPTIMIZE"; then
-- ac_configure_args="$ac_configure_args --disable-optimize"
-- fi
-- if test -n "$HAVE_64BIT_OS"; then
-- ac_configure_args="$ac_configure_args --enable-64bit"
-- fi
-- if test -n "$USE_ARM_KUSER"; then
-- ac_configure_args="$ac_configure_args --with-arm-kuser"
-- fi
-- ac_configure_args="$ac_configure_args $NSPR_CONFIGURE_ARGS"
--
-- # Save these, so we can mess with them for the subconfigure ..
-- _SAVE_CFLAGS="$CFLAGS"
-- _SAVE_CPPFLAGS="$CPPFLAGS"
-- _SAVE_LDFLAGS="$LDFLAGS"
--
-- if test -n "$MOZ_LINKER" -a "$ac_cv_func_dladdr" = no ; then
-- # dladdr is supported by the new linker, even when the system linker doesn't
-- # support it. Trick nspr into using dladdr when it's not supported.
-- export CPPFLAGS="-include $_topsrcdir/mozglue/linker/dladdr.h $CPPFLAGS"
-- fi
-- export LDFLAGS="$LDFLAGS $NSPR_LDFLAGS"
-- export CFLAGS="$CFLAGS $MOZ_FRAMEPTR_FLAGS"
--
-- AC_OUTPUT_SUBDIRS(nsprpub)
--
-- # .. and restore them
-- CFLAGS="$_SAVE_CFLAGS"
-- CPPFLAGS="$_SAVE_CPPFLAGS"
-- LDFLAGS="$_SAVE_LDFLAGS"
--
-- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
--fi
--
--])
-diff --git configure.in configure.in
-index ed3b174..4cc2115 100644
---- configure.in
-+++ configure.in
-@@ -53,7 +53,6 @@
- MOZJPEG=62
- MOZPNG=10609
- NSPR_VERSION=4
--NSPR_MINVER=4.10.3
- NSS_VERSION=3
-
- dnl Set the minimum version of toolkit libs used by mozilla
-@@ -132,7 +131,7 @@
- exit 1
- break
- fi
--MOZ_BUILD_ROOT=`pwd -W 2>/dev/null || pwd`
-+MOZ_BUILD_ROOT=`pwd`
-
- MOZ_PYTHON
-
-@@ -2192,6 +2191,7 @@
-
- case "$host" in
- *-mingw*)
-+ MOZ_BUILD_ROOT=`cd $MOZ_BUILD_ROOT && pwd -W`
- if test -n "$L10NBASEDIR"; then
- L10NBASEDIR=`cd $L10NBASEDIR && pwd -W`
- fi
-@@ -3505,7 +3505,47 @@
- [ --with-system-libxul Use system installed libxul SDK],
- SYSTEM_LIBXUL=1)
-
--MOZ_CONFIG_NSPR()
-+dnl ========================================================
-+dnl = If NSPR was not detected in the system,
-+dnl = use the one in the source tree (mozilla/nsprpub)
-+dnl ========================================================
-+MOZ_ARG_WITH_BOOL(system-nspr,
-+[ --with-system-nspr Use system installed NSPR],
-+ _USE_SYSTEM_NSPR=1 )
-+
-+if test -n "$_USE_SYSTEM_NSPR"; then
-+ AM_PATH_NSPR(4.10.3, [MOZ_NATIVE_NSPR=1], [AC_MSG_ERROR([your don't have NSPR installed or your version is too old])])
-+fi
-+
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ _SAVE_CFLAGS=$CFLAGS
-+ CFLAGS="$CFLAGS $NSPR_CFLAGS"
-+ AC_TRY_COMPILE([#include "prtypes.h"],
-+ [#ifndef PR_STATIC_ASSERT
-+ #error PR_STATIC_ASSERT not defined or requires including prtypes.h
-+ #endif],
-+ [MOZ_NATIVE_NSPR=1],
-+ AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it]))
-+ AC_TRY_COMPILE([#include "prtypes.h"],
-+ [#ifndef PR_UINT64
-+ #error PR_UINT64 not defined or requires including prtypes.h
-+ #endif],
-+ [MOZ_NATIVE_NSPR=1],
-+ AC_MSG_ERROR([system NSPR does not support PR_UINT64 or including prtypes.h does not provide it]))
-+ CFLAGS=$_SAVE_CFLAGS
-+else
-+ if test -z "$LIBXUL_SDK"; then
-+ NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
-+ if test -n "$GNU_CC"; then
-+ NSPR_LIBS="-L${LIBXUL_DIST}/lib -lnspr${NSPR_VERSION} -lplc${NSPR_VERSION} -lplds${NSPR_VERSION}"
-+ else
-+ NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
-+ fi
-+ else
-+ NSPR_CFLAGS=`"${LIBXUL_DIST}"/sdk/bin/nspr-config --prefix="${LIBXUL_DIST}" --includedir="${LIBXUL_DIST}/include/nspr" --cflags`
-+ NSPR_LIBS=`"${LIBXUL_DIST}"/sdk/bin/nspr-config --prefix="${LIBXUL_DIST}" --libdir="${LIBXUL_DIST}"/lib --libs`
-+ fi
-+fi
-
- dnl set GRE_MILESTONE
- dnl ========================================================
-@@ -8925,7 +8965,48 @@
- _SUBDIR_CONFIG_ARGS="`echo $_SUBDIR_CONFIG_ARGS | sed -e 's/--enable-wrap-malloc *//'`"
- fi
-
--MOZ_SUBCONFIGURE_NSPR()
-+if test -z "$MOZ_NATIVE_NSPR"; then
-+ ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-+ if test -z "$MOZ_DEBUG"; then
-+ ac_configure_args="$ac_configure_args --disable-debug"
-+ else
-+ ac_configure_args="$ac_configure_args --enable-debug"
-+ fi
-+ if test "$MOZ_OPTIMIZE" = "1"; then
-+ ac_configure_args="$ac_configure_args --enable-optimize"
-+ elif test -z "$MOZ_OPTIMIZE"; then
-+ ac_configure_args="$ac_configure_args --disable-optimize"
-+ fi
-+ if test -n "$HAVE_64BIT_OS"; then
-+ ac_configure_args="$ac_configure_args --enable-64bit"
-+ fi
-+ if test -n "$USE_ARM_KUSER"; then
-+ ac_configure_args="$ac_configure_args --with-arm-kuser"
-+ fi
-+ ac_configure_args="$ac_configure_args $NSPR_CONFIGURE_ARGS"
-+
-+ # Save these, so we can mess with them for the subconfigure ..
-+ _SAVE_CFLAGS="$CFLAGS"
-+ _SAVE_CPPFLAGS="$CPPFLAGS"
-+ _SAVE_LDFLAGS="$LDFLAGS"
-+
-+ if test -n "$MOZ_LINKER" -a "$ac_cv_func_dladdr" = no ; then
-+ # dladdr is supported by the new linker, even when the system linker doesn't
-+ # support it. Trick nspr into using dladdr when it's not supported.
-+ export CPPFLAGS="-include $_topsrcdir/mozglue/linker/dladdr.h $CPPFLAGS"
-+ fi
-+ export LDFLAGS="$LDFLAGS $NSPR_LDFLAGS"
-+ export CFLAGS="$CFLAGS $MOZ_FRAMEPTR_FLAGS"
-+
-+ AC_OUTPUT_SUBDIRS(nsprpub)
-+
-+ # .. and restore them
-+ CFLAGS="$_SAVE_CFLAGS"
-+ CPPFLAGS="$_SAVE_CPPFLAGS"
-+ LDFLAGS="$_SAVE_LDFLAGS"
-+
-+ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+fi
-
- dnl ========================================================
- dnl = Setup a nice relatively clean build environment for
-diff --git js/src/aclocal.m4 js/src/aclocal.m4
-index 348d6d4..8560b03 100644
---- js/src/aclocal.m4
-+++ js/src/aclocal.m4
-@@ -12,7 +12,6 @@
- builtin(include, ../../build/autoconf/wrapper.m4)dnl
- builtin(include, ../../build/autoconf/pkg.m4)dnl
- builtin(include, ../../build/autoconf/nspr.m4)dnl
--builtin(include, ../../build/autoconf/nspr-build.m4)dnl
- builtin(include, ../../build/autoconf/codeset.m4)dnl
- builtin(include, ../../build/autoconf/altoptions.m4)dnl
- builtin(include, ../../build/autoconf/mozprog.m4)dnl
-diff --git js/src/configure.in js/src/configure.in
-index 2950734..bddd46d 100644
---- js/src/configure.in
-+++ js/src/configure.in
-@@ -104,7 +104,7 @@
- break
- fi
- fi
--MOZ_BUILD_ROOT=`pwd -W 2>/dev/null || pwd`
-+MOZ_BUILD_ROOT=`pwd`
-
- dnl Choose where to put the 'dist' directory.
- dnl ==============================================================
-@@ -163,7 +163,6 @@
- JS_STANDALONE=
- else
- JS_STANDALONE=1
-- LIBXUL_DIST="$MOZ_BUILD_ROOT/dist"
- AC_DEFINE(JS_STANDALONE)
- fi
- AC_SUBST(JS_STANDALONE)
-@@ -1712,6 +1711,12 @@
-
- case "$host" in
- *-mingw*)
-+ MOZ_BUILD_ROOT=`cd $MOZ_BUILD_ROOT && pwd -W`
-+ ;;
-+ esac
-+
-+ case "$host" in
-+ *-mingw*)
- if test -z "$MOZ_TOOLS"; then
- AC_MSG_ERROR([MOZ_TOOLS is not set])
- fi
-@@ -2818,6 +2823,34 @@
- dnl ========================================================
- MOZ_ARG_HEADER(External Packages)
-
-+dnl ========================================================
-+dnl = Find the right NSPR to use.
-+dnl ========================================================
-+MOZ_ARG_WITH_BOOL(system-nspr,
-+[ --with-system-nspr Use an NSPR that is already built and installed.
-+ Use the 'nspr-config' script in the current path,
-+ or look for the script in the directories given with
-+ --with-nspr-exec-prefix or --with-nspr-prefix.
-+ (Those flags are only checked if you specify
-+ --with-system-nspr.)],
-+ _USE_SYSTEM_NSPR=1 )
-+
-+MOZ_ARG_WITH_STRING(nspr-cflags,
-+[ --with-nspr-cflags=FLAGS
-+ Pass FLAGS to CC when building code that uses NSPR.
-+ Use this when there's no accurate nspr-config
-+ script available. This is the case when building
-+ SpiderMonkey as part of the Mozilla tree: the
-+ top-level configure script computes NSPR flags
-+ that accomodate the quirks of that environment.],
-+ NSPR_CFLAGS=$withval)
-+MOZ_ARG_WITH_STRING(nspr-libs,
-+[ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
-+ See --with-nspr-cflags for more details.],
-+ NSPR_LIBS=$withval)
-+AC_SUBST(NSPR_CFLAGS)
-+AC_SUBST(NSPR_LIBS)
-+
- JS_THREADSAFE=1
- MOZ_ARG_DISABLE_BOOL(threadsafe,
- [ --disable-threadsafe Disable support for multiple threads.],
-@@ -2827,7 +2860,64 @@
- AC_DEFINE(JS_THREADSAFE)
- fi
-
--MOZ_CONFIG_NSPR(js)
-+if test "$_USE_SYSTEM_NSPR" || (test "$NSPR_CFLAGS" -o "$NSPR_LIBS"); then
-+ _HAS_NSPR=1
-+fi
-+
-+case "$target" in
-+ *linux*|*darwin*|*dragonfly*|*freebsd*|*netbsd*|*openbsd*)
-+ if test -z "$_HAS_NSPR" && test "$JS_THREADSAFE"; then
-+ JS_POSIX_NSPR_DEFAULT=1
-+ fi
-+ ;;
-+esac
-+
-+MOZ_ARG_ENABLE_BOOL(posix-nspr-emulation,
-+[ --enable-posix-nspr-emulation
-+ Enable emulation of NSPR for POSIX systems],
-+ JS_POSIX_NSPR=1,
-+ JS_POSIX_NSPR=,
-+ JS_POSIX_NSPR="$JS_POSIX_NSPR_DEFAULT" )
-+if test -n "$JS_POSIX_NSPR"; then
-+ AC_DEFINE(JS_POSIX_NSPR)
-+fi
-+
-+AC_SUBST(JS_POSIX_NSPR)
-+
-+dnl Pass either --with-system-nspr or (--with-nspr-cflags and
-+dnl --with-nspr-libs), but not both.
-+if test "$_USE_SYSTEM_NSPR" && (test "$NSPR_CFLAGS" -o "$NSPR_LIBS"); then
-+ AC_MSG_ERROR([--with-system-nspr and --with-nspr-libs/cflags are mutually exclusive.
-+See 'configure --help'.])
-+fi
-+
-+dnl Can't use --enable-posix-nspr-emulation if compiling with NSPR.
-+if test "$_HAS_NSPR" && test "$JS_POSIX_NSPR"; then
-+ AC_MSG_ERROR([--enable-posix-nspr-emulation is mututally exclusive with --with-system-nspr
-+and --with-nspr-libs/cflags. See 'configure --help'.])
-+fi
-+
-+if test -n "$_USE_SYSTEM_NSPR"; then
-+ MOZ_NATIVE_NSPR=
-+ AM_PATH_NSPR($NSPR_MINVER, [MOZ_NATIVE_NSPR=1], [AC_MSG_ERROR([your don't have NSPR installed or your version is too old])])
-+fi
-+
-+NSPR_PKGCONF_CHECK="nspr"
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ # piggy back on $MOZ_NATIVE_NSPR to set a variable for the nspr check for js.pc
-+ NSPR_PKGCONF_CHECK="nspr >= $NSPR_MINVER"
-+
-+ _SAVE_CFLAGS=$CFLAGS
-+ CFLAGS="$CFLAGS $NSPR_CFLAGS"
-+ AC_TRY_COMPILE([#include "prlog.h"],
-+ [#ifndef PR_STATIC_ASSERT
-+ #error PR_STATIC_ASSERT not defined
-+ #endif],
-+ [MOZ_NATIVE_NSPR=1],
-+ AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
-+ CFLAGS=$_SAVE_CFLAGS
-+fi
-+AC_SUBST(NSPR_PKGCONF_CHECK)
-
- dnl ========================================================
- dnl system zlib Support
-@@ -4036,9 +4126,6 @@
- AC_SUBST(JS_CONFIG_MOZ_JS_LIBS)
- AC_SUBST(JS_CONFIG_LIBS)
-
--if test -n "$MOZ_BUILD_NSPR"; then
-- MOZ_SUBCONFIGURE_NSPR()
--fi
- MOZ_SUBCONFIGURE_FFI()
-
- dnl Spit out some output
-diff --git moz.build moz.build
-index 8380145..93042be 100644
---- moz.build
-+++ moz.build
-@@ -39,15 +39,16 @@
- if not CONFIG['JS_STANDALONE']:
- add_tier_dir('precompile', 'xpcom/xpidl')
-
--if CONFIG['COMPILE_ENVIRONMENT'] and not CONFIG['LIBXUL_SDK']:
-- if CONFIG['MOZ_BUILD_NSPR']:
-- add_tier_dir('nspr', 'config/nspr')
-+ if CONFIG['COMPILE_ENVIRONMENT'] and not CONFIG['LIBXUL_SDK']:
-+ if not CONFIG['MOZ_NATIVE_NSPR']:
-+ add_tier_dir('nspr', 'config/nspr')
-
-- if not CONFIG['JS_STANDALONE']:
- add_tier_dir('external', 'config/external')
-+
- if not CONFIG['MOZ_NATIVE_NSS']:
- add_tier_dir('nss', 'security/build')
-
-+if CONFIG['COMPILE_ENVIRONMENT'] and not CONFIG['LIBXUL_SDK']:
- if CONFIG['BUILD_CTYPES'] and not CONFIG['MOZ_NATIVE_FFI']:
- add_tier_dir('js', ['js/src/ctypes/libffi'], static=True)
- add_tier_dir('js', ['intl/icu'], static=True)
Modified: trunk/www/firefox-nightly/files/patch-z-bug517422
==============================================================================
--- trunk/www/firefox-nightly/files/patch-z-bug517422 Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/firefox-nightly/files/patch-z-bug517422 Fri Mar 14 06:59:45 2014 (r1553)
@@ -71,7 +71,7 @@
index df49287..05e97ff 100644
--- configure.in
+++ configure.in
-@@ -5130,6 +5130,40 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
+@@ -5130,6 +5130,41 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
fi
dnl ========================================================
@@ -85,6 +85,7 @@
+
+if test -n "$MOZ_NATIVE_OGG"; then
+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
++ AC_DEFINE(MOZ_NATIVE_OGG)
+fi
+
+AC_SUBST(MOZ_NATIVE_OGG)
@@ -260,3 +261,21 @@
ifdef MOZ_NATIVE_LIBEVENT
EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
endif
+diff --git xpcom/build/nsXPComInit.cpp xpcom/build/nsXPComInit.cpp
+index d2b353b..1166268 100644
+--- xpcom/build/nsXPComInit.cpp
++++ xpcom/build/nsXPComInit.cpp
+@@ -622,11 +622,13 @@ NS_InitXPCOM2(nsIServiceManager* *result,
+ // this oddness.
+ mozilla::SetICUMemoryFunctions();
+
++#ifndef MOZ_NATIVE_OGG
+ // Do the same for libogg.
+ ogg_set_mem_functions(OggReporter::Alloc,
+ OggReporter::Calloc,
+ OggReporter::Realloc,
+ OggReporter::Free);
++#endif
+
+ // Initialize the JS engine.
+ if (!JS_Init()) {
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/firefox/Makefile Fri Mar 14 06:59:45 2014 (r1553)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox/Makefile 339634 2014-01-13 21:00:02Z rene $
PORTNAME= firefox
-DISTVERSION= 28.0b9
+DISTVERSION= 28.0
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
@@ -56,7 +56,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-beta
+WRKSRC:= ${WRKDIR}/mozilla-release
# avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1>
# http://svnweb.freebsd.org/changeset/base/255804
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/firefox/distinfo Fri Mar 14 06:59:45 2014 (r1553)
@@ -1,2 +1,2 @@
-SHA256 (firefox-28.0b9.source.tar.bz2) = ff578bdc0dcaf5374d5cc27deff73876f300d6b4b240872648c6cebc4531ebf5
-SIZE (firefox-28.0b9.source.tar.bz2) = 135057183
+SHA256 (firefox-28.0.source.tar.bz2) = 6eaadee0d3879d4b05050e40098f1db131635fe7a19d127a6fcb25fdf885758f
+SIZE (firefox-28.0.source.tar.bz2) = 135081948
Modified: trunk/www/linux-firefox/Makefile
==============================================================================
--- trunk/www/linux-firefox/Makefile Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/linux-firefox/Makefile Fri Mar 14 06:59:45 2014 (r1553)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/linux-firefox/Makefile 336446 2013-12-14 13:42:06Z flo $
PORTNAME= firefox
-DISTVERSION= 28.0b9
+DISTVERSION= 28.0
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
Modified: trunk/www/linux-firefox/distinfo
==============================================================================
--- trunk/www/linux-firefox/distinfo Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/linux-firefox/distinfo Fri Mar 14 06:59:45 2014 (r1553)
@@ -1,2 +1,6 @@
-SHA256 (firefox-28.0b9.tar.bz2) = cdd69519119aae8953c12a7853b6ceb88dbcb5042d86f08a07ed78c130f8b4dd
-SIZE (firefox-28.0b9.tar.bz2) = 31215410
+SHA256 (firefox-28.0.tar.bz2) = 47c2a92285a9b018178ee0d12abfff4853e80a07482b13b9d95671b933f4b129
+SIZE (firefox-28.0.tar.bz2) = 31194982
+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
+SIZE (gtk2-2.18.3-19.fc12.i686.rpm) = 3198708
Modified: trunk/www/linux-seamonkey/Makefile
==============================================================================
--- trunk/www/linux-seamonkey/Makefile Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/linux-seamonkey/Makefile Fri Mar 14 06:59:45 2014 (r1553)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/linux-seamonkey/Makefile 336446 2013-12-14 13:42:06Z flo $
PORTNAME= seamonkey
-DISTVERSION= 2.25b1
+DISTVERSION= 2.25b3
CATEGORIES= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
Modified: trunk/www/linux-seamonkey/distinfo
==============================================================================
--- trunk/www/linux-seamonkey/distinfo Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/linux-seamonkey/distinfo Fri Mar 14 06:59:45 2014 (r1553)
@@ -1,2 +1,6 @@
-SHA256 (seamonkey-2.25b1.tar.bz2) = 0c65c629238eece9c834bcfff33c4d8f242b7f6d164676bdf961a5053eef90d2
-SIZE (seamonkey-2.25b1.tar.bz2) = 30371668
+SHA256 (seamonkey-2.25b3.tar.bz2) = 19a5b46fc1cde4829a5d1584403f2ab3e3ebc3955c57caa2b98065556aebd154
+SIZE (seamonkey-2.25b3.tar.bz2) = 30381808
+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
+SIZE (gtk2-2.18.3-19.fc12.i686.rpm) = 3198708
Modified: trunk/www/seamonkey-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey-i18n/Makefile Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/seamonkey-i18n/Makefile Fri Mar 14 06:59:45 2014 (r1553)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/seamonkey-i18n/Makefile 336446 2013-12-14 13:42:06Z flo $
PORTNAME= seamonkey-i18n
-PORTVERSION= 2.25b1
+PORTVERSION= 2.25b2
CATEGORIES= www mail news editors irc
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack
PKGNAMEPREFIX=
Modified: trunk/www/seamonkey-i18n/distinfo
==============================================================================
--- trunk/www/seamonkey-i18n/distinfo Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/seamonkey-i18n/distinfo Fri Mar 14 06:59:45 2014 (r1553)
@@ -1,54 +1,54 @@
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.be.langpack.xpi) = 4054e9cd36e13f2683b650a90cee267570eaa228a7ad68eed66ee32c50cd8324
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.be.langpack.xpi) = 818838
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.ca.langpack.xpi) = 6a171516e0709f1818235370cbbbaf344e9e1678aa134c803843e581af7ae265
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.ca.langpack.xpi) = 815229
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.cs.langpack.xpi) = c1e40b6af524c0d4251eb14df0f1b80bcfb0d9e08d3cea8e6be354044d9e7038
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.cs.langpack.xpi) = 813471
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.de.langpack.xpi) = c775b5309c6d16ef6bd5b89ad67510b57104e3fc42cfe12cd3fbf446ef7ff0a4
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.de.langpack.xpi) = 821039
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.en-GB.langpack.xpi) = a895283fc8937b381243d03b8b7cd2146d74a21562a3a1e5a38e8b08217640e9
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.en-GB.langpack.xpi) = 784862
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.en-US.langpack.xpi) = 863b03a414c01323be18660b86ea35bf25359a24326855be6a5229d2540f0959
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.en-US.langpack.xpi) = 785842
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.es-AR.langpack.xpi) = 9bbdc460e08307eac30c680e8585f0804e1e6da8502c7ad4625feb0f424ff515
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.es-AR.langpack.xpi) = 842590
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.es-ES.langpack.xpi) = 63eb4eb46028542fe13e2b5a1e41375c6d0f8c14a14ebdb05794a64bed68166e
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.es-ES.langpack.xpi) = 813327
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.fi.langpack.xpi) = ca624815cbf944f8463662a47eb491faec8759a82835b0603778351a47080136
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.fi.langpack.xpi) = 783351
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.fr.langpack.xpi) = 7085a097b10d504319c5d33da9503ea841716509a0bebb214c4a3cd961e37405
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.fr.langpack.xpi) = 794139
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.gl.langpack.xpi) = f1411575f2a96e774268c20f4fa9cf2011c5b8f2f056fd650fa407e4abb705dd
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.gl.langpack.xpi) = 792993
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.hu.langpack.xpi) = c89e246f29ad8c7394c2dc09b085ac64f6fe2b491193f58c1713bc48fc6578bd
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.hu.langpack.xpi) = 828022
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.it.langpack.xpi) = 87b2208257405c34d84f6b72bf42d7160b907e294cb94944e2e9ca87277cf47e
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.it.langpack.xpi) = 727323
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.ja-JP-mac.langpack.xpi) = 270d09dd9b7c72c0ed7a094a177c3cb3f497d3349da75de3cec954ca01519184
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.ja-JP-mac.langpack.xpi) = 891817
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.ja.langpack.xpi) = 02f874f97fb426e5663a24ef33e7be3771219864384165ba19ccb16f95d8ab8f
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.ja.langpack.xpi) = 866418
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.lt.langpack.xpi) = f57d4201d0416537fa1c697ffa97149bad571e10c4bdec18febcdf9080f54029
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.lt.langpack.xpi) = 830877
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.nb-NO.langpack.xpi) = f925e8571b783e5ef61f685cf6b1a81c3c80cf477f79b1e8877f696741b7b2ba
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.nb-NO.langpack.xpi) = 806695
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.nl.langpack.xpi) = 9dc1dad8a7c494a33e38af3e186daaadce2c43a4c0542eb3d9ff51ce389e8890
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.nl.langpack.xpi) = 780751
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.pl.langpack.xpi) = b3184a1c93870db4dd1e11e0b6210552d1e7def39c081c44772ad897ce810470
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.pl.langpack.xpi) = 855085
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.pt-PT.langpack.xpi) = 105364ee16493b68d5eaf57b9476ae4d154776bc7a7e6921f670064914baa2bb
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.pt-PT.langpack.xpi) = 816434
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.ru.langpack.xpi) = cb63566638388394cb30f21f7c9f3c9caddc8faaee3e18ae5e76cad6810e113d
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.ru.langpack.xpi) = 884841
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.sk.langpack.xpi) = f261064de256d4d11211781a6105c7c4e68a74307debc7b26b1eb77caf0a7e7d
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.sk.langpack.xpi) = 840780
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.sv-SE.langpack.xpi) = ac98f46a5f8d9e24f6a3736d7406d6867cbd3fe502c8efcb0761682e3e67805a
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.sv-SE.langpack.xpi) = 809391
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.tr.langpack.xpi) = c598fa4f775443ae150df0eced24322b4e8e95665c36cbb4148018cd5d3b5e01
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.tr.langpack.xpi) = 854060
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.uk.langpack.xpi) = 6a7949c8cb3bb72e54277b71f837c9b40bef9b791acc593f1ccee67c3fb0fe42
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.uk.langpack.xpi) = 856807
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.zh-CN.langpack.xpi) = c573572880509757757207740413384ca584c7f336061b6d750086294e02f183
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.zh-CN.langpack.xpi) = 818108
-SHA256 (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.zh-TW.langpack.xpi) = 89af62ccb5ef92ec430366590b8242079d9e36912160fc4a78b7b9b8a48b6df1
-SIZE (xpi/seamonkey-i18n-2.25b1/seamonkey-2.25b1.zh-TW.langpack.xpi) = 842075
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.be.langpack.xpi) = 1f7aaea1fca95738fda88ae6836f3c1ec4794a8c4ab4f10cf50945c8a795558b
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.be.langpack.xpi) = 819986
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.ca.langpack.xpi) = 1accb8c7733a0cb092c071e64556427516ebe2013a64307731f5f500c9210a29
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.ca.langpack.xpi) = 815229
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.cs.langpack.xpi) = 2a78153dbe98978897551d1025698047fe8e04a76351eccc53c44b1d3af91766
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.cs.langpack.xpi) = 813471
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.de.langpack.xpi) = 49a8e42d5d1c16d1605fba0cd8a7eb4a0e343af4b69655ddfaac56bcfc6449b8
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.de.langpack.xpi) = 821039
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.en-GB.langpack.xpi) = f9928d15f7720ae4e580ac1fdef1245658d99e9744d28bec73b160b9b05e5f02
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.en-GB.langpack.xpi) = 784862
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.en-US.langpack.xpi) = 8e4177c9e23d9323b563d5736e04fb89489370c3f4e24009b6686c1d44bb3544
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.en-US.langpack.xpi) = 785842
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.es-AR.langpack.xpi) = 9fb8e3b68fcc53ffcde2315c366fdcfa20363e2f6b8c334976fc390bdb667feb
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.es-AR.langpack.xpi) = 836043
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.es-ES.langpack.xpi) = 54aad641d4b7a57f1149851d93edfd73919e5df51dfec5fde4c9a7d9311dfe1f
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.es-ES.langpack.xpi) = 813327
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.fi.langpack.xpi) = 2c1ca8451e798be279092f13dbf82515853cebbd6e6489e7ea3444b6fd68db35
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.fi.langpack.xpi) = 783351
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.fr.langpack.xpi) = 3be075642e9de7e6180a709c8d334fe56d88e4529d4f5fc87061294173283462
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.fr.langpack.xpi) = 794139
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.gl.langpack.xpi) = c265f2f7138f385800130d08099a4f6b3ae0becdb83548f11ee87e3c3e9f92e9
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.gl.langpack.xpi) = 792993
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.hu.langpack.xpi) = c5c63c53621a3821edde8e957a9ccc0e8a37847d86e69f3d977c5c8b15cdd431
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.hu.langpack.xpi) = 827480
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.it.langpack.xpi) = 58b9f86f618b6c6b283f400b836d7b3920902640d9bcde550a06c10c4127a709
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.it.langpack.xpi) = 727323
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.ja-JP-mac.langpack.xpi) = 2790825567fbc1e26ca4334834cf6b69042788ccf658fc7fe798bce292dcad6d
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.ja-JP-mac.langpack.xpi) = 891817
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.ja.langpack.xpi) = e5ce63fd44e48e7aebe9d167a15acfccd867fa41090ef1fbd755f98871c11765
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.ja.langpack.xpi) = 866418
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.lt.langpack.xpi) = c632ddf8ff4b4410eabebc7f253d8eb66ed2c6241fb90727efe645216d0d122a
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.lt.langpack.xpi) = 830877
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.nb-NO.langpack.xpi) = 857fb1a72544cbc38af0cbf5ac0443aafe2a422e5f3a610fbde7039bdda28842
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.nb-NO.langpack.xpi) = 806695
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.nl.langpack.xpi) = 9d2fd154efc5b13a4670e6c9cdde548f2ea318635c51458d8f867b5285becdb3
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.nl.langpack.xpi) = 780751
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.pl.langpack.xpi) = 4e5a2f465b585094f02fa66ac15e644dfdb13bc57d59f45cea474f2a9dde8bc9
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.pl.langpack.xpi) = 855085
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.pt-PT.langpack.xpi) = 27b9e76d35eb9e3b55756b80906215be984014e099a77f2910fce6b0fcb17391
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.pt-PT.langpack.xpi) = 816434
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.ru.langpack.xpi) = 001da9c17027d2f38d71220c08956a6fb225fcc9339507d2eeb73f437ba221d9
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.ru.langpack.xpi) = 884848
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.sk.langpack.xpi) = 3e87ca22c5bd500f1b7cb53ce83f9497a4baeab914125b8d027625cf455f685b
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.sk.langpack.xpi) = 840780
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.sv-SE.langpack.xpi) = a1b855231c18cb8acc469317e8f3d0d206ad6abe9bc6d0f85fcafa6d8deed510
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.sv-SE.langpack.xpi) = 809391
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.tr.langpack.xpi) = b92915b0251e4065cadc0002384f2623b842d896c0eb4107f0d7bc6a030fc087
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.tr.langpack.xpi) = 789890
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.uk.langpack.xpi) = d3ae8fbf9d362d18d96c2b54b0a9d0902cbabf8863775a631582e8e838a0ef7d
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.uk.langpack.xpi) = 852254
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.zh-CN.langpack.xpi) = 967cabf2278a54309427a18a5e7b4f65893b6066a7079aa378075c18a27415f8
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.zh-CN.langpack.xpi) = 817701
+SHA256 (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.zh-TW.langpack.xpi) = 1c8e9c5a2523de162bccbe4c2fb8616ef53f140fcea5f7da9705fde95c228c8f
+SIZE (xpi/seamonkey-i18n-2.25b2/seamonkey-2.25b2.zh-TW.langpack.xpi) = 842075
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/seamonkey/Makefile Fri Mar 14 06:59:45 2014 (r1553)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/seamonkey/Makefile 339634 2014-01-13 21:00:02Z rene $
PORTNAME= seamonkey
-DISTVERSION= 2.25b1
+DISTVERSION= 2.25b3
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/
Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/seamonkey/distinfo Fri Mar 14 06:59:45 2014 (r1553)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.25b1.source.tar.bz2) = d6bb8826a91d42a8a3928e1551fd39a52e7d1cce1beb73acf4c7365c883d9569
-SIZE (seamonkey-2.25b1.source.tar.bz2) = 155399969
+SHA256 (seamonkey-2.25b3.source.tar.bz2) = 68af12af1371f5a8962f73e3547f199ae070125934d6097c662a039ea88fd838
+SIZE (seamonkey-2.25b3.source.tar.bz2) = 155455327
SHA256 (enigmail-1.6.1_pre20140112.tar.xz) = 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149
SIZE (enigmail-1.6.1_pre20140112.tar.xz) = 916028
Modified: trunk/www/seamonkey/files/patch-bug806917
==============================================================================
--- trunk/www/seamonkey/files/patch-bug806917 Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/seamonkey/files/patch-bug806917 Fri Mar 14 06:59:45 2014 (r1553)
@@ -4,19 +4,19 @@
Bug 806917 - support GStreamer 1.0
---
- configure.in | 64 ++-
- content/media/gstreamer/GStreamerAllocator.cpp | 194 +++++++
+ configure.in | 66 ++-
+ content/media/gstreamer/GStreamerAllocator.cpp | 198 +++++++
content/media/gstreamer/GStreamerAllocator.h | 25 +
content/media/gstreamer/GStreamerFormatHelper.cpp | 13 +-
content/media/gstreamer/GStreamerFunctionList.h | 93 +++-
content/media/gstreamer/GStreamerLoader.cpp | 48 +-
content/media/gstreamer/GStreamerLoader.h | 8 +
- content/media/gstreamer/GStreamerReader-0.10.cpp | 198 +++++++
- content/media/gstreamer/GStreamerReader.cpp | 618 ++++++++++++++--------
+ content/media/gstreamer/GStreamerReader-0.10.cpp | 203 +++++++
+ content/media/gstreamer/GStreamerReader.cpp | 632 ++++++++++++++--------
content/media/gstreamer/GStreamerReader.h | 42 +-
content/media/gstreamer/moz.build | 11 +-
content/media/test/manifest.js | 6 +-
- 12 files changed, 1046 insertions(+), 274 deletions(-)
+ 12 files changed, 1061 insertions(+), 284 deletions(-)
diff --git configure.in configure.in
index 9776b8d..0b1698d 100644
@@ -402,7 +402,7 @@
GST_FUNC(LIBGSTREAMER, gst_bus_set_sync_handler)
GST_FUNC(LIBGSTREAMER, gst_bus_timed_pop_filtered)
GST_FUNC(LIBGSTREAMER, gst_caps_append)
-@@ -37,46 +34,36 @@ GST_FUNC(LIBGSTREAMER, gst_caps_new_any)
+@@ -37,47 +34,37 @@ GST_FUNC(LIBGSTREAMER, gst_caps_new_any)
GST_FUNC(LIBGSTREAMER, gst_caps_new_empty)
GST_FUNC(LIBGSTREAMER, gst_caps_new_full)
GST_FUNC(LIBGSTREAMER, gst_caps_new_simple)
@@ -431,6 +431,7 @@
-GST_FUNC(LIBGSTREAMER, gst_mini_object_new)
GST_FUNC(LIBGSTREAMER, gst_mini_object_ref)
GST_FUNC(LIBGSTREAMER, gst_mini_object_unref)
+ GST_FUNC(LIBGSTREAMER, gst_object_get_name)
GST_FUNC(LIBGSTREAMER, gst_object_get_parent)
GST_FUNC(LIBGSTREAMER, gst_object_unref)
-GST_FUNC(LIBGSTREAMER, gst_pad_add_event_probe)
@@ -672,7 +673,7 @@
index 0000000..fb98bde
--- /dev/null
+++ mozilla/content/media/gstreamer/GStreamerReader-0.10.cpp
-@@ -0,0 +1,198 @@
+@@ -0,0 +1,203 @@
+#include "nsError.h"
+#include "MediaDecoderStateMachine.h"
+#include "AbstractMediaDecoder.h"
@@ -717,6 +718,11 @@
+{
+ /* allocate an image using the container */
+ ImageContainer* container = mDecoder->GetImageContainer();
++ if (!container) {
++ // We don't have an ImageContainer. We probably belong to an <audio>
++ // element.
++ return GST_FLOW_NOT_SUPPORTED;
++ }
+ ImageFormat format = PLANAR_YCBCR;
+ PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get());
+ nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img);
@@ -888,7 +894,7 @@
#include "mozilla/dom/TimeRanges.h"
#include "mozilla/Preferences.h"
@@ -31,14 +33,16 @@ extern PRLogModuleInfo* gMediaDecoderLog;
- #define LOG(type, msg)
+ #define LOG(type, msg, ...)
#endif
-extern bool
@@ -960,7 +966,7 @@
{
- GError* error = nullptr;
- if (!gst_init_check(0, 0, &error)) {
-- LOG(PR_LOG_ERROR, ("gst initialization failed: %s", error->message));
+- LOG(PR_LOG_ERROR, "gst initialization failed: %s", error->message);
- g_error_free(error);
- return NS_ERROR_FAILURE;
- }
@@ -979,8 +985,8 @@
mPlayBin = gst_element_factory_make("playbin2", nullptr);
+#endif
if (!mPlayBin) {
-- LOG(PR_LOG_ERROR, ("couldn't create playbin2"));
-+ LOG(PR_LOG_ERROR, ("couldn't create playbin"));
+- LOG(PR_LOG_ERROR, "couldn't create playbin2");
++ LOG(PR_LOG_ERROR, "couldn't create playbin");
return NS_ERROR_FAILURE;
}
g_object_set(mPlayBin, "buffer-size", 0, nullptr);
@@ -1041,7 +1047,7 @@
g_object_set(mPlayBin, "uri", "appsrc://",
"video-sink", mVideoSink,
-@@ -316,13 +323,13 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+@@ -331,7 +340,7 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
/* Little trick: set the target caps to "skip" so that playbin2 fails to
* find a decoder for the stream we want to skip.
*/
@@ -1050,26 +1056,19 @@
g_object_set(filter, "caps", filterCaps, nullptr);
gst_caps_unref(filterCaps);
gst_object_unref(filter);
- }
-
-- /* start the pipeline */
-+ LOG(PR_LOG_DEBUG, ("starting metadata pipeline"));
- gst_element_set_state(mPlayBin, GST_STATE_PAUSED);
-
- /* Wait for ASYNC_DONE, which is emitted when the pipeline is built,
-@@ -343,6 +350,7 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+@@ -358,6 +367,7 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
gst_message_unref(message);
ret = NS_ERROR_FAILURE;
} else {
-+ LOG(PR_LOG_DEBUG, ("read metadata pipeline prerolled"));
++ LOG(PR_LOG_DEBUG, "read metadata pipeline prerolled");
gst_message_unref(message);
ret = NS_OK;
break;
-@@ -358,16 +366,20 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+@@ -373,21 +383,24 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
/* FIXME: workaround for a bug in matroskademux. This seek makes matroskademux
* parse the index */
-+ LOG(PR_LOG_DEBUG, ("doing matroskademux seek hack"));
++ LOG(PR_LOG_DEBUG, "doing matroskademux seek hack");
if (gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
GST_SEEK_FLAG_FLUSH, 0)) {
/* after a seek we need to wait again for ASYNC_DONE */
@@ -1077,26 +1076,23 @@
+ message = gst_bus_timed_pop_filtered(mBus, 5 * GST_SECOND,
(GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
- if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) {
-+ LOG(PR_LOG_DEBUG, ("matroskademux seek hack done"));
++ LOG(PR_LOG_DEBUG, "matroskademux seek hack done");
+ if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_ASYNC_DONE) {
gst_element_set_state(mPlayBin, GST_STATE_NULL);
gst_message_unref(message);
return NS_ERROR_FAILURE;
}
+ } else {
-+ LOG(PR_LOG_DEBUG, ("matroskademux seek hack failed (non fatal)"));
++ LOG(PR_LOG_DEBUG, "matroskademux seek hack failed (non fatal)");
}
- bool isMP3 = mDecoder->GetResource()->GetContentType().EqualsASCII(AUDIO_MP3);
-@@ -377,7 +389,6 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
-
/* report the duration */
gint64 duration;
- GstFormat format = GST_FORMAT_TIME;
if (isMP3 && mMP3FrameParser.IsMP3()) {
// The MP3FrameParser has reported a duration; use that over the gstreamer
-@@ -386,18 +397,25 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+@@ -396,17 +409,25 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
mUseParserDuration = true;
mLastParserDuration = mMP3FrameParser.GetDuration();
mDecoder->SetMediaDuration(mLastParserDuration);
@@ -1105,14 +1101,13 @@
- &format, &duration) && format == GST_FORMAT_TIME) {
- // Otherwise use the gstreamer duration.
- ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-- LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT,
-- GST_TIME_ARGS (duration)));
+- LOG(PR_LOG_DEBUG, "returning duration %" GST_TIME_FORMAT, GST_TIME_ARGS(duration));
- duration = GST_TIME_AS_USECONDS (duration);
- mDecoder->SetMediaDuration(duration);
-
} else {
- mDecoder->SetMediaSeekable(false);
-+ LOG(PR_LOG_DEBUG, ("querying duration"));
++ LOG(PR_LOG_DEBUG, "querying duration");
+ // Otherwise use the gstreamer duration.
+#if GST_VERSION_MAJOR >= 1
+ if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
@@ -1123,8 +1118,8 @@
+ &format, &duration) && format == GST_FORMAT_TIME) {
+#endif
+ ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-+ LOG(PR_LOG_DEBUG, ("have duration %" GST_TIME_FORMAT,
-+ GST_TIME_ARGS (duration)));
++ LOG(PR_LOG_DEBUG, "have duration %" GST_TIME_FORMAT,
++ GST_TIME_ARGS (duration));
+ duration = GST_TIME_AS_USECONDS (duration);
+ mDecoder->SetMediaDuration(duration);
+ } else {
@@ -1201,7 +1196,7 @@
{
nsresult res = NS_OK;
-+ LOG(PR_LOG_DEBUG, ("reset decode"));
++ LOG(PR_LOG_DEBUG, "reset decode");
+
if (NS_FAILED(MediaDecoderReader::ResetDecode())) {
res = NS_ERROR_FAILURE;
@@ -1214,7 +1209,7 @@
+ mConfigureAlignment = true;
+#endif
+
-+ LOG(PR_LOG_DEBUG, ("reset decode done"));
++ LOG(PR_LOG_DEBUG, "reset decode done");
return res;
}
@@ -1318,7 +1313,7 @@
if ((aKeyFrameSkip && !isKeyframe)) {
gst_buffer_unref(buffer);
return true;
-@@ -609,10 +683,18 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
+@@ -618,73 +695,55 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
"frame has invalid timestamp");
timestamp = GST_TIME_AS_USECONDS(timestamp);
@@ -1330,15 +1325,17 @@
+ duration = gst_util_uint64_scale(GST_USECOND, fpsDen, fpsNum);
+
if (timestamp < aTimeThreshold) {
- LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT
- " threshold %" GST_TIME_FORMAT,
-- GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold)));
+ LOG(PR_LOG_DEBUG, "skipping frame %" GST_TIME_FORMAT
+- " threshold %" GST_TIME_FORMAT,
+- GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold));
++ " threshold %" GST_TIME_FORMAT,
+ GST_TIME_ARGS(timestamp * 1000),
-+ GST_TIME_ARGS(aTimeThreshold * 1000)));
++ GST_TIME_ARGS(aTimeThreshold * 1000));
gst_buffer_unref(buffer);
return true;
}
-@@ -621,61 +703,36 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
+-
+ if (!buffer)
/* no more frames */
return false;
@@ -1421,11 +1418,11 @@
@@ -698,6 +755,10 @@ nsresult GStreamerReader::Seek(int64_t aTarget,
return NS_ERROR_FAILURE;
}
- LOG(PR_LOG_DEBUG, ("seek succeeded"));
+ LOG(PR_LOG_DEBUG, "seek succeeded");
+ GstMessage* message = gst_bus_timed_pop_filtered(mBus, GST_CLOCK_TIME_NONE,
+ (GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
+ gst_message_unref(message);
-+ LOG(PR_LOG_DEBUG, ("seek completed"));
++ LOG(PR_LOG_DEBUG, "seek completed");
return DecodeToTarget(aTarget);
}
@@ -1475,9 +1472,9 @@
uint32_t size = 0, bytesRead = 0;
while(bytesRead < aLength) {
rv = resource->Read(reinterpret_cast<char*>(data + bytesRead),
-@@ -766,14 +844,19 @@ void GStreamerReader::ReadAndPushData(guint aLength)
- bytesRead += size;
- }
+@@ -780,7 +860,12 @@ void GStreamerReader::ReadAndPushData(guint aLength)
+ int64_t offset2 = resource->Tell();
+ unused << offset2;
+#if GST_VERSION_MAJOR >= 1
+ gst_buffer_unmap(buffer, &info);
@@ -1488,14 +1485,6 @@
GstFlowReturn ret = gst_app_src_push_buffer(mSource, gst_buffer_ref(buffer));
if (ret != GST_FLOW_OK) {
- LOG(PR_LOG_ERROR, ("ReadAndPushData push ret %s", gst_flow_get_name(ret)));
- }
-
-- if (GST_BUFFER_SIZE (buffer) < aLength) {
-+ if (bytesRead < aLength) {
- /* If we read less than what we wanted, we reached the end */
- gst_app_src_end_of_stream(mSource);
- }
@@ -786,8 +869,13 @@ int64_t GStreamerReader::QueryDuration()
gint64 duration = 0;
GstFormat format = GST_FORMAT_TIME;
@@ -1508,9 +1497,9 @@
&format, &duration)) {
+#endif
if (format == GST_FORMAT_TIME) {
- LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
-@@ -866,103 +954,6 @@ gboolean GStreamerReader::SeekData(GstAppSrc* aSrc, guint64 aOffset)
+ LOG(PR_LOG_DEBUG, "pipeline duration %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (duration));
+@@ -866,108 +954,6 @@ gboolean GStreamerReader::SeekData(GstAppSrc* aSrc, guint64 aOffset)
return NS_SUCCEEDED(rv);
}
@@ -1569,6 +1558,11 @@
-{
- /* allocate an image using the container */
- ImageContainer* container = mDecoder->GetImageContainer();
+- if (!container) {
+- // We don't have an ImageContainer. We probably belong to an <audio>
+- // element.
+- return GST_FLOW_NOT_SUPPORTED;
+- }
- ImageFormat format = PLANAR_YCBCR;
- PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get());
- nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img);
@@ -1617,7 +1611,7 @@
@@ -979,8 +970,12 @@ void GStreamerReader::AudioPreroll()
{
/* The first audio buffer has reached the audio sink. Get rate and channels */
- LOG(PR_LOG_DEBUG, ("Audio preroll"));
+ LOG(PR_LOG_DEBUG, "Audio preroll");
- GstPad* sinkpad = gst_element_get_pad(GST_ELEMENT(mAudioAppSink), "sink");
+ GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mAudioAppSink), "sink");
+#if GST_VERSION_MAJOR >= 1
@@ -1631,7 +1625,7 @@
@@ -998,9 +993,18 @@ void GStreamerReader::VideoPreroll()
{
/* The first video buffer has reached the video sink. Get width and height */
- LOG(PR_LOG_DEBUG, ("Video preroll"));
+ LOG(PR_LOG_DEBUG, "Video preroll");
- GstPad* sinkpad = gst_element_get_pad(GST_ELEMENT(mVideoAppSink), "sink");
+ GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mVideoAppSink), "sink");
+#if GST_VERSION_MAJOR >= 1
@@ -1722,7 +1716,7 @@
+{
+ GstElement* parent = GST_ELEMENT(gst_pad_get_parent(aPad));
+
-+ LOG(PR_LOG_DEBUG, ("event probe %s", GST_EVENT_TYPE_NAME (aEvent)));
++ LOG(PR_LOG_DEBUG, "event probe %s", GST_EVENT_TYPE_NAME (aEvent));
+
+ switch(GST_EVENT_TYPE(aEvent)) {
+ case GST_EVENT_SEGMENT:
Deleted: trunk/www/seamonkey/files/patch-bug970031
==============================================================================
--- trunk/www/seamonkey/files/patch-bug970031 Fri Mar 14 06:59:45 2014 (r1552)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
-diff --git xpcom/reflect/xptcall/src/md/unix/moz.build xpcom/reflect/xptcall/src/md/unix/moz.build
-index 5f88066..bd2a94f 100644
---- mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
-@@ -256,7 +256,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'sparc':
- 'xptcstubs_sparc_openbsd.cpp',
- ]
-
--if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'sparc64':
-+if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD') and CONFIG['OS_TEST'] == 'sparc64':
- SOURCES += [
- 'xptcinvoke_asm_sparc64_openbsd.s',
- 'xptcinvoke_sparc64_openbsd.cpp',
Modified: trunk/www/seamonkey/files/patch-bug973744
==============================================================================
--- trunk/www/seamonkey/files/patch-bug973744 Fri Mar 14 06:59:32 2014 (r1552)
+++ trunk/www/seamonkey/files/patch-bug973744 Fri Mar 14 06:59:45 2014 (r1553)
@@ -11,28 +11,28 @@
index e21ffdd..82dadeb 100644
--- mozilla/content/media/gstreamer/GStreamerReader.cpp
+++ mozilla/content/media/gstreamer/GStreamerReader.cpp
-@@ -366,24 +366,6 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+@@ -381,24 +381,6 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
/* we couldn't get this to play */
return ret;
- /* FIXME: workaround for a bug in matroskademux. This seek makes matroskademux
- * parse the index */
-- LOG(PR_LOG_DEBUG, ("doing matroskademux seek hack"));
+- LOG(PR_LOG_DEBUG, "doing matroskademux seek hack");
- if (gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
- GST_SEEK_FLAG_FLUSH, 0)) {
- /* after a seek we need to wait again for ASYNC_DONE */
- message = gst_bus_timed_pop_filtered(mBus, 5 * GST_SECOND,
- (GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
-- LOG(PR_LOG_DEBUG, ("matroskademux seek hack done"));
+- LOG(PR_LOG_DEBUG, "matroskademux seek hack done");
- if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_ASYNC_DONE) {
- gst_element_set_state(mPlayBin, GST_STATE_NULL);
- gst_message_unref(message);
- return NS_ERROR_FAILURE;
- }
- } else {
-- LOG(PR_LOG_DEBUG, ("matroskademux seek hack failed (non fatal)"));
+- LOG(PR_LOG_DEBUG, "matroskademux seek hack failed (non fatal)");
- }
-
- bool isMP3 = mDecoder->GetResource()->GetContentType().EqualsASCII(AUDIO_MP3);
- if (isMP3) {
- ParseMP3Headers();
+ /* report the duration */
+ gint64 duration;
+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403140659.s2E6xj9R004830>