diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2015-03-25 06:47:03 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2015-03-25 06:47:03 +0000 |
| commit | d7e9c9e696cad471cb0ac449666d3331e66ac93d (patch) | |
| tree | ea1c08b484e5535940f8ad8fe56be78608b15470 | |
| parent | 366e00e067cf0ddcacf5925ce56c745d8dfb8b5d (diff) | |
| download | ports-d7e9c9e696cad471cb0ac449666d3331e66ac93d.tar.gz ports-d7e9c9e696cad471cb0ac449666d3331e66ac93d.zip | |
MFH: r380090, r380096, r380101, r380109, r380142, r380547, r380888
MFH: r381889, r381911
- Update OpenH264 to 1.4.0
- Update NSS and ca_root_nss to 3.18
- Update Firefox to 36.0.4
- Update Firefox ESR and libxul to 31.5.3
- Update Thunderbird to 31.5.0
- Update SeaMonkey to 2.33.1
- Update Enigmail to 1.8
- Check if NS_NewNativeLocalFile() succeeds before using [1]
- Unbreak build when LOGGING option is disabled [2]
- Remove GIO description after r314893
- bsd.gecko.mk: Prune conditionals for files removed 4 months ago
Changes: https://github.com/cisco/openh264/releases/tag/v1.4.0
Changes: http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-10-8-Release-td332365.html
Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.18_release_notes
Changes: https://www.mozilla.org/firefox/36.0.4/releasenotes/
Changes: https://www.mozilla.org/firefox/31.5.3/releasenotes/
Changes: http://www.seamonkey-project.org/releases/seamonkey2.33/
Changes: https://www.enigmail.net/download/changelog.php#enig1.8
PR: 198090 [2]
Reported by: Piotr Kubaj <pkubaj@riseup.net> [2]
Reported by: Matthew D. Fuller <fullermd@over-yonder.net> [2]
Reported by: rozhuk.im@gmail.com [2]
Obtained from: PkgSrc [1]
Obtained from: https://github.com/mozilla/gecko-dev/commit/6af7f0e6 [2]
Security: https://vuxml.freebsd.org/freebsd/99029172-8253-407d-9d8b-2cfeab9abf81.html
Security: https://vuxml.freebsd.org/freebsd/76ff65f4-17ca-4d3f-864a-a3d6026194fb.html
Approved by: ports-secteam (zi, delphij), portmgr (erwin)
Notes
Notes:
svn path=/branches/2015Q1/; revision=382198
74 files changed, 1034 insertions, 2821 deletions
diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk index 4aed4b369e3d..c18d240625b0 100644 --- a/Mk/Uses/gecko.mk +++ b/Mk/Uses/gecko.mk @@ -37,12 +37,12 @@ RUN_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 31 -_GECKO_VERSIONS= 31 35 +_GECKO_VERSIONS= 31 36 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 31_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -35_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +36_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null @@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g .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_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/ .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} diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 863e4a5edb3f..4519ae5c8407 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -146,7 +146,7 @@ event_MOZ_OPTIONS= --with-system-libevent ffi_LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi ffi_MOZ_OPTIONS= --enable-system-ffi -.if exists(${FILESDIR}/patch-bug847568) || exists(${FILESDIR}/patch-z-bug847568) +.if exists(${FILESDIR}/patch-bug847568) graphite_LIB_DEPENDS= libgraphite2.so:${PORTSDIR}/graphics/graphite2 graphite_MOZ_OPTIONS= --with-system-graphite2 @@ -172,7 +172,7 @@ nspr_MOZ_OPTIONS= --with-system-nspr nss_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss nss_MOZ_OPTIONS= --with-system-nss -.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) +.if exists(${FILESDIR}/patch-z-bug517422) opus_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus opus_MOZ_OPTIONS= --with-system-opus .endif @@ -183,7 +183,7 @@ pixman_MOZ_OPTIONS= --enable-system-pixman png_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} -.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) +.if exists(${FILESDIR}/patch-z-bug517422) soundtouch_LIB_DEPENDS= libSoundTouch.so:${PORTSDIR}/audio/soundtouch soundtouch_MOZ_OPTIONS= --with-system-soundtouch @@ -195,7 +195,7 @@ speex_MOZ_OPTIONS= --with-system-speex sqlite_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 sqlite_MOZ_OPTIONS= --enable-system-sqlite -.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) +.if exists(${FILESDIR}/patch-z-bug517422) # XXX disabled: update to 1.2.x or review backported fixes theora_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora theora_MOZ_OPTIONS= --with-system-theora diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile index 8bda5c5eb75c..e3b4f7dd70ec 100644 --- a/mail/linux-thunderbird/Makefile +++ b/mail/linux-thunderbird/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.4.0 +DISTVERSION= 31.5.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo index 6e2b3c6f9cdf..f2985343f6e8 100644 --- a/mail/linux-thunderbird/distinfo +++ b/mail/linux-thunderbird/distinfo @@ -1,5 +1,5 @@ -SHA256 (thunderbird-31.4.0.tar.bz2) = e08c0d4d2bd570801a3609133e63abb080f9f825c288fa2f5761639f2f6e4958 -SIZE (thunderbird-31.4.0.tar.bz2) = 36871510 +SHA256 (thunderbird-31.5.0.tar.bz2) = c4a1e9865e756a09383e110f8f81a229e49fcec04012de80856ce454ed6e41f7 +SIZE (thunderbird-31.5.0.tar.bz2) = 36874681 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index f5b9b1ca66fd..2b735fb9ea6e 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 31.4.0 +PORTVERSION= 31.5.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo index 3b0619da43da..9b94cee5701a 100644 --- a/mail/thunderbird-i18n/distinfo +++ b/mail/thunderbird-i18n/distinfo @@ -1,110 +1,110 @@ -SHA256 (xpi/thunderbird-i18n-31.4.0/ar.xpi) = b758c51e79fa7713a6f147d928eec15892f044d2f295ff0ec48f5a76820f812c -SIZE (xpi/thunderbird-i18n-31.4.0/ar.xpi) = 472812 -SHA256 (xpi/thunderbird-i18n-31.4.0/ast.xpi) = 6376fa259325eeafd71e148fedcf19cf9e3a620fe805e78089a3d68af4a4caef -SIZE (xpi/thunderbird-i18n-31.4.0/ast.xpi) = 393049 -SHA256 (xpi/thunderbird-i18n-31.4.0/be.xpi) = ac3f330a687ad8cb329a46844e92439dfb069b29369fdec93885c74a6137a35e -SIZE (xpi/thunderbird-i18n-31.4.0/be.xpi) = 427488 -SHA256 (xpi/thunderbird-i18n-31.4.0/bg.xpi) = 5c1bc813f0f2e5440d6a7f6bbe0cb346de688d47cd241b68834bf398ee35908c -SIZE (xpi/thunderbird-i18n-31.4.0/bg.xpi) = 493734 -SHA256 (xpi/thunderbird-i18n-31.4.0/bn-BD.xpi) = aafaff2a6dad2220a1e75b8948da60c9eba68f81130fbded5c34e773f4fc46d9 -SIZE (xpi/thunderbird-i18n-31.4.0/bn-BD.xpi) = 555613 -SHA256 (xpi/thunderbird-i18n-31.4.0/br.xpi) = 867200206ee9d6339a2bbfce71f7d3bceca32a0821d5fd4d5ed03585b8f98cdd -SIZE (xpi/thunderbird-i18n-31.4.0/br.xpi) = 441444 -SHA256 (xpi/thunderbird-i18n-31.4.0/ca.xpi) = 36481e5c6f1c138ca7752cfa4085c4ba9e4bf6ed32c52f6bbf72c105ea59c08c -SIZE (xpi/thunderbird-i18n-31.4.0/ca.xpi) = 441713 -SHA256 (xpi/thunderbird-i18n-31.4.0/cs.xpi) = 391fe8f7f56270ef3f3e23c4855387053155134d4b2718a40e2a96a8432dec4c -SIZE (xpi/thunderbird-i18n-31.4.0/cs.xpi) = 444701 -SHA256 (xpi/thunderbird-i18n-31.4.0/da.xpi) = bc46fdba7cb03e1d83fc471b54cfe4bc6734a72871b6f286c66fc63c26142764 -SIZE (xpi/thunderbird-i18n-31.4.0/da.xpi) = 422052 -SHA256 (xpi/thunderbird-i18n-31.4.0/de.xpi) = 060e5bc3c4995ce1d44d8d463d47af785748a3ade78160e4a9c54ad4c6ce982b -SIZE (xpi/thunderbird-i18n-31.4.0/de.xpi) = 424665 -SHA256 (xpi/thunderbird-i18n-31.4.0/el.xpi) = bef0bdf34e89eb0bb36ea53456d479beff39e3a2fa19cc96a3f082ada84dcc0c -SIZE (xpi/thunderbird-i18n-31.4.0/el.xpi) = 484855 -SHA256 (xpi/thunderbird-i18n-31.4.0/en-GB.xpi) = bd6815c2cb86ac06cf171d956c28bf29eef10405058c3fba5a7cc34dd90171d7 -SIZE (xpi/thunderbird-i18n-31.4.0/en-GB.xpi) = 412515 -SHA256 (xpi/thunderbird-i18n-31.4.0/en-US.xpi) = c659b3c533e040d1c99d4f0f69dec4a995dc8c437271bcecfae53de4dd6181a1 -SIZE (xpi/thunderbird-i18n-31.4.0/en-US.xpi) = 413660 -SHA256 (xpi/thunderbird-i18n-31.4.0/es-AR.xpi) = cce52ecb2aede4639c4606c860f50abdb90cde00b761319887bad1ecf541f48b -SIZE (xpi/thunderbird-i18n-31.4.0/es-AR.xpi) = 438531 -SHA256 (xpi/thunderbird-i18n-31.4.0/es-ES.xpi) = 7dcd156460118af201d721b0a48366546cce7ad9f3406371930492fc18b19677 -SIZE (xpi/thunderbird-i18n-31.4.0/es-ES.xpi) = 374979 -SHA256 (xpi/thunderbird-i18n-31.4.0/et.xpi) = 9338e5f57be7b9cb7d594c8177c67a5d27a38d9fd9632c4d2b52276cd3b17170 -SIZE (xpi/thunderbird-i18n-31.4.0/et.xpi) = 434364 -SHA256 (xpi/thunderbird-i18n-31.4.0/eu.xpi) = b00c7af0eba2f57014a69d3b7aff4de21c8a4ce51897d19bfb6d0127a85c6a3e -SIZE (xpi/thunderbird-i18n-31.4.0/eu.xpi) = 431449 -SHA256 (xpi/thunderbird-i18n-31.4.0/fi.xpi) = 5de0e63d0373ba13e944c7d097b413b02e32cdb36a33e66b3280a82f97e1969c -SIZE (xpi/thunderbird-i18n-31.4.0/fi.xpi) = 435633 -SHA256 (xpi/thunderbird-i18n-31.4.0/fr.xpi) = 056086aea4ae18784038f01f4911ee540b6140978894ed4e6bb29aac669a6917 -SIZE (xpi/thunderbird-i18n-31.4.0/fr.xpi) = 444144 -SHA256 (xpi/thunderbird-i18n-31.4.0/fy-NL.xpi) = af9a03bc3f80465eca10e23ed77a2df331483493bb461b64792e06a6dd57da29 -SIZE (xpi/thunderbird-i18n-31.4.0/fy-NL.xpi) = 438545 -SHA256 (xpi/thunderbird-i18n-31.4.0/ga-IE.xpi) = 0c36c28fe519fa379cfcc75a8382268c1ef037509d90b9c7018e5317a8067a96 -SIZE (xpi/thunderbird-i18n-31.4.0/ga-IE.xpi) = 449362 -SHA256 (xpi/thunderbird-i18n-31.4.0/gd.xpi) = 0a49f061bd5a908cd6aa40bd7157d8622ecafc1b2039461702a1947ae07b6a23 -SIZE (xpi/thunderbird-i18n-31.4.0/gd.xpi) = 453171 -SHA256 (xpi/thunderbird-i18n-31.4.0/gl.xpi) = 136711c07702118c67aff6e1ced3036acc85fdfd34810d1b31d7beda6e05d7d9 -SIZE (xpi/thunderbird-i18n-31.4.0/gl.xpi) = 446788 -SHA256 (xpi/thunderbird-i18n-31.4.0/he.xpi) = 193c08a611dc42594b544146a060598108a6b810caed7b8f6e4c610ef88f6f63 -SIZE (xpi/thunderbird-i18n-31.4.0/he.xpi) = 476112 -SHA256 (xpi/thunderbird-i18n-31.4.0/hr.xpi) = a35b6b8095950c830a14f507a74a0efece50726d9ba7a2d0fc7d14b53150a8b7 -SIZE (xpi/thunderbird-i18n-31.4.0/hr.xpi) = 436980 -SHA256 (xpi/thunderbird-i18n-31.4.0/hu.xpi) = 31b103b899684391b48c4b7284474efd96b39fd6612ed5b607fa283b05ec1f61 -SIZE (xpi/thunderbird-i18n-31.4.0/hu.xpi) = 454542 -SHA256 (xpi/thunderbird-i18n-31.4.0/hy-AM.xpi) = 44d9e4471a2cfd9938ddf7e617184228d448f9aba94a2eaba88b34650474cf28 -SIZE (xpi/thunderbird-i18n-31.4.0/hy-AM.xpi) = 492766 -SHA256 (xpi/thunderbird-i18n-31.4.0/id.xpi) = 91f7bd26d3939fbf4ce4398215b4a74a252e663217201fc5c606e5f24e28cc79 -SIZE (xpi/thunderbird-i18n-31.4.0/id.xpi) = 475876 -SHA256 (xpi/thunderbird-i18n-31.4.0/is.xpi) = cabb75f91fa2d4592dbf94526bddf2549be1f552d0f943ccfc5a540fc8f5ebaa -SIZE (xpi/thunderbird-i18n-31.4.0/is.xpi) = 437959 -SHA256 (xpi/thunderbird-i18n-31.4.0/it.xpi) = 688327a8dca03496a2114645ebe9ba43c0b709b0d448a17d76369a8e8fb09373 -SIZE (xpi/thunderbird-i18n-31.4.0/it.xpi) = 368001 -SHA256 (xpi/thunderbird-i18n-31.4.0/ja.xpi) = ba7c5ea060cb8efab96b159516b09aa04d026ace91e80b8eef504280b1ad2bed -SIZE (xpi/thunderbird-i18n-31.4.0/ja.xpi) = 489267 -SHA256 (xpi/thunderbird-i18n-31.4.0/ko.xpi) = 175928cdec2ad62bdf97a365020bd688f692a4f57e6d9417aa69c9cc67f1a302 -SIZE (xpi/thunderbird-i18n-31.4.0/ko.xpi) = 448920 -SHA256 (xpi/thunderbird-i18n-31.4.0/lt.xpi) = 93655d1035276a89c68425d14879dcadc6eb1e566bf934f9e9589eaec788d15b -SIZE (xpi/thunderbird-i18n-31.4.0/lt.xpi) = 456352 -SHA256 (xpi/thunderbird-i18n-31.4.0/nb-NO.xpi) = 2d63b4eb3baf322b12526b6a465f165e0fc946c9f86cd973168572f384f35453 -SIZE (xpi/thunderbird-i18n-31.4.0/nb-NO.xpi) = 430941 -SHA256 (xpi/thunderbird-i18n-31.4.0/nl.xpi) = 6bb744c813d8656642845538d2f93d874877ad1d231c699aa16b44452e57bbe5 -SIZE (xpi/thunderbird-i18n-31.4.0/nl.xpi) = 431888 -SHA256 (xpi/thunderbird-i18n-31.4.0/nn-NO.xpi) = 6091e8dd488e704456e8318ee01eb566e738ea9c6a346e5351c590b65c9a35ae -SIZE (xpi/thunderbird-i18n-31.4.0/nn-NO.xpi) = 433198 -SHA256 (xpi/thunderbird-i18n-31.4.0/pa-IN.xpi) = af33455b4ef8d579595d4e312ae9d53920f49f90a2b436bd0ffb225938e50536 -SIZE (xpi/thunderbird-i18n-31.4.0/pa-IN.xpi) = 525323 -SHA256 (xpi/thunderbird-i18n-31.4.0/pl.xpi) = 7128b31c1293ef7d314aa91334c83846149e0584dac24cb2702c1d4455142b81 -SIZE (xpi/thunderbird-i18n-31.4.0/pl.xpi) = 410872 -SHA256 (xpi/thunderbird-i18n-31.4.0/pt-BR.xpi) = a2a1711be09d3c9c856bfe7ee4cdeb278fc3509e03c2b71990f179ad083dafe6 -SIZE (xpi/thunderbird-i18n-31.4.0/pt-BR.xpi) = 450477 -SHA256 (xpi/thunderbird-i18n-31.4.0/pt-PT.xpi) = d529f227ad665ffd62b00b12d8740b9ac60fcdb22156a1cdfaeac4a1d16d6221 -SIZE (xpi/thunderbird-i18n-31.4.0/pt-PT.xpi) = 439604 -SHA256 (xpi/thunderbird-i18n-31.4.0/rm.xpi) = dbc36dc2dca453e9db62dcf98696df1d5fd3f567bf61b9ac8d82e7655655e0e4 -SIZE (xpi/thunderbird-i18n-31.4.0/rm.xpi) = 439186 -SHA256 (xpi/thunderbird-i18n-31.4.0/ro.xpi) = 97a115649c8d2bdb7440bf1ba382def1e72b9e03e7e379311cbcf0b3281a7fcc -SIZE (xpi/thunderbird-i18n-31.4.0/ro.xpi) = 479749 -SHA256 (xpi/thunderbird-i18n-31.4.0/ru.xpi) = 4e5067b258ff6f881f2570a0575bd87e3aba780cfd680576419d32a126278a49 -SIZE (xpi/thunderbird-i18n-31.4.0/ru.xpi) = 436156 -SHA256 (xpi/thunderbird-i18n-31.4.0/si.xpi) = 79bbf1f26ef7ce4e9e6b3a6d548d851ef5c4b36157207a21b70d609857a4d7bc -SIZE (xpi/thunderbird-i18n-31.4.0/si.xpi) = 528812 -SHA256 (xpi/thunderbird-i18n-31.4.0/sk.xpi) = 9b042399be1fdf1d327aaf400a49ef269b39a6afb359e78b79b21473d8d2e5ba -SIZE (xpi/thunderbird-i18n-31.4.0/sk.xpi) = 452995 -SHA256 (xpi/thunderbird-i18n-31.4.0/sl.xpi) = f3db7ef61fa94c1a5a941bc85bd1dbfe87a76b0227225c6a4c9e9857b25dba35 -SIZE (xpi/thunderbird-i18n-31.4.0/sl.xpi) = 433874 -SHA256 (xpi/thunderbird-i18n-31.4.0/sq.xpi) = e0eef93742c9b9a6c511300733998de104a1c63666fe5d5ab485d872eec381f8 -SIZE (xpi/thunderbird-i18n-31.4.0/sq.xpi) = 454695 -SHA256 (xpi/thunderbird-i18n-31.4.0/sr.xpi) = b5c85dafe1aa73f14c2831670a7766955c0893d74f3e45e5c447e8b007515c11 -SIZE (xpi/thunderbird-i18n-31.4.0/sr.xpi) = 537335 -SHA256 (xpi/thunderbird-i18n-31.4.0/sv-SE.xpi) = 715426ca25f8f7a6fbf0976743cb5c572f1e6b53d1df1ca5ee71a102f172f0ad -SIZE (xpi/thunderbird-i18n-31.4.0/sv-SE.xpi) = 436106 -SHA256 (xpi/thunderbird-i18n-31.4.0/ta-LK.xpi) = bf294f9942ca6495b6f4196b0955c956792b5651628f9374ad34fc655e91ba5f -SIZE (xpi/thunderbird-i18n-31.4.0/ta-LK.xpi) = 553509 -SHA256 (xpi/thunderbird-i18n-31.4.0/tr.xpi) = f408ef749ea4a160605961abc37f03322affce56e09ccdb0c824f6de2926ff10 -SIZE (xpi/thunderbird-i18n-31.4.0/tr.xpi) = 457360 -SHA256 (xpi/thunderbird-i18n-31.4.0/uk.xpi) = f7be658507adaaed67fd9bd1a6482a2b49ffc975e991934aad7e319e3f21c843 -SIZE (xpi/thunderbird-i18n-31.4.0/uk.xpi) = 499656 -SHA256 (xpi/thunderbird-i18n-31.4.0/vi.xpi) = 30a49028ea0d54edeb9a06a7d7dcf7e58e6e77ba36ff93353358c7eb23df7f66 -SIZE (xpi/thunderbird-i18n-31.4.0/vi.xpi) = 513835 -SHA256 (xpi/thunderbird-i18n-31.4.0/zh-CN.xpi) = 84a96831d8d781c1641e40ddab8bc1b2ab134c8c695b7de739d6dce51cbba583 -SIZE (xpi/thunderbird-i18n-31.4.0/zh-CN.xpi) = 462668 -SHA256 (xpi/thunderbird-i18n-31.4.0/zh-TW.xpi) = 48ea0c4b0f391a90d887283437c23b2bfc0af6f0b9efb85e72444a0931f905a5 -SIZE (xpi/thunderbird-i18n-31.4.0/zh-TW.xpi) = 463408 +SHA256 (xpi/thunderbird-i18n-31.5.0/ar.xpi) = 80b83ce312ed5616edc61b34604d4991ed1e2179f067336d019b64e32a929530 +SIZE (xpi/thunderbird-i18n-31.5.0/ar.xpi) = 472812 +SHA256 (xpi/thunderbird-i18n-31.5.0/ast.xpi) = 5e04389beb3b7a8fe8d910e52d6683104db2a937746c7db829d6e4ff6c8bab9d +SIZE (xpi/thunderbird-i18n-31.5.0/ast.xpi) = 393049 +SHA256 (xpi/thunderbird-i18n-31.5.0/be.xpi) = a7db2f7a89632a0e55b650dc08b957bc678445db5fb807b029cc7f330651ff28 +SIZE (xpi/thunderbird-i18n-31.5.0/be.xpi) = 427488 +SHA256 (xpi/thunderbird-i18n-31.5.0/bg.xpi) = 1ea991edf2e89421e1f6de27538610be53c61190fc24d62ae181677e904d25dd +SIZE (xpi/thunderbird-i18n-31.5.0/bg.xpi) = 493734 +SHA256 (xpi/thunderbird-i18n-31.5.0/bn-BD.xpi) = e0e1249d2a82c5a52f9b11dc5b4c64dd3204c07feacd431db6fcb31678604f93 +SIZE (xpi/thunderbird-i18n-31.5.0/bn-BD.xpi) = 555613 +SHA256 (xpi/thunderbird-i18n-31.5.0/br.xpi) = e62d04221c7352c833da0df59a44ea13aa9bb30654a8d745760b0e1a3f42689a +SIZE (xpi/thunderbird-i18n-31.5.0/br.xpi) = 441444 +SHA256 (xpi/thunderbird-i18n-31.5.0/ca.xpi) = b3bff4b5595a3427c4ef31ba27fcfef64839bcbddf37b62d2f04f35c31e3889a +SIZE (xpi/thunderbird-i18n-31.5.0/ca.xpi) = 441713 +SHA256 (xpi/thunderbird-i18n-31.5.0/cs.xpi) = cb84334c881ba9444553b334c6cd6e6541c71bd432c8bff46014603a70e10ec2 +SIZE (xpi/thunderbird-i18n-31.5.0/cs.xpi) = 444701 +SHA256 (xpi/thunderbird-i18n-31.5.0/da.xpi) = 284e99c29e42d02c79638c9483aa0b8cc008b46a53da11865f8da33506c46b6b +SIZE (xpi/thunderbird-i18n-31.5.0/da.xpi) = 422051 +SHA256 (xpi/thunderbird-i18n-31.5.0/de.xpi) = a55c0d175e08ce74aa94b9f703c89079aa64996e605a34d061dd775fb8d3fea5 +SIZE (xpi/thunderbird-i18n-31.5.0/de.xpi) = 424665 +SHA256 (xpi/thunderbird-i18n-31.5.0/el.xpi) = 46870a4296ad1f1c1871034bbd3afa21f345f32c2970960ffff0f836d847cd69 +SIZE (xpi/thunderbird-i18n-31.5.0/el.xpi) = 484855 +SHA256 (xpi/thunderbird-i18n-31.5.0/en-GB.xpi) = c92104ae4cd34fb8f545d4c3a5a39bc3caea50d4729d3689859b84a49b187c06 +SIZE (xpi/thunderbird-i18n-31.5.0/en-GB.xpi) = 412515 +SHA256 (xpi/thunderbird-i18n-31.5.0/en-US.xpi) = 51564b06ba20565fbe98dfe1047c914c55fcb6f621f9f6fdbfd76d4167a4ebe5 +SIZE (xpi/thunderbird-i18n-31.5.0/en-US.xpi) = 413660 +SHA256 (xpi/thunderbird-i18n-31.5.0/es-AR.xpi) = ef962dfff8cc1f77506e1ac9f852cd314eaf11e017e0a46a8f4ea4de53f9bf21 +SIZE (xpi/thunderbird-i18n-31.5.0/es-AR.xpi) = 438531 +SHA256 (xpi/thunderbird-i18n-31.5.0/es-ES.xpi) = 6dd729d5d718a6b4c5d542b37e3876e3523fdf21953224c9eb39eb9efd5f4b1d +SIZE (xpi/thunderbird-i18n-31.5.0/es-ES.xpi) = 374979 +SHA256 (xpi/thunderbird-i18n-31.5.0/et.xpi) = 43d89ed6ca9df9e0d008193ff9e40cc95bd95831d64e163f72a81c2efdfa7ad5 +SIZE (xpi/thunderbird-i18n-31.5.0/et.xpi) = 434364 +SHA256 (xpi/thunderbird-i18n-31.5.0/eu.xpi) = a7c6a4c165ad6f2d1f175527d5f875554fa399a6d6889236ffed493077bbc6e0 +SIZE (xpi/thunderbird-i18n-31.5.0/eu.xpi) = 431448 +SHA256 (xpi/thunderbird-i18n-31.5.0/fi.xpi) = b35caace844de02426c23f9e87b8f9651215d80d95f45bb13a2f5002d612204d +SIZE (xpi/thunderbird-i18n-31.5.0/fi.xpi) = 435632 +SHA256 (xpi/thunderbird-i18n-31.5.0/fr.xpi) = 4712f3ed3edbbc4b14f4dd50e1402be4cb8dfcdd965c67f8d3186c391702e0ae +SIZE (xpi/thunderbird-i18n-31.5.0/fr.xpi) = 444144 +SHA256 (xpi/thunderbird-i18n-31.5.0/fy-NL.xpi) = bba975b7a3783432d46017fa650cffdff40b2c28229db24f1f4b5d0a73fc0a77 +SIZE (xpi/thunderbird-i18n-31.5.0/fy-NL.xpi) = 438545 +SHA256 (xpi/thunderbird-i18n-31.5.0/ga-IE.xpi) = b115d881b42e94c6c2357e884c9b943574830ff150a75435a5e80130adc77304 +SIZE (xpi/thunderbird-i18n-31.5.0/ga-IE.xpi) = 449362 +SHA256 (xpi/thunderbird-i18n-31.5.0/gd.xpi) = 9943a52c4c3843b1422f9deb566f04357bbba5a7f60c8ce587a6b46f177ac508 +SIZE (xpi/thunderbird-i18n-31.5.0/gd.xpi) = 453171 +SHA256 (xpi/thunderbird-i18n-31.5.0/gl.xpi) = 5e2564106632fa6c978345c59f87c93034061f1d2d8ad3f2558214b6056a37de +SIZE (xpi/thunderbird-i18n-31.5.0/gl.xpi) = 446788 +SHA256 (xpi/thunderbird-i18n-31.5.0/he.xpi) = 1a6fc4ead76564ecd40dbafe42da5c0cf9ae487160db5da24a45d5cafa86afb1 +SIZE (xpi/thunderbird-i18n-31.5.0/he.xpi) = 476111 +SHA256 (xpi/thunderbird-i18n-31.5.0/hr.xpi) = d9758d7f3866155c29237fce8a59a5ab25ef7372f52a4abf802cdc68e9aa0735 +SIZE (xpi/thunderbird-i18n-31.5.0/hr.xpi) = 436980 +SHA256 (xpi/thunderbird-i18n-31.5.0/hu.xpi) = 95bbeadbfe9eef336ab446272029ec6ee909f590cffd84299b4d7ea8cd215408 +SIZE (xpi/thunderbird-i18n-31.5.0/hu.xpi) = 454542 +SHA256 (xpi/thunderbird-i18n-31.5.0/hy-AM.xpi) = 6f4157eb89931bf75f080791e456c45833ca81f12550bb1c93804be561e309f1 +SIZE (xpi/thunderbird-i18n-31.5.0/hy-AM.xpi) = 492765 +SHA256 (xpi/thunderbird-i18n-31.5.0/id.xpi) = 6e5015d1eb222a70e7aa9f0bca08eec99b81172a216fbba068450e02da681c17 +SIZE (xpi/thunderbird-i18n-31.5.0/id.xpi) = 475876 +SHA256 (xpi/thunderbird-i18n-31.5.0/is.xpi) = ef04dd0a3fe1c0e4edc39a447f561cffb6b962f3dc610ffcd0946c1d26904845 +SIZE (xpi/thunderbird-i18n-31.5.0/is.xpi) = 437959 +SHA256 (xpi/thunderbird-i18n-31.5.0/it.xpi) = 17a0b2c5a2cb1421ec0e73a21040fc18a961ba662508db10a9df19b8476a83ac +SIZE (xpi/thunderbird-i18n-31.5.0/it.xpi) = 368001 +SHA256 (xpi/thunderbird-i18n-31.5.0/ja.xpi) = 4bb4ce66c270912d005227395c1959579d8bb8f4f8297f3078b3f0d25bcfa0d3 +SIZE (xpi/thunderbird-i18n-31.5.0/ja.xpi) = 489267 +SHA256 (xpi/thunderbird-i18n-31.5.0/ko.xpi) = 7a38503c3a9b8e5400dea6627728ded00a0557ae334e1107384559c42e1dec08 +SIZE (xpi/thunderbird-i18n-31.5.0/ko.xpi) = 448920 +SHA256 (xpi/thunderbird-i18n-31.5.0/lt.xpi) = 2417df06915b561cc020d2819a7025db605e5af46ccc1c143fa4d05ccade392b +SIZE (xpi/thunderbird-i18n-31.5.0/lt.xpi) = 456351 +SHA256 (xpi/thunderbird-i18n-31.5.0/nb-NO.xpi) = a79569621cb322351152f4dea1607c9b37f50348a14114f9e61007ecae32288b +SIZE (xpi/thunderbird-i18n-31.5.0/nb-NO.xpi) = 430942 +SHA256 (xpi/thunderbird-i18n-31.5.0/nl.xpi) = 011833942de32f1ddc54c5af9737267c88fd8f540c15cac117b495e056092c10 +SIZE (xpi/thunderbird-i18n-31.5.0/nl.xpi) = 431888 +SHA256 (xpi/thunderbird-i18n-31.5.0/nn-NO.xpi) = cc40effe5cdf84001f7128eb8490e4341dfb896c341bab7487acbfcef38c3747 +SIZE (xpi/thunderbird-i18n-31.5.0/nn-NO.xpi) = 433198 +SHA256 (xpi/thunderbird-i18n-31.5.0/pa-IN.xpi) = 5b5b5fd4429225671a02c6bd81441574013969eb09c82270ba84c6f196a82a03 +SIZE (xpi/thunderbird-i18n-31.5.0/pa-IN.xpi) = 525323 +SHA256 (xpi/thunderbird-i18n-31.5.0/pl.xpi) = f9929f9e7f59e58af8423b66a06577814740c1d25cad445132bbbce00f75ec0a +SIZE (xpi/thunderbird-i18n-31.5.0/pl.xpi) = 410872 +SHA256 (xpi/thunderbird-i18n-31.5.0/pt-BR.xpi) = 9f3d7078b8e8266583042eb9329f9ac0253a6aa0478b8f61ab40e11414c4d2e1 +SIZE (xpi/thunderbird-i18n-31.5.0/pt-BR.xpi) = 450477 +SHA256 (xpi/thunderbird-i18n-31.5.0/pt-PT.xpi) = 6c77ef803b065be17f2089879d1bacf0e1fd12097ad55748da7d5cd870e2cd70 +SIZE (xpi/thunderbird-i18n-31.5.0/pt-PT.xpi) = 439604 +SHA256 (xpi/thunderbird-i18n-31.5.0/rm.xpi) = ad39f5df1f8038b80e575173f6e97cff72a926f41b974d008011f4b285f88730 +SIZE (xpi/thunderbird-i18n-31.5.0/rm.xpi) = 439185 +SHA256 (xpi/thunderbird-i18n-31.5.0/ro.xpi) = 7964ab86199c2b7d16d025eb4080db630ee9d7221c7637470d1f774279b69c85 +SIZE (xpi/thunderbird-i18n-31.5.0/ro.xpi) = 479749 +SHA256 (xpi/thunderbird-i18n-31.5.0/ru.xpi) = 6a75dea1bc33c492e8ec8b6a6dd783d2ca908f0f94d47474ddd96fd6b6116865 +SIZE (xpi/thunderbird-i18n-31.5.0/ru.xpi) = 436156 +SHA256 (xpi/thunderbird-i18n-31.5.0/si.xpi) = 4295a6f35fef93bd1c1b4b07d315ed45f92109c56e2cd1bfabb98b42b7d0e68b +SIZE (xpi/thunderbird-i18n-31.5.0/si.xpi) = 528812 +SHA256 (xpi/thunderbird-i18n-31.5.0/sk.xpi) = b91dd4281edb18f64412c7b459df5afebb12acc5de89c0af26c5a453603d9a36 +SIZE (xpi/thunderbird-i18n-31.5.0/sk.xpi) = 452995 +SHA256 (xpi/thunderbird-i18n-31.5.0/sl.xpi) = aec21bd6f7f183dc7446ed24dda5c64ae7362c48f6d32ef3169cfc273ba4c45f +SIZE (xpi/thunderbird-i18n-31.5.0/sl.xpi) = 433874 +SHA256 (xpi/thunderbird-i18n-31.5.0/sq.xpi) = 40658e0261e2eea88c2561435a721b221634d6d7b50293bec162f5db24ae6fde +SIZE (xpi/thunderbird-i18n-31.5.0/sq.xpi) = 454694 +SHA256 (xpi/thunderbird-i18n-31.5.0/sr.xpi) = 3e9bd7a41b45a165518bfa773b96ccf56f8f6420d54164e51f3af44e3264ee0e +SIZE (xpi/thunderbird-i18n-31.5.0/sr.xpi) = 537336 +SHA256 (xpi/thunderbird-i18n-31.5.0/sv-SE.xpi) = 34806febfad1cb915b7489d43e6ec10273aba1458d922b03d38995669f85283f +SIZE (xpi/thunderbird-i18n-31.5.0/sv-SE.xpi) = 436105 +SHA256 (xpi/thunderbird-i18n-31.5.0/ta-LK.xpi) = d9ecbfde0508d1fe70a541f30edebea6d60f952b3f102c65c235ac9ed2274a28 +SIZE (xpi/thunderbird-i18n-31.5.0/ta-LK.xpi) = 553508 +SHA256 (xpi/thunderbird-i18n-31.5.0/tr.xpi) = 165d89d6c12fc99f2de8f83c4ea39f4866b2b65ded899598fd072b909c9aee22 +SIZE (xpi/thunderbird-i18n-31.5.0/tr.xpi) = 457360 +SHA256 (xpi/thunderbird-i18n-31.5.0/uk.xpi) = 8841b2b381fdd345cd0b19fc2feead78028d5cc118fda6ffb52539b7e6f7c8b3 +SIZE (xpi/thunderbird-i18n-31.5.0/uk.xpi) = 499656 +SHA256 (xpi/thunderbird-i18n-31.5.0/vi.xpi) = 0b4049bbb4ac58833d3ae35750ece29c4893554afcb9622afbe1d64345e6378e +SIZE (xpi/thunderbird-i18n-31.5.0/vi.xpi) = 513835 +SHA256 (xpi/thunderbird-i18n-31.5.0/zh-CN.xpi) = 38a92f434e1d70abd474be1fa449bbb0c19ccad91ef440a5d8e8803e98bda5d3 +SIZE (xpi/thunderbird-i18n-31.5.0/zh-CN.xpi) = 462668 +SHA256 (xpi/thunderbird-i18n-31.5.0/zh-TW.xpi) = c81b39d164cc196e99ae0526c124647ea6de6574b415e0dcd8299f76c8240c84 +SIZE (xpi/thunderbird-i18n-31.5.0/zh-TW.xpi) = 463408 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 19a64522a8e3..b209ae07406a 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.4.0 -PORTREVISION= 1 +DISTVERSION= 31.5.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ @@ -32,8 +31,8 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l -EM_VERSION= 1.7.2 -L_VERSION= 3.3.4 +EM_VERSION= 1.8 +L_VERSION= 3.3.5 SSP_UNSAFE= yes USE_GECKO= gecko diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index f43f67554798..0cac4fa8f49f 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,4 +1,4 @@ -SHA256 (thunderbird-31.4.0.source.tar.bz2) = 3e4b6cb5934b7a8e51a673044e0691eb7cd88a08415494673cd7eadb35cd90c3 -SIZE (thunderbird-31.4.0.source.tar.bz2) = 171045601 -SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 -SIZE (enigmail-1.7.2.tar.gz) = 1420346 +SHA256 (thunderbird-31.5.0.source.tar.bz2) = 435719518dcf25fb3b810feefca489b92d30354d97836eab09cfdfd1c4b9139d +SIZE (thunderbird-31.5.0.source.tar.bz2) = 171097061 +SHA256 (enigmail-1.8.tar.gz) = 9dca4e9d6fc3f79f51a4ed73918bd69b71668168144895f3a4f5bdaaec0e5f15 +SIZE (enigmail-1.8.tar.gz) = 1588239 diff --git a/mail/thunderbird/files/patch-bug1021761 b/mail/thunderbird/files/patch-bug1021761 index 441cf005574b..b071d087570c 100644 --- a/mail/thunderbird/files/patch-bug1021761 +++ b/mail/thunderbird/files/patch-bug1021761 @@ -2,7 +2,7 @@ diff --git configure.in configure.in index 48e60c0..ec08417 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -5438,6 +5438,60 @@ fi +@@ -5591,6 +5591,67 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -16,33 +16,40 @@ index 48e60c0..ec08417 100644 + ;; +esac + -+MOZ_ARG_DISABLE_BOOL(oss, -+[ --disable-oss Disable OpenSoundSystem support], -+ MOZ_OSS=, -+ MOZ_OSS=1) ++MOZ_ARG_WITH_STRING(oss, ++[ --with-oss[=PFX] Enable OpenSoundSystem support [installed at prefix PFX]], ++ OSSPREFIX=$withval) ++ ++if test -n "$OSSPREFIX"; then ++ if test "$OSSPREFIX" != "no"; then ++ MOZ_OSS=1 ++ else ++ MOZ_OSS= ++ fi ++fi + +_SAVE_CFLAGS=$CFLAGS +_SAVE_LIBS=$LIBS +if test -n "$MOZ_OSS"; then + dnl Prefer 4Front implementation + AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) -+ if test -z "$MOZ_OSS_CFLAGS"; then -+ for oss_conf in /etc/oss.conf /usr/local/etc/oss.conf; do -+ if test -e "$oss_conf"; then -+ . "$oss_conf" -+ fi -+ done ++ if test "$OSSPREFIX" != "yes"; then ++ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf ++ if test -f "$oss_conf"; then ++ . "$oss_conf" ++ else ++ OSSLIBDIR=$OSSPREFIX/lib/oss ++ fi + if test -d "$OSSLIBDIR"; then -+ MOZ_OSS_CFLAGS="-I$OSSLIBDIR/include" ++ MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include" + fi + fi + AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) + + CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" -+ MOZ_CHECK_HEADERS(sys/soundcard.h linux/soundcard.h soundcard.h) ++ MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h) + + if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ -+ "$ac_cv_header_linux_soundcard_h" != "yes" -a \ + "$ac_cv_header_soundcard_h" != "yes"; then + AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --disable-ogg --disable-wave --disable-webm.]) + fi @@ -50,7 +57,7 @@ index 48e60c0..ec08417 100644 + dnl Assume NetBSD implementation over SunAudio + AC_CHECK_LIB(ossaudio, _oss_ioctl, + [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") -+ MOZ_OSS_LIBS="-lossaudio"]) ++ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"]) +fi +CFLAGS=$_SAVE_CFLAGS +LIBS=$_SAVE_LIBS @@ -63,30 +70,6 @@ index 48e60c0..ec08417 100644 dnl = Check alsa availability on Linux dnl ================================== -@@ -5451,12 +5505,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, - MOZ_ALSA=1, - MOZ_ALSA=) - -+MOZ_ARG_DISABLE_BOOL(alsa-dlopen, -+[ --disable-alsa-dlopen Disable runtime linking of libasound.so], -+ DISABLE_LIBASOUND_DLOPEN=1, -+ DISABLE_LIBASOUND_DLOPEN=) -+ - if test -n "$MOZ_ALSA"; then - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , - [echo "$MOZ_ALSA_PKG_ERRORS" - AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) - fi - -+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then -+ AC_DEFINE(DISABLE_LIBASOUND_DLOPEN) -+else -+ MOZ_ALSA_LIBS= -+fi -+ - AC_SUBST(MOZ_ALSA) - - dnl ======================================================== diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS index b441e8a..950d9e5 100644 --- mozilla/media/libcubeb/AUTHORS @@ -651,7 +634,7 @@ new file mode 100644 index 0000000..5e38e27 --- /dev/null +++ mozilla/media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,399 @@ +@@ -0,0 +1,397 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -660,8 +643,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 @@ -1075,18 +1056,36 @@ 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/Makefile.in media/webrtc/signaling/test/Makefile.in +index 991f03f..3d99eb5 100644 +--- mozilla/media/webrtc/signaling/test/Makefile.in ++++ mozilla/media/webrtc/signaling/test/Makefile.in +@@ -26,9 +26,9 @@ ifdef JS_SHARED_LIBRARY + LIBS += $(MOZ_JS_LIBS) + endif + +-ifdef MOZ_ALSA ++ifdef MOZ_OSS + LIBS += \ +- $(MOZ_ALSA_LIBS) \ ++ $(MOZ_OSS_LIBS) \ + $(NULL) + endif + diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk index e191f13..4fb268a 100644 --- mozilla/toolkit/library/libxul.mk +++ mozilla/toolkit/library/libxul.mk -@@ -146,6 +146,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32 +@@ -146,9 +146,9 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32 endif endif +-ifdef MOZ_ALSA +-EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) +-endif +ifdef MOZ_OSS +EXTRA_DSO_LDOPTS += $(MOZ_OSS_LIBS) +endif -+ - ifdef MOZ_ALSA - EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) - endif + + ifdef HAVE_CLOCK_MONOTONIC + EXTRA_DSO_LDOPTS += $(REALTIME_LIBS) diff --git a/mail/thunderbird/files/patch-bug1083461 b/mail/thunderbird/files/patch-bug1083461 deleted file mode 100644 index 7cfbf340aebc..000000000000 --- a/mail/thunderbird/files/patch-bug1083461 +++ /dev/null @@ -1,156 +0,0 @@ -commit c97894b -Author: L. David Baron <dbaron@dbaron.org> -Date: Sun Oct 19 23:31:39 2014 -0400 - - Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky approval-mozilla-esr31=bkerensa ---- - layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ - layout/style/nsCSSValue.h | 22 ++++++++++++++++------ - layout/style/nsStyleAnimation.cpp | 6 ++++-- - 3 files changed, 36 insertions(+), 20 deletions(-) - -diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp -index 781ef65..4bbc979 100644 ---- mozilla/layout/style/nsCSSValue.cpp -+++ mozilla/layout/style/nsCSSValue.cpp -@@ -253,13 +253,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const - return *mValue.mRect == *aOther.mValue.mRect; - } - else if (eCSSUnit_List == mUnit) { -- return *mValue.mList == *aOther.mValue.mList; -+ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); - } - else if (eCSSUnit_SharedList == mUnit) { - return *mValue.mSharedList == *aOther.mValue.mSharedList; - } - else if (eCSSUnit_PairList == mUnit) { -- return *mValue.mPairList == *aOther.mValue.mPairList; -+ return nsCSSValuePairList::Equal(mValue.mPairList, -+ aOther.mValue.mPairList); - } - else if (eCSSUnit_GridTemplateAreas == mUnit) { - return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; -@@ -1740,13 +1741,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, - } - } - --bool --nsCSSValueList::operator==(const nsCSSValueList& aOther) const -+/* static */ bool -+nsCSSValueList::Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValueList *p1 = this, *p2 = &aOther; -+ const nsCSSValueList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mValue != p2->mValue) - return false; -@@ -1799,8 +1802,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult - bool - nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const - { -- return !mHead == !aOther.mHead && -- (!mHead || *mHead == *aOther.mHead); -+ return nsCSSValueList::Equal(mHead, aOther.mHead); - } - - size_t -@@ -2010,13 +2012,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, - } - } - --bool --nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const -+/* static */ bool -+nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValuePairList *p1 = this, *p2 = &aOther; -+ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mXValue != p2->mXValue || - p1->mYValue != p2->mYValue) -diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h -index 753938c..77eeef0 100644 ---- mozilla/layout/style/nsCSSValue.h -+++ mozilla/layout/style/nsCSSValue.h -@@ -806,9 +806,8 @@ struct nsCSSValueList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(nsCSSValueList const& aOther) const; -- bool operator!=(const nsCSSValueList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -821,6 +820,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValueList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; - }; - - // nsCSSValueList_heap differs from nsCSSValueList only in being -@@ -1199,9 +1204,8 @@ struct nsCSSValuePairList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(const nsCSSValuePairList& aOther) const; -- bool operator!=(const nsCSSValuePairList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -1215,6 +1219,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValuePairList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; - }; - - // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being -diff --git layout/style/nsStyleAnimation.cpp layout/style/nsStyleAnimation.cpp -index 6c2ccb0..8dbe404 100644 ---- mozilla/layout/style/nsStyleAnimation.cpp -+++ mozilla/layout/style/nsStyleAnimation.cpp -@@ -3816,11 +3816,13 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const - case eUnit_Filter: - case eUnit_Shadow: - case eUnit_BackgroundPosition: -- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; -+ return nsCSSValueList::Equal(mValue.mCSSValueList, -+ aOther.mValue.mCSSValueList); - case eUnit_Transform: - return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; - case eUnit_CSSValuePairList: -- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; -+ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, -+ aOther.mValue.mCSSValuePairList); - case eUnit_UnparsedString: - return (NS_strcmp(GetStringBufferValue(), - aOther.GetStringBufferValue()) == 0); diff --git a/mail/thunderbird/files/patch-bug991253 b/mail/thunderbird/files/patch-bug991253 index 32241fdfe270..06adabf4e833 100644 --- a/mail/thunderbird/files/patch-bug991253 +++ b/mail/thunderbird/files/patch-bug991253 @@ -1,14 +1,16 @@ --- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr<nsIFile> hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr<nsISimpleEnumerator> dictDirs; diff --git a/multimedia/openh264/Makefile b/multimedia/openh264/Makefile index e0123fb54f44..89b281f74080 100644 --- a/multimedia/openh264/Makefile +++ b/multimedia/openh264/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= openh264 -PORTVERSION= 1.3.1 +PORTVERSION= 1.4.0 CATEGORIES= multimedia MAINTAINER= gecko@FreeBSD.org @@ -13,13 +13,12 @@ USE_GITHUB= yes GH_ACCOUNT= cisco GH_PROJECT= ${PORTNAME} GH_TAGNAME= v${PORTVERSION} -GH_COMMIT= 3a182d4 +GH_COMMIT= 3a75956 USES= gmake USE_LDCONFIG= yes MAKE_ARGS= OS=freebsd ARCH="${ARCH:S/amd64/x86_64/}" \ - CFLAGS_OPT="" CFLAGS_DEBUG="" \ - PREFIX="${STAGEDIR}${PREFIX}" + CFLAGS_OPT="" CFLAGS_DEBUG="" ALL_TARGET= all OPTIONS_DEFINE= DEBUG PLUGINS TEST diff --git a/multimedia/openh264/distinfo b/multimedia/openh264/distinfo index 2c9fe6f26c8d..213a997f96a8 100644 --- a/multimedia/openh264/distinfo +++ b/multimedia/openh264/distinfo @@ -1,2 +1,2 @@ -SHA256 (openh264-1.3.1.tar.gz) = e2a5ad3b3542a78999f0fcfbdd9ecb9c3dcf2cc89d9b2f9441984a2c472ce16b -SIZE (openh264-1.3.1.tar.gz) = 37643357 +SHA256 (openh264-1.4.0.tar.gz) = 905ab019c9a734ef49e7da3e7846bfc1db3602ddb1ff6828f8442dd3e0375726 +SIZE (openh264-1.4.0.tar.gz) = 37682134 diff --git a/multimedia/openh264/pkg-plist b/multimedia/openh264/pkg-plist index b4f0ccc2c353..265e271f3992 100644 --- a/multimedia/openh264/pkg-plist +++ b/multimedia/openh264/pkg-plist @@ -7,9 +7,9 @@ include/wels/codec_ver.h %%PLUGINS%%@rmtry lib/firefox/defaults/pref/gmpopenh264.js %%PLUGINS%%@rmtry lib/seamonkey/defaults/pref/gmpopenh264.js %%PLUGINS%%%%WEBPLUGIN_DIR%%/gmpopenh264.js -%%PLUGINS%%@exec ln -sf %D/%%WEBPLUGIN_DIR%%/gmpopenh264.js %D/lib/firefox-nightly/defaults/pref/ 2>/dev/null || true -%%PLUGINS%%@exec ln -sf %D/%%WEBPLUGIN_DIR%%/gmpopenh264.js %D/lib/firefox/defaults/pref/ 2>/dev/null || true -%%PLUGINS%%@exec ln -sf %D/%%WEBPLUGIN_DIR%%/gmpopenh264.js %D/lib/seamonkey/defaults/pref/ 2>/dev/null || true +%%PLUGINS%%@exec ln -sf %D/%F %D/lib/firefox-nightly/defaults/pref/ 2>/dev/null || true +%%PLUGINS%%@exec ln -sf %D/%F %D/lib/firefox/defaults/pref/ 2>/dev/null || true +%%PLUGINS%%@exec ln -sf %D/%F %D/lib/seamonkey/defaults/pref/ 2>/dev/null || true %%PLUGINS%%%%WEBPLUGIN_DIR%%/libgmpopenh264.so lib/libopenh264.a lib/libopenh264.so diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index 31d0648dd43e..ffd3d16e4243 100644 --- a/security/ca_root_nss/Makefile +++ b/security/ca_root_nss/Makefile @@ -2,7 +2,6 @@ PORTNAME= ca_root_nss PORTVERSION= ${VERSION_NSS} -PORTREVISION= 1 CATEGORIES= security MASTER_SITES= MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} @@ -26,7 +25,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.17.3 +VERSION_NSS= 3.18 #NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl diff --git a/security/ca_root_nss/distinfo b/security/ca_root_nss/distinfo index 2bd69ccd68fd..470b21b6b9b3 100644 --- a/security/ca_root_nss/distinfo +++ b/security/ca_root_nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.17.3.tar.gz) = f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5 -SIZE (nss-3.17.3.tar.gz) = 6932021 +SHA256 (nss-3.18.tar.gz) = 618db0fb2af9f6fc165934d509036b65efc78ab0ae118c06c9488bb667f21d40 +SIZE (nss-3.18.tar.gz) = 6944836 diff --git a/security/nss/Makefile b/security/nss/Makefile index d10ecedc26ee..59ef34c2c5f8 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.17.3 +PORTVERSION= 3.18 #DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src diff --git a/security/nss/distinfo b/security/nss/distinfo index 2bd69ccd68fd..470b21b6b9b3 100644 --- a/security/nss/distinfo +++ b/security/nss/distinfo @@ -1,2 +1,2 @@ -SHA256 (nss-3.17.3.tar.gz) = f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5 -SIZE (nss-3.17.3.tar.gz) = 6932021 +SHA256 (nss-3.18.tar.gz) = 618db0fb2af9f6fc165934d509036b65efc78ab0ae118c06c9488bb667f21d40 +SIZE (nss-3.18.tar.gz) = 6944836 diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile index 1876bc066315..47af60bcd59d 100644 --- a/www/firefox-esr-i18n/Makefile +++ b/www/firefox-esr-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -PORTVERSION= 31.4.0 +PORTVERSION= 31.5.3 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= diff --git a/www/firefox-esr-i18n/distinfo b/www/firefox-esr-i18n/distinfo index a8f347b14a65..c129305e7b45 100644 --- a/www/firefox-esr-i18n/distinfo +++ b/www/firefox-esr-i18n/distinfo @@ -1,178 +1,178 @@ -SHA256 (xpi/firefox-31.4.0/ach.xpi) = eaf510e73f33ad3fd49721d0719af7af12ce2c6a098c73acb1f2e93c5c121245 -SIZE (xpi/firefox-31.4.0/ach.xpi) = 445326 -SHA256 (xpi/firefox-31.4.0/af.xpi) = 34a5f759cd26ccb76cb1031dbdeec3b515d8ce2da9222eae38b0c661bc074db5 -SIZE (xpi/firefox-31.4.0/af.xpi) = 431089 -SHA256 (xpi/firefox-31.4.0/an.xpi) = fbd7d57eca4a3d4e9b72308e80968b1a10f918b3a700d4f090e8695ff5e7af2f -SIZE (xpi/firefox-31.4.0/an.xpi) = 407150 -SHA256 (xpi/firefox-31.4.0/ar.xpi) = 2b5485dc797ac8fb1c32f507a75320250ab6b75a9eb49cb921d2f25b33a62e19 -SIZE (xpi/firefox-31.4.0/ar.xpi) = 459824 -SHA256 (xpi/firefox-31.4.0/as.xpi) = 82e3ab2e0e1757122918d8791f1f047c89b926f0a5cf83630bc968d5fce0478e -SIZE (xpi/firefox-31.4.0/as.xpi) = 448568 -SHA256 (xpi/firefox-31.4.0/ast.xpi) = 9c664b96c48a3e6f81332fc5ea48d924385ff62625f1c919202190dc1ef10b0f -SIZE (xpi/firefox-31.4.0/ast.xpi) = 352341 -SHA256 (xpi/firefox-31.4.0/be.xpi) = 333fc40ffe93242e0b95d12189a92909357255cf8e219d533427b811e2eb486b -SIZE (xpi/firefox-31.4.0/be.xpi) = 378668 -SHA256 (xpi/firefox-31.4.0/bg.xpi) = bcd996534b770549fd63eb3dbf2095f6bd529089f14a63b6122dcc79b182ccad -SIZE (xpi/firefox-31.4.0/bg.xpi) = 438060 -SHA256 (xpi/firefox-31.4.0/bn-BD.xpi) = 32917acf9307d65b36812c8eeea6d37bf57410a99bae9a0d7493b71796cf60e2 -SIZE (xpi/firefox-31.4.0/bn-BD.xpi) = 472626 -SHA256 (xpi/firefox-31.4.0/bn-IN.xpi) = ba061044a27ec45abe9d758ef0b2ef9bb2ec9235129312e5cf87af8b9e3a4caf -SIZE (xpi/firefox-31.4.0/bn-IN.xpi) = 462593 -SHA256 (xpi/firefox-31.4.0/br.xpi) = 06eec86c4d63ab6c24f7b9d4d60737c47f44196140eb4abeae819101db4a3d63 -SIZE (xpi/firefox-31.4.0/br.xpi) = 389704 -SHA256 (xpi/firefox-31.4.0/bs.xpi) = ba1e18761c4bd7345ed6123e5294c5a989a0d3038583197387e2751a08f8af4f -SIZE (xpi/firefox-31.4.0/bs.xpi) = 429014 -SHA256 (xpi/firefox-31.4.0/ca.xpi) = 8bf21f315464405dc1637bcf242039c58e699920ae5f7b0381ff7408d65578c5 -SIZE (xpi/firefox-31.4.0/ca.xpi) = 403575 -SHA256 (xpi/firefox-31.4.0/cs.xpi) = c6169462993492a9241a29ce7cf540be7eb1bbb3673e3a5aec4b9864941571e8 -SIZE (xpi/firefox-31.4.0/cs.xpi) = 390978 -SHA256 (xpi/firefox-31.4.0/csb.xpi) = a953c8819c530cae9e6da1e9dd92df2b98e9a750a2eb09edce0f807ff960fa54 -SIZE (xpi/firefox-31.4.0/csb.xpi) = 383695 -SHA256 (xpi/firefox-31.4.0/cy.xpi) = 1f7989a40d0188a09828c6a555437b54a511d187dba68a92b0b72f8566117437 -SIZE (xpi/firefox-31.4.0/cy.xpi) = 390727 -SHA256 (xpi/firefox-31.4.0/da.xpi) = 9cd79d770c885189f412bd7baf10e9bd4d6701aae7b88635b085b14ef05d6603 -SIZE (xpi/firefox-31.4.0/da.xpi) = 397746 -SHA256 (xpi/firefox-31.4.0/de.xpi) = e665b67984419485d1cba9a9107004202fd2d9982cefc3dff9b462cdc003fc0e -SIZE (xpi/firefox-31.4.0/de.xpi) = 395164 -SHA256 (xpi/firefox-31.4.0/el.xpi) = 860ba409522d5d4b4b143970111792f44cc93b8fcd27c02b91cae319ef08cc8f -SIZE (xpi/firefox-31.4.0/el.xpi) = 442982 -SHA256 (xpi/firefox-31.4.0/en-GB.xpi) = e25f6614fee9063bf579da05dd09be43f1d5bc7fa0909e90e1547515cd7a767f -SIZE (xpi/firefox-31.4.0/en-GB.xpi) = 390118 -SHA256 (xpi/firefox-31.4.0/en-US.xpi) = 5f0e3e05ae6e1775b84a6132df791e7802063d4500c550207506bce76bc585fb -SIZE (xpi/firefox-31.4.0/en-US.xpi) = 422787 -SHA256 (xpi/firefox-31.4.0/en-ZA.xpi) = 7ac9fa92955e8a2eaf75df49c746f39503a803497d238115e821cf2ac01470bc -SIZE (xpi/firefox-31.4.0/en-ZA.xpi) = 388528 -SHA256 (xpi/firefox-31.4.0/eo.xpi) = 140a9f23ed9b16c635c425784b0d2841389595ce04d46e720991dcb782eeacd2 -SIZE (xpi/firefox-31.4.0/eo.xpi) = 431831 -SHA256 (xpi/firefox-31.4.0/es-AR.xpi) = 7a56a6511bb7376e69517acd4756433a94810e7bc8aa29a437b1a30e06a0196e -SIZE (xpi/firefox-31.4.0/es-AR.xpi) = 399937 -SHA256 (xpi/firefox-31.4.0/es-CL.xpi) = 2f35d2f6dc142b17c0a4dbdcbc25306987e1c96b414552ffa4dea5cd9e889f18 -SIZE (xpi/firefox-31.4.0/es-CL.xpi) = 342807 -SHA256 (xpi/firefox-31.4.0/es-ES.xpi) = 874cc019780ed64f6fe26f4a4610c7bfabce00d34828086f5a432b00009be76d -SIZE (xpi/firefox-31.4.0/es-ES.xpi) = 335880 -SHA256 (xpi/firefox-31.4.0/es-MX.xpi) = ed7048153c6d29758a7d2babd4ce35acf6b294b44f4965fa702311f3877b4f35 -SIZE (xpi/firefox-31.4.0/es-MX.xpi) = 402672 -SHA256 (xpi/firefox-31.4.0/et.xpi) = 17b4970b804ff9197f7bbca7e0b2635e5ecabee36c683f1f47e83e60fcc37dae -SIZE (xpi/firefox-31.4.0/et.xpi) = 390360 -SHA256 (xpi/firefox-31.4.0/eu.xpi) = 3e887cc4f1a6c738c44fcdb24333d5c8e24bf8db15b6cfa45cfc8cce1cb6dd7c -SIZE (xpi/firefox-31.4.0/eu.xpi) = 412999 -SHA256 (xpi/firefox-31.4.0/fa.xpi) = 5ba57b2765304f4131a9ec5e4bfa6251ddd5457d548faae629506e3a1ee04f3b -SIZE (xpi/firefox-31.4.0/fa.xpi) = 460857 -SHA256 (xpi/firefox-31.4.0/ff.xpi) = c1b9a05135b5146f72b48bafdd75c990fd127713d6ee2ca084993a3794524484 -SIZE (xpi/firefox-31.4.0/ff.xpi) = 400143 -SHA256 (xpi/firefox-31.4.0/fi.xpi) = 3abceaefeca0740fdd6f4d491ad526d66d33ee2f77fe357b85a140281a58c86e -SIZE (xpi/firefox-31.4.0/fi.xpi) = 392739 -SHA256 (xpi/firefox-31.4.0/fr.xpi) = 5f97738be7748ee58bb7cd89dd1a4383980942a75f5c81a0f5c8aef7a17cb977 -SIZE (xpi/firefox-31.4.0/fr.xpi) = 406462 -SHA256 (xpi/firefox-31.4.0/fy-NL.xpi) = 21d35be7f279d49a140f810661bc6ef9527d79af8aee2fe2c9913fe3444e92e7 -SIZE (xpi/firefox-31.4.0/fy-NL.xpi) = 401930 -SHA256 (xpi/firefox-31.4.0/ga-IE.xpi) = 5c4c1c8531cba4c8e8962a0d3a892cc8fcd5d0005454d066dba6061bac5c04cc -SIZE (xpi/firefox-31.4.0/ga-IE.xpi) = 410077 -SHA256 (xpi/firefox-31.4.0/gd.xpi) = 307042204493f3410c4e06bc7e3df3502601b6c231ce1d690ae7c6c7cd822518 -SIZE (xpi/firefox-31.4.0/gd.xpi) = 403013 -SHA256 (xpi/firefox-31.4.0/gl.xpi) = b7ec758f0f7bb41d4aa4d99a5cec824a2cc6e9b5670993776fb54b658ee4367e -SIZE (xpi/firefox-31.4.0/gl.xpi) = 390599 -SHA256 (xpi/firefox-31.4.0/gu-IN.xpi) = 2700cb21e08d9e5202f865cd3862aec4ea1d7e0b0eeeef4fc0704d1b16212fe2 -SIZE (xpi/firefox-31.4.0/gu-IN.xpi) = 423503 -SHA256 (xpi/firefox-31.4.0/he.xpi) = f79e2044152c07d89b3ea5ac6af5f3b945c013abf5d06d260afe78b6a5dfa982 -SIZE (xpi/firefox-31.4.0/he.xpi) = 427629 -SHA256 (xpi/firefox-31.4.0/hi-IN.xpi) = d31ced4c55ef36dc2c95289672e3be51c6f355fd01cb397ab7a1ad077ab924ed -SIZE (xpi/firefox-31.4.0/hi-IN.xpi) = 441402 -SHA256 (xpi/firefox-31.4.0/hr.xpi) = 2d9e8788031f34820f2f14732d120f7394696be7e32de2fd9a3f51f7e59e277b -SIZE (xpi/firefox-31.4.0/hr.xpi) = 424371 -SHA256 (xpi/firefox-31.4.0/hsb.xpi) = 64114e8edc46d8bb6ef198b864fa5d09dcc2b308b330f1d9f735af04a66733c6 -SIZE (xpi/firefox-31.4.0/hsb.xpi) = 413076 -SHA256 (xpi/firefox-31.4.0/hu.xpi) = 6e0383b7f7ec4d347e500dcb2471e8eb0a46e957899748df67c9580c18eaa0c5 -SIZE (xpi/firefox-31.4.0/hu.xpi) = 398644 -SHA256 (xpi/firefox-31.4.0/hy-AM.xpi) = 5b552c09afda8cf41863651f5807d002b13862d4970dd0fe3d4f0d550c52d771 -SIZE (xpi/firefox-31.4.0/hy-AM.xpi) = 478743 -SHA256 (xpi/firefox-31.4.0/id.xpi) = 3bdad0e38016f00b2077cffb88106f9c4d335b59b3042e2a5fa48bbfb3725710 -SIZE (xpi/firefox-31.4.0/id.xpi) = 378301 -SHA256 (xpi/firefox-31.4.0/is.xpi) = c1ed7c67f4eb9042d521e6a505debf2dc9abf849053762bb98a232bf56e6caa4 -SIZE (xpi/firefox-31.4.0/is.xpi) = 427327 -SHA256 (xpi/firefox-31.4.0/it.xpi) = a3173fd2f42dcb584206d8cfe04b3441feaa97f0dad4c5c42a1c2408ebc4ef97 -SIZE (xpi/firefox-31.4.0/it.xpi) = 330905 -SHA256 (xpi/firefox-31.4.0/ja.xpi) = 1d6012d6ae351215634a5b39314817b3c9ce0f9a1fd1eb8ed0a437cc08c07945 -SIZE (xpi/firefox-31.4.0/ja.xpi) = 421665 -SHA256 (xpi/firefox-31.4.0/kk.xpi) = 04a6cf1a1f6b2ed64a32477f47b4a7c110ec7c4dbb32c085553d95976a4fc580 -SIZE (xpi/firefox-31.4.0/kk.xpi) = 439116 -SHA256 (xpi/firefox-31.4.0/km.xpi) = 352dfc8dc592dc251f29e0717aae7cac1e924a86a705462f5121e2cbaac91223 -SIZE (xpi/firefox-31.4.0/km.xpi) = 506476 -SHA256 (xpi/firefox-31.4.0/kn.xpi) = c781c7ee43b1c0a6b2a6dd39a12cfc2b4f75c40fd59caf809491c5452a97c11f -SIZE (xpi/firefox-31.4.0/kn.xpi) = 458890 -SHA256 (xpi/firefox-31.4.0/ko.xpi) = 9734356ee4dca8ae385f4018f8746740408108b0ccd33154dd6d1dab58fcab97 -SIZE (xpi/firefox-31.4.0/ko.xpi) = 402815 -SHA256 (xpi/firefox-31.4.0/ku.xpi) = 08303c5f66ae6abdc4bf5d2b292bddfa3f03389fdc8ba69ccb47969cf84e982a -SIZE (xpi/firefox-31.4.0/ku.xpi) = 420263 -SHA256 (xpi/firefox-31.4.0/lij.xpi) = 0c7c5a7362f2b331cbc94a1b7236cf5c3cc6f91240df19f8aa22cd4d49df5183 -SIZE (xpi/firefox-31.4.0/lij.xpi) = 385867 -SHA256 (xpi/firefox-31.4.0/lt.xpi) = dc22c989978418d9507879c29c7799948472ff759ea09c3ebb743b5c4e372980 -SIZE (xpi/firefox-31.4.0/lt.xpi) = 435431 -SHA256 (xpi/firefox-31.4.0/lv.xpi) = c2837a25ce4a7439edad27e1731ed93edcd82c6048720252e730e0b8c6be3c9e -SIZE (xpi/firefox-31.4.0/lv.xpi) = 398576 -SHA256 (xpi/firefox-31.4.0/mai.xpi) = 48d5da0525a87d2f19e5f93e7b11eda3f5670e2d809d81df5f827e26c06a663d -SIZE (xpi/firefox-31.4.0/mai.xpi) = 444885 -SHA256 (xpi/firefox-31.4.0/mk.xpi) = 5023557cbe6163c3682242bf18cb5a2db3c3ad26b95b5a0e286bbcbb2e3d5a39 -SIZE (xpi/firefox-31.4.0/mk.xpi) = 475483 -SHA256 (xpi/firefox-31.4.0/ml.xpi) = c89ccdbec76470196ef0bd51bbc9c983b0d84fbfe975bd71a4687265d6e706ed -SIZE (xpi/firefox-31.4.0/ml.xpi) = 466254 -SHA256 (xpi/firefox-31.4.0/mr.xpi) = 2bb0951c07dda8d41170f49596c30087d5c183879369fe9519d7856b5a0f74dd -SIZE (xpi/firefox-31.4.0/mr.xpi) = 451291 -SHA256 (xpi/firefox-31.4.0/ms.xpi) = f5aba922e5f338f86794621a235f99efdffe23f11dfd0d0723f1a1fb78d6905a -SIZE (xpi/firefox-31.4.0/ms.xpi) = 436230 -SHA256 (xpi/firefox-31.4.0/nb-NO.xpi) = 27ef5afaf0963935f04640c0080e1ad5fc25141cb952186416418208f3474ebe -SIZE (xpi/firefox-31.4.0/nb-NO.xpi) = 392005 -SHA256 (xpi/firefox-31.4.0/nl.xpi) = 3b63800651c2b04b98d792cfcf602d0fe5b975732548dacb741ad810d4e8053c -SIZE (xpi/firefox-31.4.0/nl.xpi) = 390885 -SHA256 (xpi/firefox-31.4.0/nn-NO.xpi) = 2b473f58363066d97d2c7e3fcc29b80a1c62e3a9d45f4976c161f04f5e869e6e -SIZE (xpi/firefox-31.4.0/nn-NO.xpi) = 386281 -SHA256 (xpi/firefox-31.4.0/or.xpi) = 70fc92f01226409b3400d6d8c52d8c89aee87a0b5ff5867f1930d5986a951f0b -SIZE (xpi/firefox-31.4.0/or.xpi) = 464749 -SHA256 (xpi/firefox-31.4.0/pa-IN.xpi) = d562cafe45680ce2580fee8b4ffea35bacc26358317e4c873fc2bd8fa781b9c4 -SIZE (xpi/firefox-31.4.0/pa-IN.xpi) = 439326 -SHA256 (xpi/firefox-31.4.0/pl.xpi) = 9eb18afba43725b57e71fe4c2d69c454561786dfa914e3bf153415585646f115 -SIZE (xpi/firefox-31.4.0/pl.xpi) = 374747 -SHA256 (xpi/firefox-31.4.0/pt-BR.xpi) = d156484914f929a8cc2acaa76bb0714cd302ed8f9f677b12176470715142a294 -SIZE (xpi/firefox-31.4.0/pt-BR.xpi) = 405565 -SHA256 (xpi/firefox-31.4.0/pt-PT.xpi) = 74408f5c2a7e7d097274501b1bc1c0f4da67455191dbbf6d5e8fc28eab47b155 -SIZE (xpi/firefox-31.4.0/pt-PT.xpi) = 386344 -SHA256 (xpi/firefox-31.4.0/rm.xpi) = 056579048789796082bb1412bf627c6f4b395a8369b26bf9d5d13a33349fe0ea -SIZE (xpi/firefox-31.4.0/rm.xpi) = 399285 -SHA256 (xpi/firefox-31.4.0/ro.xpi) = 21258fecd09254fff0b0410fb1152a0ca84a6095bae6e7f828e6de585bf795ac -SIZE (xpi/firefox-31.4.0/ro.xpi) = 439387 -SHA256 (xpi/firefox-31.4.0/ru.xpi) = a9bdb4ba53972476d6a556af977ad05b9f2b650c63a49e74009cf76c43d55993 -SIZE (xpi/firefox-31.4.0/ru.xpi) = 367898 -SHA256 (xpi/firefox-31.4.0/si.xpi) = 13b0725e8c837f770b4099b61d8618e5287ab7a6008ff5bde5cff7fb41a51b81 -SIZE (xpi/firefox-31.4.0/si.xpi) = 463223 -SHA256 (xpi/firefox-31.4.0/sk.xpi) = a6f1883319357a76df8516a446e2e952033e50e4ffe8097c723efeeeaba78d8c -SIZE (xpi/firefox-31.4.0/sk.xpi) = 413802 -SHA256 (xpi/firefox-31.4.0/sl.xpi) = a531e61e52de28b107fe869083e2b9b6da7c2fe625e4b630784317401c6010ef -SIZE (xpi/firefox-31.4.0/sl.xpi) = 387134 -SHA256 (xpi/firefox-31.4.0/son.xpi) = 63975c7e789feb3d2340796cc321cd50337527dd730226a0b2d32026a0bfddf9 -SIZE (xpi/firefox-31.4.0/son.xpi) = 395143 -SHA256 (xpi/firefox-31.4.0/sq.xpi) = fdfda585f433b3c23139918480d32379a1c5723794c61448e4d530889108d0de -SIZE (xpi/firefox-31.4.0/sq.xpi) = 431136 -SHA256 (xpi/firefox-31.4.0/sr.xpi) = d564522188b570c9214744bcbf51c8357a6796a03f4e3cab195672fa5c5c5eff -SIZE (xpi/firefox-31.4.0/sr.xpi) = 425902 -SHA256 (xpi/firefox-31.4.0/sv-SE.xpi) = 3b175344594b94d110ec34eb04b9c6f3cfc135acc658aa76141415959b7b7c86 -SIZE (xpi/firefox-31.4.0/sv-SE.xpi) = 399026 -SHA256 (xpi/firefox-31.4.0/ta.xpi) = b2753f3f79464a36ae59ab74340123b55990485baca34737e837135f649889e3 -SIZE (xpi/firefox-31.4.0/ta.xpi) = 447685 -SHA256 (xpi/firefox-31.4.0/te.xpi) = 3f59b97750297c3db28b6207886e71e01c3ad19aa79c99211b3b40068576e34c -SIZE (xpi/firefox-31.4.0/te.xpi) = 462591 -SHA256 (xpi/firefox-31.4.0/th.xpi) = 693c09e4ca32fda0881b10a4463cd988819265f0717045f5f88c9dc0289d6cc2 -SIZE (xpi/firefox-31.4.0/th.xpi) = 478126 -SHA256 (xpi/firefox-31.4.0/tr.xpi) = c1409656574e67fdb932355086e03034d2778d7cdc5df3c9a8d96b226dffc850 -SIZE (xpi/firefox-31.4.0/tr.xpi) = 417370 -SHA256 (xpi/firefox-31.4.0/uk.xpi) = 6cd816e4e376e4ddc5bfd85d256c0adeeb8a714079322b92153063d0daacf3a4 -SIZE (xpi/firefox-31.4.0/uk.xpi) = 428002 -SHA256 (xpi/firefox-31.4.0/vi.xpi) = d3bd923639008d8fe12a6da6b586440443124bc91b9dd4574afa43f370a142e3 -SIZE (xpi/firefox-31.4.0/vi.xpi) = 413374 -SHA256 (xpi/firefox-31.4.0/xh.xpi) = cb82450d18c1f0b46fd036f08bbd18e534a2d0a4c7925f91b88d85206d5770c1 -SIZE (xpi/firefox-31.4.0/xh.xpi) = 397876 -SHA256 (xpi/firefox-31.4.0/zh-CN.xpi) = 68e5448ae679e9f82feb260c8c96ce9fe07a86528b9bb926f20f5692507a9c82 -SIZE (xpi/firefox-31.4.0/zh-CN.xpi) = 419629 -SHA256 (xpi/firefox-31.4.0/zh-TW.xpi) = 6a34241237e8252aa087c5a8d665086d1638f437bea4061bd26ac3bfcee3e6f6 -SIZE (xpi/firefox-31.4.0/zh-TW.xpi) = 412520 -SHA256 (xpi/firefox-31.4.0/zu.xpi) = 7277fd8f5c8491ccf9a895c7534b2cf86fb0672a5c88bfa71948d19cd4e2ea24 -SIZE (xpi/firefox-31.4.0/zu.xpi) = 433215 +SHA256 (xpi/firefox-31.5.3/ach.xpi) = 197d075d13b5601426ed6ccf7a385958e678362ca6395d48da5f1e50eb9899c2 +SIZE (xpi/firefox-31.5.3/ach.xpi) = 445326 +SHA256 (xpi/firefox-31.5.3/af.xpi) = 8a6ceb72e0f6b8f08067de07951841905697874922622e4c48b5c612b22162db +SIZE (xpi/firefox-31.5.3/af.xpi) = 431089 +SHA256 (xpi/firefox-31.5.3/an.xpi) = 92a4c1a0651ebf3ac69ce803a914f4a9624361083a1ac335560dc6523ff7c2e1 +SIZE (xpi/firefox-31.5.3/an.xpi) = 407151 +SHA256 (xpi/firefox-31.5.3/ar.xpi) = 116e438d6ed31ae4388e29c602507f5bd30b6d8a3a162835d0d3b412e56b5f03 +SIZE (xpi/firefox-31.5.3/ar.xpi) = 459823 +SHA256 (xpi/firefox-31.5.3/as.xpi) = aac019e938411f07df8f09ef215871809e75ba580398c478d835896fb274b43f +SIZE (xpi/firefox-31.5.3/as.xpi) = 448568 +SHA256 (xpi/firefox-31.5.3/ast.xpi) = f90c97ce4c2cb7822b23abfc2baa6fdc4f301d506d50a2b8ec0778ba9fa296d1 +SIZE (xpi/firefox-31.5.3/ast.xpi) = 352340 +SHA256 (xpi/firefox-31.5.3/be.xpi) = 5536a42649ba6125468051e7fb50fea0e791ae54411c3ca941ff8a818c30fe50 +SIZE (xpi/firefox-31.5.3/be.xpi) = 378668 +SHA256 (xpi/firefox-31.5.3/bg.xpi) = d9136407c1ce937cb0f9d406398f07102807c4336cb2e705060b35acab11b954 +SIZE (xpi/firefox-31.5.3/bg.xpi) = 438061 +SHA256 (xpi/firefox-31.5.3/bn-BD.xpi) = 8b8fa16e3d3d04d61cfa9778e261339c416da2c59b1ad45a34003036ac919f3f +SIZE (xpi/firefox-31.5.3/bn-BD.xpi) = 472626 +SHA256 (xpi/firefox-31.5.3/bn-IN.xpi) = 2eb8cdc6fb23c515ab9bce3894d2d10efedcbd9dd09a95a4d55f2c9489784e0d +SIZE (xpi/firefox-31.5.3/bn-IN.xpi) = 462592 +SHA256 (xpi/firefox-31.5.3/br.xpi) = d245ef7f92a3b055ebb870864b56f4987b9523c298f034c43883fee64a9ff413 +SIZE (xpi/firefox-31.5.3/br.xpi) = 389704 +SHA256 (xpi/firefox-31.5.3/bs.xpi) = 046a9595ae96032e64e2f59607adf74426034db034b097153ec1a03fda857e34 +SIZE (xpi/firefox-31.5.3/bs.xpi) = 429014 +SHA256 (xpi/firefox-31.5.3/ca.xpi) = cadd036f2b28a9f8e9057181524668d8983ef506788b3d12cb3dc83f121763b2 +SIZE (xpi/firefox-31.5.3/ca.xpi) = 403575 +SHA256 (xpi/firefox-31.5.3/cs.xpi) = 1da52b9bebb79975ff861295f0a709be9926d53f8c1e9a09c537ff478274c024 +SIZE (xpi/firefox-31.5.3/cs.xpi) = 390978 +SHA256 (xpi/firefox-31.5.3/csb.xpi) = 4d31dcfeeff943793a06c25f11838b2199edcfa841aa08553ef308832786b967 +SIZE (xpi/firefox-31.5.3/csb.xpi) = 383695 +SHA256 (xpi/firefox-31.5.3/cy.xpi) = 009b6ededd4ef71f43803da59eabefc34fe26338509a9a2d43130a690ce2085a +SIZE (xpi/firefox-31.5.3/cy.xpi) = 390727 +SHA256 (xpi/firefox-31.5.3/da.xpi) = df506e2306b5e2b2c4c48c71d8cfaa70581c1abcc6e3cb1014669d48ab120052 +SIZE (xpi/firefox-31.5.3/da.xpi) = 397747 +SHA256 (xpi/firefox-31.5.3/de.xpi) = 2b3e0b142c7f7ac144d998e8cade7ad14ab7b8382195350ccd063185a69fdef8 +SIZE (xpi/firefox-31.5.3/de.xpi) = 395165 +SHA256 (xpi/firefox-31.5.3/el.xpi) = 112d549382ab47d4272a368ff437e491427918cf5c309ce0d454d23dfdbff53d +SIZE (xpi/firefox-31.5.3/el.xpi) = 442982 +SHA256 (xpi/firefox-31.5.3/en-GB.xpi) = 7cc89c262bf6905305dfee047f2a08e2b98e3065390e76f7b5f9304dca12ad6b +SIZE (xpi/firefox-31.5.3/en-GB.xpi) = 390118 +SHA256 (xpi/firefox-31.5.3/en-US.xpi) = c7fcd381a759c7d0569d0d70b6050001da125c80f06a9a9f7ae97dee399738d0 +SIZE (xpi/firefox-31.5.3/en-US.xpi) = 422787 +SHA256 (xpi/firefox-31.5.3/en-ZA.xpi) = 77d110c91bbcb87fc70ef0099e829483085c4536c9367fbf38d85209e66e2ad5 +SIZE (xpi/firefox-31.5.3/en-ZA.xpi) = 388528 +SHA256 (xpi/firefox-31.5.3/eo.xpi) = d28e411b30e261e1881ce4af9fb5303c24982a0a4298cc39e89ad64596cab88b +SIZE (xpi/firefox-31.5.3/eo.xpi) = 431830 +SHA256 (xpi/firefox-31.5.3/es-AR.xpi) = 37b03a47f0a842355eca6b144e4a5927bb81918193c4cdb76dbc65721be23c79 +SIZE (xpi/firefox-31.5.3/es-AR.xpi) = 399937 +SHA256 (xpi/firefox-31.5.3/es-CL.xpi) = 9a0c745aa954cc9001a8926bdd94792cd91ffda53ec9d677a1d117721406d759 +SIZE (xpi/firefox-31.5.3/es-CL.xpi) = 342808 +SHA256 (xpi/firefox-31.5.3/es-ES.xpi) = 6f8c2c1828fa5454617374ed84cf514e6b4c47937caaf8edf6abef44f9237a43 +SIZE (xpi/firefox-31.5.3/es-ES.xpi) = 335880 +SHA256 (xpi/firefox-31.5.3/es-MX.xpi) = 982048c22ba8f9d1ae137683b8b93cef1b18043d37dfc6057f1ca1a64255ea7f +SIZE (xpi/firefox-31.5.3/es-MX.xpi) = 402672 +SHA256 (xpi/firefox-31.5.3/et.xpi) = ec37f5a267818d7bd89732a4b8c8df7f6178c7c42d8e23fd1ae5ca3980209295 +SIZE (xpi/firefox-31.5.3/et.xpi) = 390361 +SHA256 (xpi/firefox-31.5.3/eu.xpi) = 8d9ecb87867b7475fae8f9f8afc53ba74c362dbf3ea6ef544e0cc2553dfa0b7d +SIZE (xpi/firefox-31.5.3/eu.xpi) = 412999 +SHA256 (xpi/firefox-31.5.3/fa.xpi) = 02fa5051dd4c46e64a701798f035eefc84e8faa174d20a007c3b018696405b67 +SIZE (xpi/firefox-31.5.3/fa.xpi) = 460857 +SHA256 (xpi/firefox-31.5.3/ff.xpi) = a05239e83bb676ff145a16e7a82694fd8fd1e85042a1402208868100c81585cc +SIZE (xpi/firefox-31.5.3/ff.xpi) = 400143 +SHA256 (xpi/firefox-31.5.3/fi.xpi) = b8985a70bf9c6acb9a32b17aea87986d7fec51140b877b940f884df6834859f2 +SIZE (xpi/firefox-31.5.3/fi.xpi) = 392740 +SHA256 (xpi/firefox-31.5.3/fr.xpi) = 5ef10eda4b2dde6eb1fd28bd9d01db59c6a1f9d30884094025fd285bd2e3edee +SIZE (xpi/firefox-31.5.3/fr.xpi) = 406462 +SHA256 (xpi/firefox-31.5.3/fy-NL.xpi) = dd8bf07f45cce623ca42f46af29603a8552b1a0e486312b9c51a03d3136365e8 +SIZE (xpi/firefox-31.5.3/fy-NL.xpi) = 401933 +SHA256 (xpi/firefox-31.5.3/ga-IE.xpi) = 20b9cc0e230f20bb0640d452474bf8a96aa4cb61cbe0b5e703ab6b2ec0257c3d +SIZE (xpi/firefox-31.5.3/ga-IE.xpi) = 410076 +SHA256 (xpi/firefox-31.5.3/gd.xpi) = 11bffbdad29e87dbe2cce2c588ca29b89ae97f4355cb1ff72214db956d575654 +SIZE (xpi/firefox-31.5.3/gd.xpi) = 403013 +SHA256 (xpi/firefox-31.5.3/gl.xpi) = 452a24fb1b9dec57c5a34a7a1ea71f8d21d8405fce738bee091009074d3a4d5b +SIZE (xpi/firefox-31.5.3/gl.xpi) = 390599 +SHA256 (xpi/firefox-31.5.3/gu-IN.xpi) = e55cbdb1af9fb8d0751b098af3655dec918a897de53fc7abf0422484525c11b3 +SIZE (xpi/firefox-31.5.3/gu-IN.xpi) = 423503 +SHA256 (xpi/firefox-31.5.3/he.xpi) = a71e94a3b5d6e11a9c915df365b2260efc5c11ae4fcfb2417812aedbd1f487ed +SIZE (xpi/firefox-31.5.3/he.xpi) = 427630 +SHA256 (xpi/firefox-31.5.3/hi-IN.xpi) = 36377da16d5b09ab73d8a61bfc26e1ca2c24dda5a0d9354814e0ed8a957b663d +SIZE (xpi/firefox-31.5.3/hi-IN.xpi) = 441402 +SHA256 (xpi/firefox-31.5.3/hr.xpi) = 738833e10d35338004cf7a80f7a0be895898b3ea1a338bee6746d797a4da9d2e +SIZE (xpi/firefox-31.5.3/hr.xpi) = 424370 +SHA256 (xpi/firefox-31.5.3/hsb.xpi) = 61cbb7b6e483c6cd7458d58349737cb62ef3b59186f1c095c3f77046719e7d19 +SIZE (xpi/firefox-31.5.3/hsb.xpi) = 413075 +SHA256 (xpi/firefox-31.5.3/hu.xpi) = 4bcad5316136237a80304afab4e441d3ee7820cee5808688affc0729b279e1dd +SIZE (xpi/firefox-31.5.3/hu.xpi) = 398644 +SHA256 (xpi/firefox-31.5.3/hy-AM.xpi) = 5805226bd0d1d936bf0d035ad84245a59022d91fce1f9b98d892ee3a71f52987 +SIZE (xpi/firefox-31.5.3/hy-AM.xpi) = 478743 +SHA256 (xpi/firefox-31.5.3/id.xpi) = cbbb9f18584b2a37321a36999d4b40d3e2161b149bdeb4453d10478eb3fcd0ab +SIZE (xpi/firefox-31.5.3/id.xpi) = 378301 +SHA256 (xpi/firefox-31.5.3/is.xpi) = ff4c5600a54ad4fe3f3c16ea6eb25c1bdd9734f5636deabdcfdbb4d1b45b2242 +SIZE (xpi/firefox-31.5.3/is.xpi) = 427326 +SHA256 (xpi/firefox-31.5.3/it.xpi) = a49a4f61ba71b8fa8b01b0a71ec5d1d4cec914725365d2d0468319599a82509a +SIZE (xpi/firefox-31.5.3/it.xpi) = 330905 +SHA256 (xpi/firefox-31.5.3/ja.xpi) = 1c21b112ddf7f0b48f174c10d3ef56b262a400150dbaa961a830c398c7d2f461 +SIZE (xpi/firefox-31.5.3/ja.xpi) = 421665 +SHA256 (xpi/firefox-31.5.3/kk.xpi) = c8d5c28d047c2526b4c06251e7c1438042a73e63d7ca06b214f44d42cf57873a +SIZE (xpi/firefox-31.5.3/kk.xpi) = 439116 +SHA256 (xpi/firefox-31.5.3/km.xpi) = adc0040f8d9191faa3fd1208bf6237ca6e8b8dde57ce43a8500580ac175d24da +SIZE (xpi/firefox-31.5.3/km.xpi) = 506476 +SHA256 (xpi/firefox-31.5.3/kn.xpi) = 8eee19093ed29306b4199b747864619cb967ebe3b0e7b34f4a35bc354fbeba82 +SIZE (xpi/firefox-31.5.3/kn.xpi) = 458890 +SHA256 (xpi/firefox-31.5.3/ko.xpi) = 63d858ea947e2cb45619cd7f134204a175c6c3f70cc1911bc917a94f253ec230 +SIZE (xpi/firefox-31.5.3/ko.xpi) = 402815 +SHA256 (xpi/firefox-31.5.3/ku.xpi) = ebf9a2e49aa7d125d33d0d01cf919106c66bb696800ea71776eec06d44ab6e59 +SIZE (xpi/firefox-31.5.3/ku.xpi) = 420263 +SHA256 (xpi/firefox-31.5.3/lij.xpi) = e609c736b2186860dae3112fa6d57479eafc6ea17e4b7defd170a5204e28b919 +SIZE (xpi/firefox-31.5.3/lij.xpi) = 385868 +SHA256 (xpi/firefox-31.5.3/lt.xpi) = 1d35160e2e91dc975ce030a86e8d28096beaf23a149b547be3e6d91bd6bbad44 +SIZE (xpi/firefox-31.5.3/lt.xpi) = 435431 +SHA256 (xpi/firefox-31.5.3/lv.xpi) = 0e64508f921eeeb11ebd8af8b57f3554ddab6383439e39d23045f17df1c78269 +SIZE (xpi/firefox-31.5.3/lv.xpi) = 398576 +SHA256 (xpi/firefox-31.5.3/mai.xpi) = 2f574ad27b9911afd48e2a4f91abc885331133fc4ec7fb78139a8e1c074af69b +SIZE (xpi/firefox-31.5.3/mai.xpi) = 444885 +SHA256 (xpi/firefox-31.5.3/mk.xpi) = 9510a11007a422afafb7ece88f09de78cf40017b6c3ea1dd2092efd655e60cf5 +SIZE (xpi/firefox-31.5.3/mk.xpi) = 475483 +SHA256 (xpi/firefox-31.5.3/ml.xpi) = 79b18ca7ca8c8375115d23dbcaecc02ee4fd44071c2d3a29d4e84b3957f35bac +SIZE (xpi/firefox-31.5.3/ml.xpi) = 466254 +SHA256 (xpi/firefox-31.5.3/mr.xpi) = 236a38c9f6d64e776c5d5d023bf7d4aaf9bd2d84611ad892067d27cd88b95c38 +SIZE (xpi/firefox-31.5.3/mr.xpi) = 451292 +SHA256 (xpi/firefox-31.5.3/ms.xpi) = 6042929d2ae91d5d8d3189858c783293f1060326d24e2986326d8b35f7225fcc +SIZE (xpi/firefox-31.5.3/ms.xpi) = 436230 +SHA256 (xpi/firefox-31.5.3/nb-NO.xpi) = 1f492868d4bcade733d6310f84158ed7cbf2f9f5effa0e6b7fd21dedfd74a707 +SIZE (xpi/firefox-31.5.3/nb-NO.xpi) = 392006 +SHA256 (xpi/firefox-31.5.3/nl.xpi) = ec019d247524e16355eb9d9ad638d4a4600cc9295dd743f958dbe9062e1f4301 +SIZE (xpi/firefox-31.5.3/nl.xpi) = 390885 +SHA256 (xpi/firefox-31.5.3/nn-NO.xpi) = ebd6f5f61da262fa77a9ad1e19378c946428c31b28408cf91af1ce2afedd81ad +SIZE (xpi/firefox-31.5.3/nn-NO.xpi) = 386281 +SHA256 (xpi/firefox-31.5.3/or.xpi) = 783c59aa7382ea1665885eee0a91c0b5922cee0aba49d4c9d84ca9e4e2c43866 +SIZE (xpi/firefox-31.5.3/or.xpi) = 464749 +SHA256 (xpi/firefox-31.5.3/pa-IN.xpi) = 45b18d42502571b7a02a852becb30687313049ac44065c772c0c32670870f799 +SIZE (xpi/firefox-31.5.3/pa-IN.xpi) = 439326 +SHA256 (xpi/firefox-31.5.3/pl.xpi) = 0223bbcf8f113d41d50c813e1a69a3c72cb7a271932a2706fca68d84bbb5ba12 +SIZE (xpi/firefox-31.5.3/pl.xpi) = 374746 +SHA256 (xpi/firefox-31.5.3/pt-BR.xpi) = 4ad99d2a91cb6955961a784c7657fda77a0fd7679a69f51fe3bcf2ebfb55645f +SIZE (xpi/firefox-31.5.3/pt-BR.xpi) = 405564 +SHA256 (xpi/firefox-31.5.3/pt-PT.xpi) = dcbfe66c39f0b72016e63852fd913c46bb57b9aef87d294105dfb68b348ed705 +SIZE (xpi/firefox-31.5.3/pt-PT.xpi) = 386344 +SHA256 (xpi/firefox-31.5.3/rm.xpi) = 12ba0e246b3c9ba2d3812f99fc50442009082f4b3fe82dacee4681320b5ff7c6 +SIZE (xpi/firefox-31.5.3/rm.xpi) = 399285 +SHA256 (xpi/firefox-31.5.3/ro.xpi) = 7d4f546fa2fdd3b68478a30f46eed7dc214cd97feb58cd1a1c88ff9471b21ae0 +SIZE (xpi/firefox-31.5.3/ro.xpi) = 439387 +SHA256 (xpi/firefox-31.5.3/ru.xpi) = 5affe9b2ecb0ad0fd315f76f2c42d9406a16162fadc81d4ca61f65bc93a91184 +SIZE (xpi/firefox-31.5.3/ru.xpi) = 367898 +SHA256 (xpi/firefox-31.5.3/si.xpi) = 891e34f1ab442b205b58bc81b9a97e2cf90df517b214605af6097dc0e93d11a3 +SIZE (xpi/firefox-31.5.3/si.xpi) = 463223 +SHA256 (xpi/firefox-31.5.3/sk.xpi) = be6fcf95cf5d8f4d28a7077998041f1f0d5af5884a13b49f839097cb1f77087b +SIZE (xpi/firefox-31.5.3/sk.xpi) = 413802 +SHA256 (xpi/firefox-31.5.3/sl.xpi) = d0c046dda9fc22d17327aeacb6322948122630cd9cffb742acde0726a8024ca0 +SIZE (xpi/firefox-31.5.3/sl.xpi) = 387134 +SHA256 (xpi/firefox-31.5.3/son.xpi) = fd0f959dc5fc77eabdecb63fa692ed11323d251b04e1992f85293b0db756e28e +SIZE (xpi/firefox-31.5.3/son.xpi) = 395147 +SHA256 (xpi/firefox-31.5.3/sq.xpi) = 085334884e43e28b6e83ab74cf17cd99898a7e52044ae29ce529e58ed21fbe9d +SIZE (xpi/firefox-31.5.3/sq.xpi) = 431136 +SHA256 (xpi/firefox-31.5.3/sr.xpi) = 4382012d1cd1772d7669bbea502429323fc84ad404266e2ac497f345e3622a72 +SIZE (xpi/firefox-31.5.3/sr.xpi) = 425902 +SHA256 (xpi/firefox-31.5.3/sv-SE.xpi) = f2dd74455331ad9949b96b4fa151e887a7e22e46dbd7e7e1f969c32eb011ec59 +SIZE (xpi/firefox-31.5.3/sv-SE.xpi) = 399025 +SHA256 (xpi/firefox-31.5.3/ta.xpi) = 65ca70ae396b00b55be7d52140bdc327c4b96a6c0940242681c47b91fb26ff49 +SIZE (xpi/firefox-31.5.3/ta.xpi) = 447685 +SHA256 (xpi/firefox-31.5.3/te.xpi) = 1ba48ffc9eb5137b4af248697356908cc07c407be36698e4f3ff971d89bca56d +SIZE (xpi/firefox-31.5.3/te.xpi) = 462588 +SHA256 (xpi/firefox-31.5.3/th.xpi) = 0797dfcc109090a6361365739195f2021efc81ccef2243a87bd380ceb9580a04 +SIZE (xpi/firefox-31.5.3/th.xpi) = 478128 +SHA256 (xpi/firefox-31.5.3/tr.xpi) = fae7dcb134aca8859524655e105f625c6ccee6427e04cfe335ee34eaebb7a76f +SIZE (xpi/firefox-31.5.3/tr.xpi) = 417370 +SHA256 (xpi/firefox-31.5.3/uk.xpi) = 353c88e9bf416724ca651bb448266e1e870eae872d4a46c9b73e4ebfd2120ed2 +SIZE (xpi/firefox-31.5.3/uk.xpi) = 428002 +SHA256 (xpi/firefox-31.5.3/vi.xpi) = cc2bfb945b31ee3a7d316e11da7dfa44ce754f48923345517e2831ba8d16806e +SIZE (xpi/firefox-31.5.3/vi.xpi) = 413374 +SHA256 (xpi/firefox-31.5.3/xh.xpi) = 41b443afc6c01cd474a87e2fa8601bd5c60f218ea98dbcd16aeed7a297f7a990 +SIZE (xpi/firefox-31.5.3/xh.xpi) = 397876 +SHA256 (xpi/firefox-31.5.3/zh-CN.xpi) = 60f987d0f8009cf7f2fac04806a6bc33bcea2c8896116636841706d7ef23c115 +SIZE (xpi/firefox-31.5.3/zh-CN.xpi) = 419629 +SHA256 (xpi/firefox-31.5.3/zh-TW.xpi) = 4d7854fed8b51d8d032a8842210ae28a1116da077ee1e232f08b51015caa7835 +SIZE (xpi/firefox-31.5.3/zh-TW.xpi) = 412521 +SHA256 (xpi/firefox-31.5.3/zu.xpi) = 38fc8df80b09973f5ffa5cdabfe7c210b369a1695ba6870581973ff88ffab954 +SIZE (xpi/firefox-31.5.3/zu.xpi) = 433216 diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index a879f133ee8d..64ff5767ed96 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 31.4.0 +DISTVERSION= 31.5.3 DISTVERSIONSUFFIX=esr.source -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index 7fd1418d0164..93d4df0f5368 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-31.4.0esr.source.tar.bz2) = c5ad8b588fb1e7690be5da04f627335f6440277dac4bccd46e6687fcf2fbc23b -SIZE (firefox-31.4.0esr.source.tar.bz2) = 147935703 +SHA256 (firefox-31.5.3esr.source.tar.bz2) = 4f0e89362767b1a2e3947abcb5d3edea199d126ce6ce900daec89492bf1ce302 +SIZE (firefox-31.5.3esr.source.tar.bz2) = 147757682 diff --git a/www/firefox-esr/files/patch-bug1021761 b/www/firefox-esr/files/patch-bug1021761 index bd0a689f12c7..1d0cde369c34 100644 --- a/www/firefox-esr/files/patch-bug1021761 +++ b/www/firefox-esr/files/patch-bug1021761 @@ -2,7 +2,7 @@ diff --git configure.in configure.in index 48e60c0..ec08417 100644 --- configure.in +++ 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 --- media/libcubeb/AUTHORS @@ -651,7 +634,7 @@ new file mode 100644 index 0000000..5e38e27 --- /dev/null +++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,399 @@ +@@ -0,0 +1,397 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -660,8 +643,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 @@ -1075,18 +1056,36 @@ 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/Makefile.in media/webrtc/signaling/test/Makefile.in +index 991f03f..3d99eb5 100644 +--- media/webrtc/signaling/test/Makefile.in ++++ media/webrtc/signaling/test/Makefile.in +@@ -26,9 +26,9 @@ ifdef JS_SHARED_LIBRARY + LIBS += $(MOZ_JS_LIBS) + endif + +-ifdef MOZ_ALSA ++ifdef MOZ_OSS + LIBS += \ +- $(MOZ_ALSA_LIBS) \ ++ $(MOZ_OSS_LIBS) \ + $(NULL) + endif + diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk index e191f13..4fb268a 100644 --- toolkit/library/libxul.mk +++ toolkit/library/libxul.mk -@@ -146,6 +146,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32 +@@ -146,9 +146,9 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32 endif endif +-ifdef MOZ_ALSA +-EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) +-endif +ifdef MOZ_OSS +EXTRA_DSO_LDOPTS += $(MOZ_OSS_LIBS) +endif -+ - ifdef MOZ_ALSA - EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) - endif + + ifdef HAVE_CLOCK_MONOTONIC + EXTRA_DSO_LDOPTS += $(REALTIME_LIBS) diff --git a/www/firefox-esr/files/patch-bug1083461 b/www/firefox-esr/files/patch-bug1083461 deleted file mode 100644 index 66989e0e7cf6..000000000000 --- a/www/firefox-esr/files/patch-bug1083461 +++ /dev/null @@ -1,156 +0,0 @@ -commit c97894b -Author: L. David Baron <dbaron@dbaron.org> -Date: Sun Oct 19 23:31:39 2014 -0400 - - Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky approval-mozilla-esr31=bkerensa ---- - layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ - layout/style/nsCSSValue.h | 22 ++++++++++++++++------ - layout/style/nsStyleAnimation.cpp | 6 ++++-- - 3 files changed, 36 insertions(+), 20 deletions(-) - -diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp -index 781ef65..4bbc979 100644 ---- layout/style/nsCSSValue.cpp -+++ layout/style/nsCSSValue.cpp -@@ -253,13 +253,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const - return *mValue.mRect == *aOther.mValue.mRect; - } - else if (eCSSUnit_List == mUnit) { -- return *mValue.mList == *aOther.mValue.mList; -+ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); - } - else if (eCSSUnit_SharedList == mUnit) { - return *mValue.mSharedList == *aOther.mValue.mSharedList; - } - else if (eCSSUnit_PairList == mUnit) { -- return *mValue.mPairList == *aOther.mValue.mPairList; -+ return nsCSSValuePairList::Equal(mValue.mPairList, -+ aOther.mValue.mPairList); - } - else if (eCSSUnit_GridTemplateAreas == mUnit) { - return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; -@@ -1740,13 +1741,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, - } - } - --bool --nsCSSValueList::operator==(const nsCSSValueList& aOther) const -+/* static */ bool -+nsCSSValueList::Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValueList *p1 = this, *p2 = &aOther; -+ const nsCSSValueList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mValue != p2->mValue) - return false; -@@ -1799,8 +1802,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult - bool - nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const - { -- return !mHead == !aOther.mHead && -- (!mHead || *mHead == *aOther.mHead); -+ return nsCSSValueList::Equal(mHead, aOther.mHead); - } - - size_t -@@ -2010,13 +2012,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, - } - } - --bool --nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const -+/* static */ bool -+nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValuePairList *p1 = this, *p2 = &aOther; -+ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mXValue != p2->mXValue || - p1->mYValue != p2->mYValue) -diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h -index 753938c..77eeef0 100644 ---- layout/style/nsCSSValue.h -+++ layout/style/nsCSSValue.h -@@ -806,9 +806,8 @@ struct nsCSSValueList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(nsCSSValueList const& aOther) const; -- bool operator!=(const nsCSSValueList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -821,6 +820,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValueList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; - }; - - // nsCSSValueList_heap differs from nsCSSValueList only in being -@@ -1199,9 +1204,8 @@ struct nsCSSValuePairList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(const nsCSSValuePairList& aOther) const; -- bool operator!=(const nsCSSValuePairList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -1215,6 +1219,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValuePairList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; - }; - - // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being -diff --git layout/style/nsStyleAnimation.cpp layout/style/nsStyleAnimation.cpp -index 6c2ccb0..8dbe404 100644 ---- layout/style/nsStyleAnimation.cpp -+++ layout/style/nsStyleAnimation.cpp -@@ -3816,11 +3816,13 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const - case eUnit_Filter: - case eUnit_Shadow: - case eUnit_BackgroundPosition: -- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; -+ return nsCSSValueList::Equal(mValue.mCSSValueList, -+ aOther.mValue.mCSSValueList); - case eUnit_Transform: - return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; - case eUnit_CSSValuePairList: -- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; -+ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, -+ aOther.mValue.mCSSValuePairList); - case eUnit_UnparsedString: - return (NS_strcmp(GetStringBufferValue(), - aOther.GetStringBufferValue()) == 0); diff --git a/www/firefox-esr/files/patch-bug991253 b/www/firefox-esr/files/patch-bug991253 index 161feb2ca7b5..73d71610ab03 100644 --- a/www/firefox-esr/files/patch-bug991253 +++ b/www/firefox-esr/files/patch-bug991253 @@ -1,14 +1,16 @@ --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr<nsIFile> hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr<nsISimpleEnumerator> dictDirs; diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index 82e9cae830c3..f8b81f25d41b 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 35.0 +PORTVERSION= 36.0.4 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -14,7 +14,7 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USES= zip:infozip gecko:firefox,35,build +USES= zip:infozip gecko:firefox,36,build USE_XPI= firefox linux-firefox NO_ARCH= yes diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo index 234eb0396ee3..1023cf5224bd 100644 --- a/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,176 +1,176 @@ -SHA256 (xpi/firefox-i18n-35.0/ach.xpi) = 85a1271540981ca3491976cbf4bfd036b5835c8eea407f39e3938e0af492696d -SIZE (xpi/firefox-i18n-35.0/ach.xpi) = 467508 -SHA256 (xpi/firefox-i18n-35.0/af.xpi) = b858756835a6dc76f3d76b64366a7a9ee86f6c008e56f1b2dd99fe5f1f36e6b3 -SIZE (xpi/firefox-i18n-35.0/af.xpi) = 467129 -SHA256 (xpi/firefox-i18n-35.0/an.xpi) = 973b6c71c338cb5b25ca156f1b900bf1505e849c0e67f22bd978530f5809e543 -SIZE (xpi/firefox-i18n-35.0/an.xpi) = 446089 -SHA256 (xpi/firefox-i18n-35.0/ar.xpi) = 8cec613adcbbbd4dbf1efb8846fffae0028c7e454864b72fc414cf113ec4e0b9 -SIZE (xpi/firefox-i18n-35.0/ar.xpi) = 499638 -SHA256 (xpi/firefox-i18n-35.0/as.xpi) = 3477826b64144e32e011f0d66e0ab51f5431eb378339a7764232018dfbf844c3 -SIZE (xpi/firefox-i18n-35.0/as.xpi) = 488061 -SHA256 (xpi/firefox-i18n-35.0/ast.xpi) = 2c656b94b65f539c6a28017577cccacc6111adda8ea179ca5142021f8bdcf45e -SIZE (xpi/firefox-i18n-35.0/ast.xpi) = 372415 -SHA256 (xpi/firefox-i18n-35.0/az.xpi) = 3c9f3f9c2cf6d0f678e3d159a613c02560c65fe562c18758d8d8c72d41847634 -SIZE (xpi/firefox-i18n-35.0/az.xpi) = 470997 -SHA256 (xpi/firefox-i18n-35.0/be.xpi) = fa8018937cbd41fa1ea574f81dbf5823c2bb49eee0c10dd32ce62608cb81eef4 -SIZE (xpi/firefox-i18n-35.0/be.xpi) = 422263 -SHA256 (xpi/firefox-i18n-35.0/bg.xpi) = 9baae35b86788673f4aa5fb5a3e94432a6273881fe20c04212783186cb374e18 -SIZE (xpi/firefox-i18n-35.0/bg.xpi) = 477010 -SHA256 (xpi/firefox-i18n-35.0/bn-BD.xpi) = 83d27f68896d10191444c611e2692e6120beae19c7e3859df7c178d825d851f2 -SIZE (xpi/firefox-i18n-35.0/bn-BD.xpi) = 511236 -SHA256 (xpi/firefox-i18n-35.0/bn-IN.xpi) = 5aa98119bb45cd3c6115522f738404ea7878b8af33dc77622811537c4c49cd52 -SIZE (xpi/firefox-i18n-35.0/bn-IN.xpi) = 504191 -SHA256 (xpi/firefox-i18n-35.0/br.xpi) = 491be26031de0a76d18a66a0060136cedb20ba4b464e2734b626f8bbbaf4f96e -SIZE (xpi/firefox-i18n-35.0/br.xpi) = 427011 -SHA256 (xpi/firefox-i18n-35.0/bs.xpi) = b6fe8165c5394f82f41d89449759a2c6b6cb2c7eb2a2a0764b15bdb138115289 -SIZE (xpi/firefox-i18n-35.0/bs.xpi) = 468175 -SHA256 (xpi/firefox-i18n-35.0/ca.xpi) = f7ecf11fec930ad88babcbe1e30a55d30c7af3b9881786d8f2aba128e395fb6f -SIZE (xpi/firefox-i18n-35.0/ca.xpi) = 442491 -SHA256 (xpi/firefox-i18n-35.0/cs.xpi) = 758823fcc0e781d5a6b7c2766eeab3c863ea0431875839daf196a5386185dc22 -SIZE (xpi/firefox-i18n-35.0/cs.xpi) = 430873 -SHA256 (xpi/firefox-i18n-35.0/cy.xpi) = 9ae25cdce960cdd2f9d51ef4e563175b56a606f7eccffecb93caca89683a1886 -SIZE (xpi/firefox-i18n-35.0/cy.xpi) = 429174 -SHA256 (xpi/firefox-i18n-35.0/da.xpi) = dceb9c6519a135f8d4965665d4a2366381a04cb47f226c88a42bc0d4de5fc8c1 -SIZE (xpi/firefox-i18n-35.0/da.xpi) = 435994 -SHA256 (xpi/firefox-i18n-35.0/de.xpi) = 0d37996c06a0be0cc343fc471f6abe2d71f29247028dbfdbba805104c3e7e2de -SIZE (xpi/firefox-i18n-35.0/de.xpi) = 435482 -SHA256 (xpi/firefox-i18n-35.0/dsb.xpi) = 19a43c83e02b9a88fe16a55d0ccb49588680be2153e50e6ebd007e09bc5747c1 -SIZE (xpi/firefox-i18n-35.0/dsb.xpi) = 454783 -SHA256 (xpi/firefox-i18n-35.0/el.xpi) = dbe1dab6dc989f0ebdd6e1369061ccd7813f8f4ef4ed0cfbdbeceaadbb45a388 -SIZE (xpi/firefox-i18n-35.0/el.xpi) = 481158 -SHA256 (xpi/firefox-i18n-35.0/en-GB.xpi) = ff5878dc26c94e9070534485c8b24e715197bd3e6871728b74bc66546f27a4b9 -SIZE (xpi/firefox-i18n-35.0/en-GB.xpi) = 425595 -SHA256 (xpi/firefox-i18n-35.0/en-US.xpi) = 5dfa871a7c4a1b81e9413324075164708448e4f25f63b958ebabd083faa835c0 -SIZE (xpi/firefox-i18n-35.0/en-US.xpi) = 455422 -SHA256 (xpi/firefox-i18n-35.0/en-ZA.xpi) = 91b9c5c55906cc1686167475de7788ef3fb5a3417e1dc3f24c6c522d0736a162 -SIZE (xpi/firefox-i18n-35.0/en-ZA.xpi) = 421564 -SHA256 (xpi/firefox-i18n-35.0/eo.xpi) = 7bed0b3bc9565222e2a36e25974e72662d0d99ad2222253e125b52bdb4157e44 -SIZE (xpi/firefox-i18n-35.0/eo.xpi) = 470274 -SHA256 (xpi/firefox-i18n-35.0/es-AR.xpi) = b48984ad397ead6b37f3fb7b5e4862c81c462ea394f421adb3d97dcadb60a03b -SIZE (xpi/firefox-i18n-35.0/es-AR.xpi) = 438915 -SHA256 (xpi/firefox-i18n-35.0/es-CL.xpi) = ab86c52f9a79778b91be7004c67926547db5d30cbbfa2a91e3620e1c50c03f13 -SIZE (xpi/firefox-i18n-35.0/es-CL.xpi) = 374667 -SHA256 (xpi/firefox-i18n-35.0/es-ES.xpi) = 6ca306bf679fdad1933235172043e0647c46c9c82e8449d7737a66ca25c13d7e -SIZE (xpi/firefox-i18n-35.0/es-ES.xpi) = 365064 -SHA256 (xpi/firefox-i18n-35.0/es-MX.xpi) = 79daa7f4d46ba14c51e6bdbaf6d9baf43b44d6b593d134f0c0eea49ef4a3b19a -SIZE (xpi/firefox-i18n-35.0/es-MX.xpi) = 441442 -SHA256 (xpi/firefox-i18n-35.0/et.xpi) = 785e086d04300ca8e53684ebb4d651c0ac6d8b80695ffd1fa7b766c8f873d116 -SIZE (xpi/firefox-i18n-35.0/et.xpi) = 428356 -SHA256 (xpi/firefox-i18n-35.0/eu.xpi) = c3a56dfefe997e6eb1280cd3e20840a7610769098370a0156eecf6481131b19a -SIZE (xpi/firefox-i18n-35.0/eu.xpi) = 451383 -SHA256 (xpi/firefox-i18n-35.0/fa.xpi) = 534fc7cc4e4c07f9eeaa37f342007bfbada464372f048b1afa69dc81f44164a4 -SIZE (xpi/firefox-i18n-35.0/fa.xpi) = 496843 -SHA256 (xpi/firefox-i18n-35.0/ff.xpi) = 68fce1fc735bd97365eb2c2d5f1094086a727813ae02fccd55e27b9d50ad04f1 -SIZE (xpi/firefox-i18n-35.0/ff.xpi) = 437963 -SHA256 (xpi/firefox-i18n-35.0/fi.xpi) = 96b2a3c145c27e3f9bacabe9b3652b5777186ff86e02842f85add3bf20b48e93 -SIZE (xpi/firefox-i18n-35.0/fi.xpi) = 430180 -SHA256 (xpi/firefox-i18n-35.0/fr.xpi) = dddef870af0d12931119fdeab9c107b66170a49fe540d159c66b6df5809b6023 -SIZE (xpi/firefox-i18n-35.0/fr.xpi) = 445751 -SHA256 (xpi/firefox-i18n-35.0/fy-NL.xpi) = 1314b6f4a19fcd539c3db76b1ec2fb1253bdda44a81854631c1f1656f7e05e3c -SIZE (xpi/firefox-i18n-35.0/fy-NL.xpi) = 440299 -SHA256 (xpi/firefox-i18n-35.0/ga-IE.xpi) = 712eb10bbc6ba05086cae9eab7ab797cd5beeae5d77ac7835d51d2fb4f79b188 -SIZE (xpi/firefox-i18n-35.0/ga-IE.xpi) = 449554 -SHA256 (xpi/firefox-i18n-35.0/gd.xpi) = 8ff2a2f5762f4e8bbe587daeb44be11016d1818d6ae50e5ba3e0d6d65fe58f6c -SIZE (xpi/firefox-i18n-35.0/gd.xpi) = 439243 -SHA256 (xpi/firefox-i18n-35.0/gl.xpi) = 8779ed4a9a2eac380613a48bd80c9b85d011720f791c96a94281b3a14e7e86c0 -SIZE (xpi/firefox-i18n-35.0/gl.xpi) = 430163 -SHA256 (xpi/firefox-i18n-35.0/gu-IN.xpi) = 7855bda5c2483dd2c995e3621505f311b490fb946d07c0a2e25be4206073520d -SIZE (xpi/firefox-i18n-35.0/gu-IN.xpi) = 458567 -SHA256 (xpi/firefox-i18n-35.0/he.xpi) = 5aa56ca35295b6bf9ece00a9a04470fa33c58e3628e10df1ea0970a809638a03 -SIZE (xpi/firefox-i18n-35.0/he.xpi) = 468594 -SHA256 (xpi/firefox-i18n-35.0/hi-IN.xpi) = 5319deeed65ab6649469e6aec8c5771d684fdb9e288b49d5fc7c54a84294dede -SIZE (xpi/firefox-i18n-35.0/hi-IN.xpi) = 488753 -SHA256 (xpi/firefox-i18n-35.0/hr.xpi) = dfca3f6f9ddf41c1990e238f4854df9f109757cd1a0e95af407d53fcb59482ce -SIZE (xpi/firefox-i18n-35.0/hr.xpi) = 462799 -SHA256 (xpi/firefox-i18n-35.0/hsb.xpi) = 53edcce92df00c807d76e6f537db80903ba013ada768106627311d6592a92d7d -SIZE (xpi/firefox-i18n-35.0/hsb.xpi) = 452729 -SHA256 (xpi/firefox-i18n-35.0/hu.xpi) = 31917c56d4cfd6bddf7f8941a33f636d65378421d39e00ac0dd7e4bab56f75c2 -SIZE (xpi/firefox-i18n-35.0/hu.xpi) = 438008 -SHA256 (xpi/firefox-i18n-35.0/hy-AM.xpi) = e18e39f6d7d76f9907ecdbeb3062739ed83c37a2b777ac320839821db3ffba6b -SIZE (xpi/firefox-i18n-35.0/hy-AM.xpi) = 518274 -SHA256 (xpi/firefox-i18n-35.0/id.xpi) = 39790a0f45eb1436858afc0861ba506a1207918068b45550c6625f169608017f -SIZE (xpi/firefox-i18n-35.0/id.xpi) = 416384 -SHA256 (xpi/firefox-i18n-35.0/is.xpi) = 5acfa8dbaa6bdf58adb8ac6beaa3dbebaeacc31fa0afa0490ca0d3da9af37be0 -SIZE (xpi/firefox-i18n-35.0/is.xpi) = 470059 -SHA256 (xpi/firefox-i18n-35.0/it.xpi) = 33acc5fdc123b75768798807020b9f4eb08a5e8c0f825b4af5a6f878393a6bb4 -SIZE (xpi/firefox-i18n-35.0/it.xpi) = 359264 -SHA256 (xpi/firefox-i18n-35.0/ja.xpi) = 2e66500fdfb4c905d9b5be07c4a2c788ac7dd46eb1cc0f4defaf1a00690453af -SIZE (xpi/firefox-i18n-35.0/ja.xpi) = 461519 -SHA256 (xpi/firefox-i18n-35.0/kk.xpi) = ef3ffc6f425c29b78e209c675532a095a444124bf07533b4b599860e63090b19 -SIZE (xpi/firefox-i18n-35.0/kk.xpi) = 485878 -SHA256 (xpi/firefox-i18n-35.0/km.xpi) = 6b285fd8b7ca805231956c9817bcab776fa7f545cc80c9ddcdfea5aede4bb063 -SIZE (xpi/firefox-i18n-35.0/km.xpi) = 546285 -SHA256 (xpi/firefox-i18n-35.0/kn.xpi) = 717281b4694e906dcbe6551d15abe1d893d212818d350598bf983f40e76ab6dd -SIZE (xpi/firefox-i18n-35.0/kn.xpi) = 511932 -SHA256 (xpi/firefox-i18n-35.0/ko.xpi) = c94a9d111a936144caed8c8f292869db7a07a0677c87f0b12463b4c1b12a2057 -SIZE (xpi/firefox-i18n-35.0/ko.xpi) = 444348 -SHA256 (xpi/firefox-i18n-35.0/lij.xpi) = 5c3dd2a4524bfaa9dd0329062f5a85d73d02b0e6b7585eaed289859a38ba8ce3 -SIZE (xpi/firefox-i18n-35.0/lij.xpi) = 426471 -SHA256 (xpi/firefox-i18n-35.0/lt.xpi) = 43f6bf0b50730b6d123329178c1ddd41641ab4241244c774239a865040a47923 -SIZE (xpi/firefox-i18n-35.0/lt.xpi) = 470364 -SHA256 (xpi/firefox-i18n-35.0/lv.xpi) = 568e01e67e7245b2ca5112635c45f47b8b284e9b4485865b5737712fae9dde93 -SIZE (xpi/firefox-i18n-35.0/lv.xpi) = 433943 -SHA256 (xpi/firefox-i18n-35.0/mai.xpi) = 3615b6378f482dfd80e80976f8210503fba43ec807cc6409bec53e63fb5a07fb -SIZE (xpi/firefox-i18n-35.0/mai.xpi) = 481806 -SHA256 (xpi/firefox-i18n-35.0/mk.xpi) = 003b0db29a50daaf953b20965a90927e00a9d087f02be0c5a71e8f521ff9582b -SIZE (xpi/firefox-i18n-35.0/mk.xpi) = 512248 -SHA256 (xpi/firefox-i18n-35.0/ml.xpi) = 6cb41608d0cb4e897e1aceae6141a5441d6562a42e0bb8dec6cbc6d1754cc74e -SIZE (xpi/firefox-i18n-35.0/ml.xpi) = 510070 -SHA256 (xpi/firefox-i18n-35.0/mr.xpi) = 4a926ff815174972658d59593130d56c8a9a2a9d835f1b4d1ee09e4483fc132c -SIZE (xpi/firefox-i18n-35.0/mr.xpi) = 490862 -SHA256 (xpi/firefox-i18n-35.0/ms.xpi) = c0525b214ddd65e851fe86986bb8171b6b17c43dbd0e71d78c90b2b460c56278 -SIZE (xpi/firefox-i18n-35.0/ms.xpi) = 473980 -SHA256 (xpi/firefox-i18n-35.0/nb-NO.xpi) = 04275617458ec15ff93bf6142ccd6bbce2c0d83ada17a2a6f9cdeaaa8d48d1e5 -SIZE (xpi/firefox-i18n-35.0/nb-NO.xpi) = 427545 -SHA256 (xpi/firefox-i18n-35.0/nl.xpi) = d044db587ca5c2240ed0767ed80b7645889ea6b297029ad03edd7fc712852f99 -SIZE (xpi/firefox-i18n-35.0/nl.xpi) = 428992 -SHA256 (xpi/firefox-i18n-35.0/nn-NO.xpi) = 1cd4909db05f1b92cbae25f86f161be573132f5d9ce1d18a19ad5b44803f0a45 -SIZE (xpi/firefox-i18n-35.0/nn-NO.xpi) = 421942 -SHA256 (xpi/firefox-i18n-35.0/or.xpi) = f96b2a7f7b7c05fb8b4e4694c0acfd0b594b4718e730f7d0d44f2c70a1e00cf7 -SIZE (xpi/firefox-i18n-35.0/or.xpi) = 507035 -SHA256 (xpi/firefox-i18n-35.0/pa-IN.xpi) = 16f71db1317bde74a9eb08c9f6ece07a26a7188173e88acc6f5e319efd9aea20 -SIZE (xpi/firefox-i18n-35.0/pa-IN.xpi) = 478328 -SHA256 (xpi/firefox-i18n-35.0/pl.xpi) = 804551ab6dafd44a56dc984de429fbabdb916beefcf9694f5836b5962bed6735 -SIZE (xpi/firefox-i18n-35.0/pl.xpi) = 399975 -SHA256 (xpi/firefox-i18n-35.0/pt-BR.xpi) = 5bb2ea2d625fe9b0069c499be11cb80c8e69bb1388ca25194e231180a1d208a9 -SIZE (xpi/firefox-i18n-35.0/pt-BR.xpi) = 446520 -SHA256 (xpi/firefox-i18n-35.0/pt-PT.xpi) = 72493c62369d82652b01b1371501f3f5a5ccaad9daf25d097ffaa26540ff91f6 -SIZE (xpi/firefox-i18n-35.0/pt-PT.xpi) = 424494 -SHA256 (xpi/firefox-i18n-35.0/rm.xpi) = c24966b525041312599daa5400ead38e0debc42ca4edb5cc479bad46f6bfd9b2 -SIZE (xpi/firefox-i18n-35.0/rm.xpi) = 437059 -SHA256 (xpi/firefox-i18n-35.0/ro.xpi) = d85aeaecc8cd8c7763f3463e7e0990ea8697abd505a643df01e618a31d3e990f -SIZE (xpi/firefox-i18n-35.0/ro.xpi) = 479194 -SHA256 (xpi/firefox-i18n-35.0/ru.xpi) = 5a5a8d0c8c10a051d0b2163f38fb8f68ae1dd8f4021f9e60516197bc1211bbad -SIZE (xpi/firefox-i18n-35.0/ru.xpi) = 403477 -SHA256 (xpi/firefox-i18n-35.0/si.xpi) = 8e986b14482871f6e45342c087ca1c9a8f707e0c56225b8db99686d763094483 -SIZE (xpi/firefox-i18n-35.0/si.xpi) = 510074 -SHA256 (xpi/firefox-i18n-35.0/sk.xpi) = 16db8bcce4c2c470c2348655d01d26dec4bed8ad1a61aad9cf4e704ee3d172a9 -SIZE (xpi/firefox-i18n-35.0/sk.xpi) = 453744 -SHA256 (xpi/firefox-i18n-35.0/sl.xpi) = ca3bf5cab217ef7676a0c71dafe96fe790acf5a344115f00c32aec23c3286240 -SIZE (xpi/firefox-i18n-35.0/sl.xpi) = 426390 -SHA256 (xpi/firefox-i18n-35.0/son.xpi) = 1dfcae70989fb755f3cd6d6ac1e0304e3e38676119cc4c8267345474af0681d6 -SIZE (xpi/firefox-i18n-35.0/son.xpi) = 433367 -SHA256 (xpi/firefox-i18n-35.0/sq.xpi) = 0df9e4e3e8b0715a85085168da6cd5aba3737e4c523458e6c4a87fd687d3f7fa -SIZE (xpi/firefox-i18n-35.0/sq.xpi) = 470747 -SHA256 (xpi/firefox-i18n-35.0/sr.xpi) = 77ffca3f8ef2628370e281edea4ee9a7e5fe22963c86b26677a9d27f8aff5fcd -SIZE (xpi/firefox-i18n-35.0/sr.xpi) = 463761 -SHA256 (xpi/firefox-i18n-35.0/sv-SE.xpi) = 6cdd24d80d6e9f9486501d46e58267eeb0f348626582eb809ee91472ee8dab21 -SIZE (xpi/firefox-i18n-35.0/sv-SE.xpi) = 437319 -SHA256 (xpi/firefox-i18n-35.0/ta.xpi) = f3cfe2308458f7eeb64c728d5ed1993353c7e73a3bfdf32db387f2e91d25145e -SIZE (xpi/firefox-i18n-35.0/ta.xpi) = 487297 -SHA256 (xpi/firefox-i18n-35.0/te.xpi) = e6e1cc0c30fbd1bbb99c15212e1e4f52788e18bacc4123e2a62dda310f7c3a0f -SIZE (xpi/firefox-i18n-35.0/te.xpi) = 508640 -SHA256 (xpi/firefox-i18n-35.0/th.xpi) = 64120f6b6e4a1f618c7f7534b7ec19f4157bbe3528131b634ee703df194d515f -SIZE (xpi/firefox-i18n-35.0/th.xpi) = 515439 -SHA256 (xpi/firefox-i18n-35.0/tr.xpi) = 116085daff97dcf263aaa615a199f3a98c1bcd28a54f889c8b6061cabd790856 -SIZE (xpi/firefox-i18n-35.0/tr.xpi) = 465759 -SHA256 (xpi/firefox-i18n-35.0/uk.xpi) = cf3a25249d325d72f680a99f6c3083067e105e8b951d1c54e581fdaf2c2e017b -SIZE (xpi/firefox-i18n-35.0/uk.xpi) = 464397 -SHA256 (xpi/firefox-i18n-35.0/vi.xpi) = 9d1bccec606778f012455e4704829be45a706e1b232b0df1cf81f3c3ea41a4b0 -SIZE (xpi/firefox-i18n-35.0/vi.xpi) = 450199 -SHA256 (xpi/firefox-i18n-35.0/xh.xpi) = 0e0b578bc6fecac8e4d75b7963be8d88d5ee69fe63b749c1983318a4d75e66e8 -SIZE (xpi/firefox-i18n-35.0/xh.xpi) = 432688 -SHA256 (xpi/firefox-i18n-35.0/zh-CN.xpi) = 3f07a55fd54d9b49b2e5ca86631238982f2fa6ac7bb4f1848726870dee92b624 -SIZE (xpi/firefox-i18n-35.0/zh-CN.xpi) = 471966 -SHA256 (xpi/firefox-i18n-35.0/zh-TW.xpi) = 931a489a23de7e2a42723c7e495b9c9d88d2f8343068a97a38d207a7659774cf -SIZE (xpi/firefox-i18n-35.0/zh-TW.xpi) = 451736 +SHA256 (xpi/firefox-i18n-36.0.4/ach.xpi) = c9f5f3c10e55fb183d8aed30b3ae1039f712f69221f310a824a8061715f5ec0e +SIZE (xpi/firefox-i18n-36.0.4/ach.xpi) = 465662 +SHA256 (xpi/firefox-i18n-36.0.4/af.xpi) = 0ea516db1f7f100b09ffe1bacf08d23b1a29ecb7cb691354f93467f9b97ef9f3 +SIZE (xpi/firefox-i18n-36.0.4/af.xpi) = 472057 +SHA256 (xpi/firefox-i18n-36.0.4/an.xpi) = 3e2f7f94d6a44bbb00a53d57a57e79bbee9a400c52e3e11ae59159567c8a22b3 +SIZE (xpi/firefox-i18n-36.0.4/an.xpi) = 449538 +SHA256 (xpi/firefox-i18n-36.0.4/ar.xpi) = 63ad3bbf77b6ee71a0c3761da376a1236b08a52e6db7581c776c7f1fdfdc85dd +SIZE (xpi/firefox-i18n-36.0.4/ar.xpi) = 504370 +SHA256 (xpi/firefox-i18n-36.0.4/as.xpi) = fa4d84594a77b7b157ca7c926fabd7a811dbb87477b5ef738bec84c046081ae1 +SIZE (xpi/firefox-i18n-36.0.4/as.xpi) = 494230 +SHA256 (xpi/firefox-i18n-36.0.4/ast.xpi) = 6aafe303ab39f92d4348a8cbc90dd20dfa5eca97436b42726bb7406b6c02d4f9 +SIZE (xpi/firefox-i18n-36.0.4/ast.xpi) = 377933 +SHA256 (xpi/firefox-i18n-36.0.4/az.xpi) = e253309234b7f9e1134c232b181db7e5c5e8423a3850d0eed2d28e525f5c7f50 +SIZE (xpi/firefox-i18n-36.0.4/az.xpi) = 475729 +SHA256 (xpi/firefox-i18n-36.0.4/be.xpi) = bfe3c87abcc0cdfd739fae1a9ceca8dd322eb31146880d3e8db58267cbbdafa2 +SIZE (xpi/firefox-i18n-36.0.4/be.xpi) = 426959 +SHA256 (xpi/firefox-i18n-36.0.4/bg.xpi) = d556555f566356b245456581b7edf9a231afc25e59bba4161b21eb92873dd59e +SIZE (xpi/firefox-i18n-36.0.4/bg.xpi) = 481499 +SHA256 (xpi/firefox-i18n-36.0.4/bn-BD.xpi) = 17b117646c5d43f62620b437e51c4c449f7c4f4cea8ab7c149a5665a08343669 +SIZE (xpi/firefox-i18n-36.0.4/bn-BD.xpi) = 515520 +SHA256 (xpi/firefox-i18n-36.0.4/bn-IN.xpi) = f2cb0f525d65b99709e2b4148cfe5dbda66210cad3acf98bd156dff06db1ff46 +SIZE (xpi/firefox-i18n-36.0.4/bn-IN.xpi) = 514353 +SHA256 (xpi/firefox-i18n-36.0.4/br.xpi) = 18404739173f03aa6fa01b99d9e090c0046edca175f78aefa04fc2a140cea6ca +SIZE (xpi/firefox-i18n-36.0.4/br.xpi) = 430390 +SHA256 (xpi/firefox-i18n-36.0.4/bs.xpi) = 1f6e248d0a27f415b1661083b0df27b56ed5692e139abd5a269022f87617c9df +SIZE (xpi/firefox-i18n-36.0.4/bs.xpi) = 472357 +SHA256 (xpi/firefox-i18n-36.0.4/ca.xpi) = f6e7b1d57654b5328bd45be9e3033f5d6469f1e318fb0cad55119e3827f26943 +SIZE (xpi/firefox-i18n-36.0.4/ca.xpi) = 446101 +SHA256 (xpi/firefox-i18n-36.0.4/cs.xpi) = 22538a55e45ba0cdae72d9d21ea0835a80b13657de9f1b25335742c338208cdb +SIZE (xpi/firefox-i18n-36.0.4/cs.xpi) = 434462 +SHA256 (xpi/firefox-i18n-36.0.4/cy.xpi) = 6a860df001ad770d39f6ae3be8c295a4b189dc5ce4625b3aa29872555caec7f0 +SIZE (xpi/firefox-i18n-36.0.4/cy.xpi) = 432591 +SHA256 (xpi/firefox-i18n-36.0.4/da.xpi) = 7a86c2af5a1194f39b0fbcf2547404e4a50843fc0937917b7a569fc98769febf +SIZE (xpi/firefox-i18n-36.0.4/da.xpi) = 439278 +SHA256 (xpi/firefox-i18n-36.0.4/de.xpi) = 15eb9fe1b985b935843d8ba31890c9635f78226fc4bdfe90281aa296e5fc99f9 +SIZE (xpi/firefox-i18n-36.0.4/de.xpi) = 439187 +SHA256 (xpi/firefox-i18n-36.0.4/dsb.xpi) = 99bb449e7823c4a4928a54ce2c0365dbf59fbc0173205665077894f2bf112b76 +SIZE (xpi/firefox-i18n-36.0.4/dsb.xpi) = 458449 +SHA256 (xpi/firefox-i18n-36.0.4/el.xpi) = 1825ae1148d6fd5f453090e9313bc9c058394c0a4c310af4d3823198d98c75ce +SIZE (xpi/firefox-i18n-36.0.4/el.xpi) = 485456 +SHA256 (xpi/firefox-i18n-36.0.4/en-GB.xpi) = f6e1b6f5d3db562e38e870cc0456e8d0e67f70b03076b993ed7483ba136dd576 +SIZE (xpi/firefox-i18n-36.0.4/en-GB.xpi) = 429600 +SHA256 (xpi/firefox-i18n-36.0.4/en-US.xpi) = 1e43a9e24a832b79604dbc1ea60b62210c9bcb5509c18a651e2ec60b6e3133aa +SIZE (xpi/firefox-i18n-36.0.4/en-US.xpi) = 458577 +SHA256 (xpi/firefox-i18n-36.0.4/en-ZA.xpi) = 2386563c3963415d081731a5d3d962bd4699253ac6c204fff340881621bbf68b +SIZE (xpi/firefox-i18n-36.0.4/en-ZA.xpi) = 425588 +SHA256 (xpi/firefox-i18n-36.0.4/eo.xpi) = dd633f78e19ad1d159d20a0f912bbf2337d09178baa8f2109ffd0f9534206e8b +SIZE (xpi/firefox-i18n-36.0.4/eo.xpi) = 473725 +SHA256 (xpi/firefox-i18n-36.0.4/es-AR.xpi) = f35b2575f8bbebdc3ce0b29c0c32b3b3b5ea9e153a2948773e80e9dfe6a6606e +SIZE (xpi/firefox-i18n-36.0.4/es-AR.xpi) = 442481 +SHA256 (xpi/firefox-i18n-36.0.4/es-CL.xpi) = 84f629c99495eb31ac9426d873050b5e38f787accd0b09a931b79826002e25c5 +SIZE (xpi/firefox-i18n-36.0.4/es-CL.xpi) = 377186 +SHA256 (xpi/firefox-i18n-36.0.4/es-ES.xpi) = 726a4a3166dd4449635f83604849cf8408789703b3984e5340e1877e1cce7de7 +SIZE (xpi/firefox-i18n-36.0.4/es-ES.xpi) = 366987 +SHA256 (xpi/firefox-i18n-36.0.4/es-MX.xpi) = ba027a522dfa5903440fb0c3efda1626b586ab3e8f2ee4e46bca02c7f5daee8c +SIZE (xpi/firefox-i18n-36.0.4/es-MX.xpi) = 444970 +SHA256 (xpi/firefox-i18n-36.0.4/et.xpi) = bdb86bc3d4418a2353633145069c50973d75ba06eba2d11cc70ca04484acb4e0 +SIZE (xpi/firefox-i18n-36.0.4/et.xpi) = 431612 +SHA256 (xpi/firefox-i18n-36.0.4/eu.xpi) = 4515d11667cb72bcbc024ee25f948b1ca24d40d33d20ee699bea18acccd7409c +SIZE (xpi/firefox-i18n-36.0.4/eu.xpi) = 454740 +SHA256 (xpi/firefox-i18n-36.0.4/fa.xpi) = aeba44c9b2770f9915b50539a5d7226785fcfb86c1c32e25a078a8a2796fbb62 +SIZE (xpi/firefox-i18n-36.0.4/fa.xpi) = 500879 +SHA256 (xpi/firefox-i18n-36.0.4/ff.xpi) = 3e416402d33937ed40f42071a5e3b827338bab4951be1d0b2777e806e28b40d6 +SIZE (xpi/firefox-i18n-36.0.4/ff.xpi) = 442342 +SHA256 (xpi/firefox-i18n-36.0.4/fi.xpi) = 2db90946d837b8b2ebef065c43f98d05811351210dee58b735c99fba18a4127c +SIZE (xpi/firefox-i18n-36.0.4/fi.xpi) = 433372 +SHA256 (xpi/firefox-i18n-36.0.4/fr.xpi) = bc3d2ddcb8c5eff8e43bdcd20b81a5ef494910cb3b4962b7bf4e4f2266e13cdd +SIZE (xpi/firefox-i18n-36.0.4/fr.xpi) = 449178 +SHA256 (xpi/firefox-i18n-36.0.4/fy-NL.xpi) = 1658bd6067ca3de57e5707c5511e5036060a056da51f37f0d890d3e50ae9fe19 +SIZE (xpi/firefox-i18n-36.0.4/fy-NL.xpi) = 443808 +SHA256 (xpi/firefox-i18n-36.0.4/ga-IE.xpi) = 7766742416cc59b2b83cc021d67c7852a72a32b3b28dbe5ff8a670a175ca33d5 +SIZE (xpi/firefox-i18n-36.0.4/ga-IE.xpi) = 453000 +SHA256 (xpi/firefox-i18n-36.0.4/gd.xpi) = a865dc776328ae87764bcb8a365f0a4f849b57fcb69321fb219d477a26d8ba99 +SIZE (xpi/firefox-i18n-36.0.4/gd.xpi) = 442657 +SHA256 (xpi/firefox-i18n-36.0.4/gl.xpi) = 4878fb06045a5305f870a66b71bb1f9d7715126a832871e92806ff934f1a7fd3 +SIZE (xpi/firefox-i18n-36.0.4/gl.xpi) = 433436 +SHA256 (xpi/firefox-i18n-36.0.4/gu-IN.xpi) = f94814de5f8a321edefb7f9c20f87c9c19d82d3210cdb660d9b137d77415ed7e +SIZE (xpi/firefox-i18n-36.0.4/gu-IN.xpi) = 463249 +SHA256 (xpi/firefox-i18n-36.0.4/he.xpi) = 18e4dc8407017021243c038937ec4ef2c8c97941e311998a2bf542e9420feb9f +SIZE (xpi/firefox-i18n-36.0.4/he.xpi) = 473376 +SHA256 (xpi/firefox-i18n-36.0.4/hi-IN.xpi) = dc1aa1e87522b1c324a69c5c95f133176909cfd763566a3e53dad533650073ea +SIZE (xpi/firefox-i18n-36.0.4/hi-IN.xpi) = 493295 +SHA256 (xpi/firefox-i18n-36.0.4/hr.xpi) = a311cdb9d088ee5656e25b90d7a6a65da0586151925bd78b75a205d25614100b +SIZE (xpi/firefox-i18n-36.0.4/hr.xpi) = 466360 +SHA256 (xpi/firefox-i18n-36.0.4/hsb.xpi) = 2e889dd54bd50c173e5283e5a035f9f4bb91454022df99ecc815dcca8dfbcbe3 +SIZE (xpi/firefox-i18n-36.0.4/hsb.xpi) = 456356 +SHA256 (xpi/firefox-i18n-36.0.4/hu.xpi) = 74ea33e23bc0410d588386790f56e10763a2f6e0d08bad6ad32abc45791a526f +SIZE (xpi/firefox-i18n-36.0.4/hu.xpi) = 441328 +SHA256 (xpi/firefox-i18n-36.0.4/hy-AM.xpi) = 4542c3d00e8505b7b3ae5d793b737f64ce4ff7395b3a99503d04dc2cc9291d60 +SIZE (xpi/firefox-i18n-36.0.4/hy-AM.xpi) = 522156 +SHA256 (xpi/firefox-i18n-36.0.4/id.xpi) = 5641bb277cea62a5c64becc9bc9e4aae5dd18e3f3970e0c471e869e8bacb2da3 +SIZE (xpi/firefox-i18n-36.0.4/id.xpi) = 419616 +SHA256 (xpi/firefox-i18n-36.0.4/is.xpi) = 594c92f272f75f0e5182a03fafc03cf14b46525d3316f94c1c39e83ea8905c40 +SIZE (xpi/firefox-i18n-36.0.4/is.xpi) = 473424 +SHA256 (xpi/firefox-i18n-36.0.4/it.xpi) = da525062d0a57beaa23d7c5214f9004ed127a22617d1de8243b2180720647c6b +SIZE (xpi/firefox-i18n-36.0.4/it.xpi) = 361316 +SHA256 (xpi/firefox-i18n-36.0.4/ja.xpi) = 8852cca6a77735ce258a62fa844ded21da3c226a0954e7e6aed951db275627ba +SIZE (xpi/firefox-i18n-36.0.4/ja.xpi) = 465476 +SHA256 (xpi/firefox-i18n-36.0.4/kk.xpi) = 22feb2ea6a5ac675fd1f0b3348570452f2818b80655f005128350830ec363519 +SIZE (xpi/firefox-i18n-36.0.4/kk.xpi) = 490171 +SHA256 (xpi/firefox-i18n-36.0.4/km.xpi) = d1b1a8a7baa553036467bf9769ee7043b334bce19afedd18c56e48481a6f85d1 +SIZE (xpi/firefox-i18n-36.0.4/km.xpi) = 550766 +SHA256 (xpi/firefox-i18n-36.0.4/kn.xpi) = 5713d809786f34815f0e7c55ca0fd126e6dbc9fadb11eea031b7ed7e7e108350 +SIZE (xpi/firefox-i18n-36.0.4/kn.xpi) = 516617 +SHA256 (xpi/firefox-i18n-36.0.4/ko.xpi) = 17ab57f042a7c1ba540f7905a531f264d66586828090070c3454280c01fb483e +SIZE (xpi/firefox-i18n-36.0.4/ko.xpi) = 448221 +SHA256 (xpi/firefox-i18n-36.0.4/lij.xpi) = 5d4b2b794303f8180f72bab39b0206513566ef67baf79ddc88362f1765c540b4 +SIZE (xpi/firefox-i18n-36.0.4/lij.xpi) = 430855 +SHA256 (xpi/firefox-i18n-36.0.4/lt.xpi) = f263c56e07d83abec5b5dff41654f5f36ef0e9185d7138d2ed8f5e093c34dec9 +SIZE (xpi/firefox-i18n-36.0.4/lt.xpi) = 474006 +SHA256 (xpi/firefox-i18n-36.0.4/lv.xpi) = 8a2637e407d14701f6b983e739314f4ee19c668200fb413c92c751dfe269c50e +SIZE (xpi/firefox-i18n-36.0.4/lv.xpi) = 436233 +SHA256 (xpi/firefox-i18n-36.0.4/mai.xpi) = a7b674f5bd61b53d62d74b995e20826bed876be7d21c678f1f75cfa55944baf6 +SIZE (xpi/firefox-i18n-36.0.4/mai.xpi) = 485633 +SHA256 (xpi/firefox-i18n-36.0.4/mk.xpi) = 579c05d8a233071cd8146958876420350fda03a4a78ddd8df56413084b003a43 +SIZE (xpi/firefox-i18n-36.0.4/mk.xpi) = 516380 +SHA256 (xpi/firefox-i18n-36.0.4/ml.xpi) = 0bb4b7a1ac8cd5a81657fe769d99d67d1b55b336198b46649777523621672914 +SIZE (xpi/firefox-i18n-36.0.4/ml.xpi) = 514513 +SHA256 (xpi/firefox-i18n-36.0.4/mr.xpi) = 7a7a0be2e5cc695337458f8472d3437ab86d42556638cdac0cf302682be7967b +SIZE (xpi/firefox-i18n-36.0.4/mr.xpi) = 495230 +SHA256 (xpi/firefox-i18n-36.0.4/ms.xpi) = e9d5694d625ca5d99514df1ab1fff62ce164c52002a5ad17f4f9c9f7250f25af +SIZE (xpi/firefox-i18n-36.0.4/ms.xpi) = 478249 +SHA256 (xpi/firefox-i18n-36.0.4/nb-NO.xpi) = 812f29f2b182d108bbc376eef0b965ed3f3c081a782e60412004b607c555128d +SIZE (xpi/firefox-i18n-36.0.4/nb-NO.xpi) = 432556 +SHA256 (xpi/firefox-i18n-36.0.4/nl.xpi) = dd56b83cdda99115d911e1f383aef72d030a91c6845e3e84ad12a2700eea54d0 +SIZE (xpi/firefox-i18n-36.0.4/nl.xpi) = 432349 +SHA256 (xpi/firefox-i18n-36.0.4/nn-NO.xpi) = bd9eab7dbcbfb7c3452c905f286da5470e7e4e8724a311a5c4b013d45a799efb +SIZE (xpi/firefox-i18n-36.0.4/nn-NO.xpi) = 426610 +SHA256 (xpi/firefox-i18n-36.0.4/or.xpi) = 01d6f2ef3ef1caed284d0f4420d4a795647b79d77de8f688293eae82cc5b5334 +SIZE (xpi/firefox-i18n-36.0.4/or.xpi) = 512016 +SHA256 (xpi/firefox-i18n-36.0.4/pa-IN.xpi) = 2f20e5133e994ad195697521c5700ca0ce619ad2fa6fce908332993c8d587d9a +SIZE (xpi/firefox-i18n-36.0.4/pa-IN.xpi) = 481893 +SHA256 (xpi/firefox-i18n-36.0.4/pl.xpi) = 769315f8b69ad38a4e2ae798cc802388d5f3510d14e9d744205e82ce251b31a2 +SIZE (xpi/firefox-i18n-36.0.4/pl.xpi) = 402049 +SHA256 (xpi/firefox-i18n-36.0.4/pt-BR.xpi) = 536bd0969bf14b506d18296590381b2506ef821a1a7a7b7031ffef0371428a07 +SIZE (xpi/firefox-i18n-36.0.4/pt-BR.xpi) = 447669 +SHA256 (xpi/firefox-i18n-36.0.4/pt-PT.xpi) = f2278d4d0c243dd22d96a1c43ad4155f91768088aacbbff5435bcdded1b7b508 +SIZE (xpi/firefox-i18n-36.0.4/pt-PT.xpi) = 428708 +SHA256 (xpi/firefox-i18n-36.0.4/rm.xpi) = 4300a89656f697a484e7575bf15573210a82d43f8324fbabe2c2c0443c77dd0e +SIZE (xpi/firefox-i18n-36.0.4/rm.xpi) = 443941 +SHA256 (xpi/firefox-i18n-36.0.4/ro.xpi) = b377ba2fc84d461c9948690466066a18d01fd7a217c511ec09f79ce35b23a734 +SIZE (xpi/firefox-i18n-36.0.4/ro.xpi) = 483570 +SHA256 (xpi/firefox-i18n-36.0.4/ru.xpi) = 8f39031f01aa6460db17ff0b65f030e99902b8e79e8427652313d839c826f791 +SIZE (xpi/firefox-i18n-36.0.4/ru.xpi) = 406024 +SHA256 (xpi/firefox-i18n-36.0.4/si.xpi) = 9c1d8caa9c18ef06323af1827eb754b636f6694290be5608a1702f6e8d2bcfa7 +SIZE (xpi/firefox-i18n-36.0.4/si.xpi) = 514744 +SHA256 (xpi/firefox-i18n-36.0.4/sk.xpi) = e6535a4e649546a0b0a12cddfeb1dea7aede5a7a5ae28e944ee13252552ac2c5 +SIZE (xpi/firefox-i18n-36.0.4/sk.xpi) = 457190 +SHA256 (xpi/firefox-i18n-36.0.4/sl.xpi) = ef53001f0e6362b8bba129571f9cb579f240d877879ffd40dfcba48a13599f4c +SIZE (xpi/firefox-i18n-36.0.4/sl.xpi) = 429929 +SHA256 (xpi/firefox-i18n-36.0.4/son.xpi) = a10920d452471bc627c5cf078011b10706411b9255484dbedaa5d481e223f303 +SIZE (xpi/firefox-i18n-36.0.4/son.xpi) = 436772 +SHA256 (xpi/firefox-i18n-36.0.4/sq.xpi) = e6ed16e285a9c3c8bc075f8675f2d4ed0c5e12d0abb5c993021efa02cbc754b3 +SIZE (xpi/firefox-i18n-36.0.4/sq.xpi) = 474054 +SHA256 (xpi/firefox-i18n-36.0.4/sr.xpi) = b9691eb6e7e3ed4a8c4b1a44b72665eb65422fb16e738966c264cdf2640ecfb1 +SIZE (xpi/firefox-i18n-36.0.4/sr.xpi) = 467366 +SHA256 (xpi/firefox-i18n-36.0.4/sv-SE.xpi) = 9a02d164652b51d98cafd5bb461fe0c889363fdb155c4ddde9fc3342a7474f9c +SIZE (xpi/firefox-i18n-36.0.4/sv-SE.xpi) = 440721 +SHA256 (xpi/firefox-i18n-36.0.4/ta.xpi) = 3ce29801778f58fb52f4cf3ac998c43b47129743aff303a3de63282a8d2cdf45 +SIZE (xpi/firefox-i18n-36.0.4/ta.xpi) = 493861 +SHA256 (xpi/firefox-i18n-36.0.4/te.xpi) = 267d658d6f46df8168e68047c38c990a91018323e3162bb62bc53c21164f2bd7 +SIZE (xpi/firefox-i18n-36.0.4/te.xpi) = 513694 +SHA256 (xpi/firefox-i18n-36.0.4/th.xpi) = 34a17ed01959a13dfabb73c5d82de0c35b4c66a0359db9c6f508d2afa3f2f657 +SIZE (xpi/firefox-i18n-36.0.4/th.xpi) = 521633 +SHA256 (xpi/firefox-i18n-36.0.4/tr.xpi) = 96fd17c7febf6c352de936142d75e72e23b2de823fd9e6110fe684604be0a58c +SIZE (xpi/firefox-i18n-36.0.4/tr.xpi) = 468962 +SHA256 (xpi/firefox-i18n-36.0.4/uk.xpi) = 868d38f2ec352b83a1b7c412c45d9d875e39b9601d082c611f79eaf7792e170f +SIZE (xpi/firefox-i18n-36.0.4/uk.xpi) = 469174 +SHA256 (xpi/firefox-i18n-36.0.4/vi.xpi) = f33ed07c1f08be37535257be3443f38acec405d0c380425e9e0c3c50f03ed5f3 +SIZE (xpi/firefox-i18n-36.0.4/vi.xpi) = 454446 +SHA256 (xpi/firefox-i18n-36.0.4/xh.xpi) = 54d1f91960e5c3216f20456dc7ebc94e17a045d549fe348e1b7f7028c799dc8c +SIZE (xpi/firefox-i18n-36.0.4/xh.xpi) = 436241 +SHA256 (xpi/firefox-i18n-36.0.4/zh-CN.xpi) = 7a6337ca9ce8abe4cd2d7d1e03830045dbe9331fafc3fce836e0cbc5693fb5aa +SIZE (xpi/firefox-i18n-36.0.4/zh-CN.xpi) = 475835 +SHA256 (xpi/firefox-i18n-36.0.4/zh-TW.xpi) = 4af6d3661e68055dcfcf7b3063252552781f410f9ce223917882d879a371835c +SIZE (xpi/firefox-i18n-36.0.4/zh-TW.xpi) = 455307 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 2fc5db949111..27d8f0414691 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -2,19 +2,18 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 35.0 +DISTVERSION= 36.0.4 DISTVERSIONSUFFIX=.source -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source/ + https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ - nss>=3.17.2:${PORTSDIR}/security/nss \ + nss>=3.17.4:${PORTSDIR}/security/nss \ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ @@ -23,7 +22,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ libvorbis>=1.3.4:${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 \ diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options index b353629130e1..2d1fb0abd7b9 100644 --- a/www/firefox/Makefile.options +++ b/www/firefox/Makefile.options @@ -9,7 +9,6 @@ OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO DTRACE_DESC?= Build with DTrace probes # move to bsd.options.desc.mk ENIGMAIL_DESC?= Enigmail extension -GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk GNOMEUI_DESC?= libgnomeui support module LIBPROXY_DESC?= Proxy support via libproxy LIGHTNING_DESC?= Calendar extension diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 81310deb508d..813ca048cbf5 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-35.0.source.tar.bz2) = bedeb5bbd8b49e5b286497ef7732542c6e7441088fd8cd577d7ca8af4c871e81 -SIZE (firefox-35.0.source.tar.bz2) = 176269100 +SHA256 (firefox-36.0.4.source.tar.bz2) = 9143bddc64746bf6471b5ae55b9013586b0ffd6c5515c5566b4015e0bf1e16ab +SIZE (firefox-36.0.4.source.tar.bz2) = 179307558 diff --git a/www/firefox/files/patch-bug1013882 b/www/firefox/files/patch-bug1013882 index 86dc379fe50f..b3177989a39e 100644 --- a/www/firefox/files/patch-bug1013882 +++ b/www/firefox/files/patch-bug1013882 @@ -30,14 +30,14 @@ diff --git browser/installer/package-manifest.in browser/installer/package-manif index b509fd4..195345c 100644 --- browser/installer/package-manifest.in +++ browser/installer/package-manifest.in -@@ -583,7 +583,7 @@ - @BINPATH@/components/MozKeyboard.js - @BINPATH@/components/InputMethod.manifest +@@ -608,7 +608,7 @@ + @RESPATH@/components/MozKeyboard.js + @RESPATH@/components/InputMethod.manifest -#ifdef MOZ_DEBUG +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) - @BINPATH@/components/TestInterfaceJS.js - @BINPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest #endif diff --git mobile/android/installer/Makefile.in mobile/android/installer/Makefile.in index 96dceab..3528ad6 100644 diff --git a/www/firefox/files/patch-bug1021761 b/www/firefox/files/patch-bug1021761 index e8721fa8806f..74a5d7a30f61 100644 --- a/www/firefox/files/patch-bug1021761 +++ b/www/firefox/files/patch-bug1021761 @@ -2,7 +2,7 @@ diff --git configure.in configure.in index 48e60c0..ec08417 100644 --- configure.in +++ 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 --- media/libcubeb/AUTHORS @@ -660,7 +643,7 @@ new file mode 100644 index 0000000..5e38e27 --- /dev/null +++ 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 +--- media/webrtc/signaling/test/moz.build ++++ 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 --- toolkit/library/moz.build +++ toolkit/library/moz.build -@@ -239,6 +239,9 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: +@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] +if CONFIG['MOZ_OSS']: + OS_LIBS += CONFIG['MOZ_OSS_LIBS'] -+ - if CONFIG['MOZ_ALSA']: - OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] + if CONFIG['HAVE_CLOCK_MONOTONIC']: + OS_LIBS += CONFIG['REALTIME_LIBS'] diff --git a/www/firefox/files/patch-bug1041795 b/www/firefox/files/patch-bug1041795 deleted file mode 100644 index 3e92884412fb..000000000000 --- a/www/firefox/files/patch-bug1041795 +++ /dev/null @@ -1,48 +0,0 @@ -diff --git config/rules.mk config/rules.mk -index 4d67eda..783942f 100644 ---- config/rules.mk -+++ config/rules.mk -@@ -858,7 +858,7 @@ ifdef DTRACE_PROBE_OBJ - ifndef DTRACE_LIB_DEPENDENT - NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS)) - $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS) -- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS) -+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS) - endif - endif - endif -@@ -876,7 +876,7 @@ ifndef INCREMENTAL_LINKER - endif - ifdef DTRACE_LIB_DEPENDENT - ifndef XP_MACOSX -- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) -+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) - endif - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS)) - @$(RM) $(DTRACE_PROBE_OBJ) -diff --git js/src/Makefile.in js/src/Makefile.in -index 28ca5e8..96793d7 100644 ---- js/src/Makefile.in -+++ js/src/Makefile.in -@@ -342,7 +342,7 @@ endif - - ifdef HAVE_DTRACE - $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d -- dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in -+ dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in - sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \ - -e '/const/!s/char \*/const char */g' \ - javascript-trace.h.in > javascript-trace.h -diff --git probes/Makefile.in probes/Makefile.in -index 6d18f34..deec83f 100644 ---- probes/Makefile.in -+++ probes/Makefile.in -@@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h - - # Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE - $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile -- dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp -+ dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp - sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \ - mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h - rm mozilla-trace.h.tmp diff --git a/www/firefox/files/patch-bug1082199 b/www/firefox/files/patch-bug1082199 deleted file mode 100644 index a10356adaa5b..000000000000 --- a/www/firefox/files/patch-bug1082199 +++ /dev/null @@ -1,26 +0,0 @@ -commit 258ec90 -Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com> -Date: Fri Oct 17 15:55:00 2014 +0200 - - Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium ---- - memory/build/mozjemalloc_compat.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 78bb13a..70265a7 100644 ---- memory/build/mozjemalloc_compat.c -+++ memory/build/mozjemalloc_compat.c -@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) - size_t active, allocated, mapped, page, pdirty; - size_t lg_chunk; - -+ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in -+ // src/ctl.c -+ uint64_t epoch = 0; -+ size_t esz = sizeof(epoch); -+ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); -+ - CTL_GET("arenas.narenas", narenas); - CTL_GET("arenas.page", page); - CTL_GET("stats.active", active); diff --git a/www/firefox/files/patch-bug1083461 b/www/firefox/files/patch-bug1083461 deleted file mode 100644 index 4c253cccdef1..000000000000 --- a/www/firefox/files/patch-bug1083461 +++ /dev/null @@ -1,159 +0,0 @@ -commit 87f367b -Author: L. David Baron <dbaron@dbaron.org> -Date: Sun Oct 19 23:31:39 2014 -0400 - - Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky - - --HG-- - extra : transplant_source : %CD%5D%9BE%FE%DE%A4%F2%B8%CF%D7%AE%84%90%3B%E8%A0d%D7%2B ---- - layout/style/StyleAnimationValue.cpp | 6 ++++-- - layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ - layout/style/nsCSSValue.h | 22 ++++++++++++++++------ - 3 files changed, 36 insertions(+), 20 deletions(-) - -diff --git layout/style/StyleAnimationValue.cpp layout/style/StyleAnimationValue.cpp -index 40bc8bf..1898fe6 100644 ---- layout/style/StyleAnimationValue.cpp -+++ layout/style/StyleAnimationValue.cpp -@@ -3851,11 +3851,13 @@ StyleAnimationValue::operator==(const StyleAnimationValue& aOther) const - case eUnit_Filter: - case eUnit_Shadow: - case eUnit_BackgroundPosition: -- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; -+ return nsCSSValueList::Equal(mValue.mCSSValueList, -+ aOther.mValue.mCSSValueList); - case eUnit_Transform: - return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; - case eUnit_CSSValuePairList: -- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; -+ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, -+ aOther.mValue.mCSSValuePairList); - case eUnit_UnparsedString: - return (NS_strcmp(GetStringBufferValue(), - aOther.GetStringBufferValue()) == 0); -diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp -index dcb8496..fefb4f9 100644 ---- layout/style/nsCSSValue.cpp -+++ layout/style/nsCSSValue.cpp -@@ -264,13 +264,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const - return *mValue.mRect == *aOther.mValue.mRect; - } - else if (eCSSUnit_List == mUnit) { -- return *mValue.mList == *aOther.mValue.mList; -+ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); - } - else if (eCSSUnit_SharedList == mUnit) { - return *mValue.mSharedList == *aOther.mValue.mSharedList; - } - else if (eCSSUnit_PairList == mUnit) { -- return *mValue.mPairList == *aOther.mValue.mPairList; -+ return nsCSSValuePairList::Equal(mValue.mPairList, -+ aOther.mValue.mPairList); - } - else if (eCSSUnit_GridTemplateAreas == mUnit) { - return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; -@@ -1875,13 +1876,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, - } - } - --bool --nsCSSValueList::operator==(const nsCSSValueList& aOther) const -+/* static */ bool -+nsCSSValueList::Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValueList *p1 = this, *p2 = &aOther; -+ const nsCSSValueList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mValue != p2->mValue) - return false; -@@ -1934,8 +1937,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult - bool - nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const - { -- return !mHead == !aOther.mHead && -- (!mHead || *mHead == *aOther.mHead); -+ return nsCSSValueList::Equal(mHead, aOther.mHead); - } - - size_t -@@ -2148,13 +2150,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, - } - } - --bool --nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const -+/* static */ bool -+nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValuePairList *p1 = this, *p2 = &aOther; -+ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mXValue != p2->mXValue || - p1->mYValue != p2->mYValue) -diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h -index 8418a2d..f0c4e63 100644 ---- layout/style/nsCSSValue.h -+++ layout/style/nsCSSValue.h -@@ -871,9 +871,8 @@ struct nsCSSValueList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(nsCSSValueList const& aOther) const; -- bool operator!=(const nsCSSValueList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -886,6 +885,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValueList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; - }; - - // nsCSSValueList_heap differs from nsCSSValueList only in being -@@ -1264,9 +1269,8 @@ struct nsCSSValuePairList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(const nsCSSValuePairList& aOther) const; -- bool operator!=(const nsCSSValuePairList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -1280,6 +1284,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValuePairList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; - }; - - // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being diff --git a/www/firefox/files/patch-bug1097592 b/www/firefox/files/patch-bug1097592 deleted file mode 100644 index 5c1833b60688..000000000000 --- a/www/firefox/files/patch-bug1097592 +++ /dev/null @@ -1,41 +0,0 @@ -commit a822f9a -Author: Martin Stransky <stransky@redhat.com> -Date: Fri Nov 14 06:32:00 2014 +0100 - - Bug 1097592 - Don't use PR_FindFunctionSymbolAndLibrary to avoid app freeze, r=karlt ---- - widget/gtk/mozgtk/mozgtk.c | 1 + - widget/gtk/nsWindow.cpp | 8 +------- - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git widget/gtk/mozgtk/mozgtk.c widget/gtk/mozgtk/mozgtk.c -index 11829d7..3b46759 100644 ---- widget/gtk/mozgtk/mozgtk.c -+++ widget/gtk/mozgtk/mozgtk.c -@@ -121,6 +121,7 @@ STUB(gdk_x11_lookup_xdisplay) - STUB(gdk_x11_screen_get_xscreen) - STUB(gdk_x11_visual_get_xvisual) - STUB(gdk_x11_window_lookup_for_display) -+STUB(gdk_x11_window_set_user_time) - STUB(gdk_x11_xatom_to_atom) - STUB(gtk_accel_label_new) - STUB(gtk_alignment_get_type) -diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp -index 26c333b..d462f13 100644 ---- widget/gtk/nsWindow.cpp -+++ widget/gtk/nsWindow.cpp -@@ -1295,13 +1295,7 @@ SetUserTimeAndStartupIDForActivatedWindow(GtkWidget* aWindow) - } - - if (sn_launchee_context_get_id_has_timestamp(ctx)) { -- PRLibrary* gtkLibrary; -- SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc) -- PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", >kLibrary); -- if (setUserTimeFunc) { -- setUserTimeFunc(gdkWindow, sn_launchee_context_get_timestamp(ctx)); -- PR_UnloadLibrary(gtkLibrary); -- } -+ gdk_x11_window_set_user_time(gdkWindow, sn_launchee_context_get_timestamp(ctx)); - } - - sn_launchee_context_setup_window(ctx, gdk_x11_window_get_xid(gdkWindow)); diff --git a/www/firefox/files/patch-bug1122547 b/www/firefox/files/patch-bug1122547 new file mode 100644 index 000000000000..ce65ec961912 --- /dev/null +++ b/www/firefox/files/patch-bug1122547 @@ -0,0 +1,20 @@ +diff --git media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc +index e68a104..a090241 100644 +--- media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc ++++ media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc +@@ -159,12 +159,13 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding( + // Assume that render timing errors are due to changes in the video stream. + if (next_render_time_ms < 0) { + timing_error = true; +- } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) { ++ } else if (std::abs(static_cast<int>(next_render_time_ms - now_ms)) > ++ max_video_delay_ms_) { + WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding, + VCMId(vcm_id_, receiver_id_), + "This frame is out of our delay bounds, resetting jitter " + "buffer: %d > %d", +- static_cast<int>(std::abs(next_render_time_ms - now_ms)), ++ std::abs(static_cast<int>(next_render_time_ms - now_ms)), + max_video_delay_ms_); + timing_error = true; + } else if (static_cast<int>(timing_->TargetVideoDelay()) > diff --git a/www/firefox/files/patch-bug1122586 b/www/firefox/files/patch-bug1122586 deleted file mode 100644 index 8cb71f14ff03..000000000000 --- a/www/firefox/files/patch-bug1122586 +++ /dev/null @@ -1,30 +0,0 @@ -diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp -index 36a6ccf..96d3bd0 100644 ---- content/media/MediaDecoderStateMachine.cpp -+++ content/media/MediaDecoderStateMachine.cpp -@@ -18,6 +18,7 @@ - #include "nsTArray.h" - #include "MediaDecoder.h" - #include "MediaDecoderReader.h" -+#include "mozilla/MathAlgorithms.h" - #include "mozilla/mozalloc.h" - #include "VideoUtils.h" - #include "mozilla/dom/TimeRanges.h" -@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS, - // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration - // less than this are ignored, as they're assumed to be the result of - // instability in the duration estimation. --static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2; -+static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2; - - static TimeDuration UsecsToDuration(int64_t aUsecs) { - return TimeDuration::FromMicroseconds(aUsecs); -@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration) - AssertCurrentThreadInMonitor(); - int64_t duration = GetDuration(); - if (aDuration != duration && -- std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) { -+ mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) { - SetDuration(aDuration); - nsCOMPtr<nsIRunnable> event = - NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged); diff --git a/www/firefox/files/patch-bug1128161 b/www/firefox/files/patch-bug1128161 new file mode 100644 index 000000000000..d61cbb3ceec0 --- /dev/null +++ b/www/firefox/files/patch-bug1128161 @@ -0,0 +1,28 @@ +commit 6af7f0e6 +Author: Chris Double <chris.double@double.co.nz> +Date: Tue Feb 3 11:20:17 2015 +1300 + + Bug 1128161 - Fix build error when logging is disabled - r=ajones +--- + dom/media/mediasource/MediaSourceUtils.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git dom/media/mediasource/MediaSourceUtils.cpp dom/media/mediasource/MediaSourceUtils.cpp +index 44a40f5..83bba60 100644 +--- dom/media/mediasource/MediaSourceUtils.cpp ++++ dom/media/mediasource/MediaSourceUtils.cpp +@@ -11,7 +11,6 @@ + + namespace mozilla { + +-#if defined(PR_LOGGING) + nsCString + DumpTimeRanges(dom::TimeRanges* aRanges) + { +@@ -31,6 +30,5 @@ DumpTimeRanges(dom::TimeRanges* aRanges) + + return dump; + } +-#endif + + } // namespace mozilla diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568 index 698ee2c498fc..2ffb2dbfb5e8 100644 --- a/www/firefox/files/patch-bug847568 +++ b/www/firefox/files/patch-bug847568 @@ -83,10 +83,10 @@ index ac38f40..87536b7 100644 dnl Check for pixman and cairo dnl ======================================================== -diff --git content/base/src/moz.build content/base/src/moz.build +diff --git dom/base/moz.build dom/base/moz.build index a660ba4..6b2f602 100644 ---- content/base/src/moz.build -+++ content/base/src/moz.build +--- dom/base/moz.build ++++ dom/base/moz.build @@ -196,6 +196,9 @@ SOURCES += [ 'nsObjectLoadingContent.cpp', ] @@ -237,6 +237,6 @@ index 67f0db9..d42137a 100644 +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + - if CONFIG['MOZ_ALSA']: - OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] + if CONFIG['MOZ_OSS']: + OS_LIBS += CONFIG['MOZ_OSS_LIBS'] diff --git a/www/firefox/files/patch-bug858919 b/www/firefox/files/patch-bug858919 deleted file mode 100644 index e1c38b9ec51e..000000000000 --- a/www/firefox/files/patch-bug858919 +++ /dev/null @@ -1,394 +0,0 @@ -commit a33d4f7 -Author: Martin Stransky <stransky@redhat.com> -Date: Fri Nov 14 04:04:00 2014 +0100 - - Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt ---- - toolkit/components/alerts/nsAlertsService.cpp | 10 +-- - toolkit/system/gnome/moz.build | 2 + - toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ - toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ - toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ - toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ - toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ - 7 files changed, 226 insertions(+), 25 deletions(-) - -diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp -index 93f4536..f8b5e07 100644 ---- toolkit/components/alerts/nsAlertsService.cpp -+++ toolkit/components/alerts/nsAlertsService.cpp -@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl - nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); - nsresult rv; - if (sysAlerts) { -- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -- aAlertCookie, aAlertListener, aAlertName, -- aBidi, aLang, aData, -- IPC::Principal(aPrincipal)); -+ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -+ aAlertCookie, aAlertListener, aAlertName, -+ aBidi, aLang, aData, -+ IPC::Principal(aPrincipal)); -+ if (NS_SUCCEEDED(rv)) -+ return NS_OK; - } - - if (!ShouldShowAlert()) { -diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build -index c033f8b..9242209 100644 ---- toolkit/system/gnome/moz.build -+++ toolkit/system/gnome/moz.build -@@ -5,7 +5,9 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - SOURCES += [ -+ 'nsAlertsIconListener.cpp', - 'nsGnomeModule.cpp', -+ 'nsSystemAlertsService.cpp', - ] - - if CONFIG['MOZ_ENABLE_GCONF']: -diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp -index f39335e..55f4356 100644 ---- toolkit/system/gnome/nsAlertsIconListener.cpp -+++ toolkit/system/gnome/nsAlertsIconListener.cpp -@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, - NS_RELEASE(alert); - } - -+static GdkPixbuf* -+GetPixbufFromImgRequest(imgIRequest* aRequest) -+{ -+ nsCOMPtr<imgIContainer> image; -+ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); -+ if (NS_FAILED(rv)) { -+ return nullptr; -+ } -+ -+ nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = -+ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); -+ -+ return imgToPixbuf->ConvertImageToPixbuf(image); -+} -+ - NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, - nsIObserver, nsISupportsWeakReference) - -@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe - nsresult - nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) - { -+ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); -+ - uint32_t imgStatus = imgIRequest::STATUS_ERROR; - nsresult rv = aRequest->GetImageStatus(&imgStatus); - NS_ENSURE_SUCCESS(rv, rv); - if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { - // We have an error getting the image. Display the notification with no icon. - ShowAlert(nullptr); -- } - -- if (mIconRequest) { -+ // Cancel any pending request - mIconRequest->Cancel(NS_BINDING_ABORTED); - mIconRequest = nullptr; - } -+ - return NS_OK; - } - - nsresult - nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) - { -- if (aRequest != mIconRequest) -- return NS_ERROR_FAILURE; -+ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); - - if (mLoadedFrame) - return NS_OK; // only use one frame - -- nsCOMPtr<imgIContainer> image; -- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); -- if (NS_FAILED(rv)) -- return rv; -- -- nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = -- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); -- -- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); -- if (!imagePixbuf) -- return NS_ERROR_FAILURE; -+ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); -+ if (!imagePixbuf) { -+ ShowAlert(nullptr); -+ } else { -+ ShowAlert(imagePixbuf); -+ g_object_unref(imagePixbuf); -+ } - -- ShowAlert(imagePixbuf); -+ mLoadedFrame = true; - -- g_object_unref(imagePixbuf); -+ // Cancel any pending request (multipart image loading/decoding for instance) -+ mIconRequest->Cancel(NS_BINDING_ABORTED); -+ mIconRequest = nullptr; - -- mLoadedFrame = true; - return NS_OK; - } - -@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) - mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); - gboolean result = notify_notification_show(mNotification, nullptr); - -+ if (result && mAlertListener) -+ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); -+ - return result ? NS_OK : NS_ERROR_FAILURE; - } - -@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) - if (!il) - return ShowAlert(nullptr); - -- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, -- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, -- nullptr, getter_AddRefs(mIconRequest)); -+ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, -+ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, -+ 0 /* use default */, getter_AddRefs(mIconRequest)); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ mIconRequest->StartDecoding(); -+ -+ return NS_OK; - } - - void -diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h -new file mode 100644 -index 0000000..ac96db9 ---- /dev/null -+++ toolkit/system/gnome/nsAlertsIconListener.h -@@ -0,0 +1,89 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsAlertsIconListener_h__ -+#define nsAlertsIconListener_h__ -+ -+#include "nsCOMPtr.h" -+#include "imgINotificationObserver.h" -+#include "nsStringAPI.h" -+#include "nsIObserver.h" -+#include "nsWeakReference.h" -+ -+#include <gdk-pixbuf/gdk-pixbuf.h> -+ -+class imgIRequest; -+ -+struct NotifyNotification; -+ -+class nsAlertsIconListener : public imgINotificationObserver, -+ public nsIObserver, -+ public nsSupportsWeakReference -+{ -+public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_IMGINOTIFICATIONOBSERVER -+ NS_DECL_NSIOBSERVER -+ -+ nsAlertsIconListener(); -+ -+ nsresult InitAlertAsync(const nsAString & aImageUrl, -+ const nsAString & aAlertTitle, -+ const nsAString & aAlertText, -+ bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener); -+ -+ void SendCallback(); -+ void SendClosed(); -+ -+protected: -+ virtual ~nsAlertsIconListener(); -+ -+ nsresult OnStopRequest(imgIRequest* aRequest); -+ nsresult OnStopFrame(imgIRequest* aRequest); -+ -+ /** -+ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols -+ * is that notify_notification_new takes three arguments in libnotify.so.4 and -+ * four in libnotify.so.1. -+ * Passing the fourth argument as NULL is binary compatible. -+ */ -+ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); -+ typedef bool (*notify_is_initted_t)(void); -+ typedef bool (*notify_init_t)(const char*); -+ typedef GList* (*notify_get_server_caps_t)(void); -+ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); -+ typedef bool (*notify_notification_show_t)(void*, char*); -+ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); -+ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); -+ -+ nsCOMPtr<imgIRequest> mIconRequest; -+ nsCString mAlertTitle; -+ nsCString mAlertText; -+ -+ nsCOMPtr<nsIObserver> mAlertListener; -+ nsString mAlertCookie; -+ -+ bool mLoadedFrame; -+ bool mAlertHasAction; -+ -+ static void* libNotifyHandle; -+ static bool libNotifyNotAvail; -+ static notify_is_initted_t notify_is_initted; -+ static notify_init_t notify_init; -+ static notify_get_server_caps_t notify_get_server_caps; -+ static notify_notification_new_t notify_notification_new; -+ static notify_notification_show_t notify_notification_show; -+ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; -+ static notify_notification_add_action_t notify_notification_add_action; -+ NotifyNotification* mNotification; -+ gulong mClosureHandler; -+ -+ nsresult StartRequest(const nsAString & aImageUrl); -+ nsresult ShowAlert(GdkPixbuf* aPixbuf); -+}; -+ -+#endif -diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp -index 5ccc8e5..f893893 100644 ---- toolkit/system/gnome/nsGnomeModule.cpp -+++ toolkit/system/gnome/nsGnomeModule.cpp -@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) - NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) - #endif -+#include "nsSystemAlertsService.h" -+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) - - #ifdef MOZ_ENABLE_GCONF - NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); -@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); - #endif -+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); - - static const mozilla::Module::CIDEntry kGnomeCIDs[] = { - #ifdef MOZ_ENABLE_GCONF -@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { - { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, - { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, - #endif -+ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, - { nullptr } - }; - -@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { - { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, - { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, - #endif -+ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, - { nullptr } - }; - -diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp -new file mode 100644 -index 0000000..b91b402 ---- /dev/null -+++ toolkit/system/gnome/nsSystemAlertsService.cpp -@@ -0,0 +1,54 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "nsXULAppAPI.h" -+#include "nsSystemAlertsService.h" -+#include "nsAlertsIconListener.h" -+#include "nsAutoPtr.h" -+ -+NS_IMPL_ADDREF(nsSystemAlertsService) -+NS_IMPL_RELEASE(nsSystemAlertsService) -+ -+NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) -+ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) -+ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) -+NS_INTERFACE_MAP_END_THREADSAFE -+ -+nsSystemAlertsService::nsSystemAlertsService() -+{ -+} -+ -+nsSystemAlertsService::~nsSystemAlertsService() -+{} -+ -+nsresult -+nsSystemAlertsService::Init() -+{ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, -+ const nsAString & aAlertText, bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener, -+ const nsAString & aAlertName, -+ const nsAString & aBidi, -+ const nsAString & aLang, -+ const nsAString & aData, -+ nsIPrincipal * aPrincipal) -+{ -+ nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener(); -+ if (!alertListener) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -+ aAlertCookie, aAlertListener); -+} -+ -+NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, -+ nsIPrincipal* aPrincipal) -+{ -+ return NS_ERROR_NOT_IMPLEMENTED; -+} -diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h -new file mode 100644 -index 0000000..b0bd625 ---- /dev/null -+++ toolkit/system/gnome/nsSystemAlertsService.h -@@ -0,0 +1,27 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsSystemAlertsService_h__ -+#define nsSystemAlertsService_h__ -+ -+#include "nsIAlertsService.h" -+#include "nsCOMPtr.h" -+ -+class nsSystemAlertsService : public nsIAlertsService -+{ -+public: -+ NS_DECL_NSIALERTSSERVICE -+ NS_DECL_ISUPPORTS -+ -+ nsSystemAlertsService(); -+ -+ nsresult Init(); -+ -+protected: -+ virtual ~nsSystemAlertsService(); -+ -+}; -+ -+#endif /* nsSystemAlertsService_h__ */ diff --git a/www/firefox/files/patch-bug991253 b/www/firefox/files/patch-bug991253 index 161feb2ca7b5..73d71610ab03 100644 --- a/www/firefox/files/patch-bug991253 +++ b/www/firefox/files/patch-bug991253 @@ -1,14 +1,16 @@ --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr<nsIFile> hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr<nsISimpleEnumerator> dictDirs; diff --git a/www/firefox/files/patch-ijg-libjpeg b/www/firefox/files/patch-ijg-libjpeg index 406bb1627d6e..6abfc6eeffd7 100644 --- a/www/firefox/files/patch-ijg-libjpeg +++ b/www/firefox/files/patch-ijg-libjpeg @@ -51,26 +51,26 @@ index 8fa8200..1d2a259 100644 static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); -@@ -324,6 +340,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) - case JCS_GRAYSCALE: - case JCS_RGB: - case JCS_YCbCr: +@@ -367,6 +382,7 @@ nsJPEGDecoder::WriteInternal(const char* + case JCS_GRAYSCALE: + case JCS_RGB: + case JCS_YCbCr: +#ifdef JCS_EXTENSIONS - // if we're not color managing we can decode directly to - // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB - if (mCMSMode != eCMSMode_All) { -@@ -332,6 +349,9 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) - } else { - mInfo.out_color_space = JCS_RGB; - } + // if we're not color managing we can decode directly to + // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB + if (mCMSMode != eCMSMode_All) { +@@ -375,6 +391,9 @@ nsJPEGDecoder::WriteInternal(const char* + } else { + mInfo.out_color_space = JCS_RGB; + } +#else -+ mInfo.out_color_space = JCS_RGB; ++ mInfo.out_color_space = JCS_RGB; +#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -399,6 +419,15 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) - return; /* I/O suspension */ + break; + case JCS_CMYK: + case JCS_YCCK: +@@ -433,6 +452,15 @@ nsJPEGDecoder::WriteInternal(const char* + return; // I/O suspension } +#ifndef JCS_EXTENSIONS @@ -83,10 +83,10 @@ index 8fa8200..1d2a259 100644 + } +#endif - /* If this is a progressive JPEG ... */ - mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; -@@ -544,7 +573,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend) - uint32_t *imageRow = ((uint32_t*)mImageData) + + // If this is a progressive JPEG ... + mState = mInfo.buffered_image ? +@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus + uint32_t* imageRow = ((uint32_t*)mImageData) + (mInfo.output_scanline * mInfo.output_width); +#ifdef JCS_EXTENSIONS @@ -94,10 +94,10 @@ index 8fa8200..1d2a259 100644 +#else + if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { +#endif - /* Special case: scanline will be directly converted into packed ARGB */ + // Special case: scanline will be directly converted into packed ARGB if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { - *suspend = true; /* suspend */ -@@ -854,6 +887,282 @@ term_source (j_decompress_ptr jd) + *suspend = true; // suspend +@@ -920,6 +952,282 @@ term_source (j_decompress_ptr jd) } // namespace mozilla @@ -377,6 +377,6 @@ index 8fa8200..1d2a259 100644 +#endif + + - /**************** Inverted CMYK -> RGB conversion **************/ - /* - * Input is (Inverted) CMYK stored as 4 bytes per pixel. + ///*************** Inverted CMYK -> RGB conversion ************************* + /// Input is (Inverted) CMYK stored as 4 bytes per pixel. + /// Output is RGB stored as 3 bytes per pixel. diff --git a/www/firefox/files/patch-system-openh264 b/www/firefox/files/patch-system-openh264 index 3bbabcebf9f8..5215ddb43475 100644 --- a/www/firefox/files/patch-system-openh264 +++ b/www/firefox/files/patch-system-openh264 @@ -1,9 +1,9 @@ # Revert bug 1045209 to allow using absolute path -diff --git content/media/gmp/GMPChild.cpp content/media/gmp/GMPChild.cpp +diff --git dom/media/gmp/GMPChild.cpp dom/media/gmp/GMPChild.cpp index 1dde3ac..12c88cf 100644 ---- content/media/gmp/GMPChild.cpp -+++ content/media/gmp/GMPChild.cpp +--- dom/media/gmp/GMPChild.cpp ++++ 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 ---- content/media/gmp/GMPParent.cpp -+++ content/media/gmp/GMPParent.cpp +--- dom/media/gmp/GMPParent.cpp ++++ dom/media/gmp/GMPParent.cpp @@ -90,23 +90,16 @@ mService = aService; mDirectory = aPluginDir; diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422 index 3ec38afb5a23..13432e8deb4f 100644 --- a/www/firefox/files/patch-z-bug517422 +++ b/www/firefox/files/patch-z-bug517422 @@ -268,10 +268,10 @@ index 87db361..7947626 100644 dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, -diff --git content/media/AudioStream.h content/media/AudioStream.h +diff --git dom/media/AudioStream.h dom/media/AudioStream.h index 085676d..00c54fb 100644 ---- content/media/AudioStream.h -+++ content/media/AudioStream.h +--- dom/media/AudioStream.h ++++ 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 ---- content/media/moz.build -+++ content/media/moz.build +--- dom/media/moz.build ++++ dom/media/moz.build @@ -212,3 +212,24 @@ if CONFIG['ANDROID_VERSION'] > '15': CFLAGS += CONFIG['GSTREAMER_CFLAGS'] @@ -382,9 +382,9 @@ diff --git media/libtheora/moz.build media/libtheora/moz.build index 14265b1..3069e99 100644 --- media/libtheora/moz.build +++ 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'] diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 3a335b5226e4..247d05d2fbfc 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libxul -DISTVERSION= 31.4.0 -PORTREVISION= 1 +DISTVERSION= 31.5.3 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source DISTNAME= firefox-${DISTVERSION}esr.source diff --git a/www/libxul/distinfo b/www/libxul/distinfo index 7fd1418d0164..93d4df0f5368 100644 --- a/www/libxul/distinfo +++ b/www/libxul/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-31.4.0esr.source.tar.bz2) = c5ad8b588fb1e7690be5da04f627335f6440277dac4bccd46e6687fcf2fbc23b -SIZE (firefox-31.4.0esr.source.tar.bz2) = 147935703 +SHA256 (firefox-31.5.3esr.source.tar.bz2) = 4f0e89362767b1a2e3947abcb5d3edea199d126ce6ce900daec89492bf1ce302 +SIZE (firefox-31.5.3esr.source.tar.bz2) = 147757682 diff --git a/www/libxul/files/patch-bug1021761 b/www/libxul/files/patch-bug1021761 index bd0a689f12c7..1d0cde369c34 100644 --- a/www/libxul/files/patch-bug1021761 +++ b/www/libxul/files/patch-bug1021761 @@ -2,7 +2,7 @@ diff --git configure.in configure.in index 48e60c0..ec08417 100644 --- configure.in +++ 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 --- media/libcubeb/AUTHORS @@ -651,7 +634,7 @@ new file mode 100644 index 0000000..5e38e27 --- /dev/null +++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,399 @@ +@@ -0,0 +1,397 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -660,8 +643,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 @@ -1075,18 +1056,36 @@ 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/Makefile.in media/webrtc/signaling/test/Makefile.in +index 991f03f..3d99eb5 100644 +--- media/webrtc/signaling/test/Makefile.in ++++ media/webrtc/signaling/test/Makefile.in +@@ -26,9 +26,9 @@ ifdef JS_SHARED_LIBRARY + LIBS += $(MOZ_JS_LIBS) + endif + +-ifdef MOZ_ALSA ++ifdef MOZ_OSS + LIBS += \ +- $(MOZ_ALSA_LIBS) \ ++ $(MOZ_OSS_LIBS) \ + $(NULL) + endif + diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk index e191f13..4fb268a 100644 --- toolkit/library/libxul.mk +++ toolkit/library/libxul.mk -@@ -146,6 +146,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32 +@@ -146,9 +146,9 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32 endif endif +-ifdef MOZ_ALSA +-EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) +-endif +ifdef MOZ_OSS +EXTRA_DSO_LDOPTS += $(MOZ_OSS_LIBS) +endif -+ - ifdef MOZ_ALSA - EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) - endif + + ifdef HAVE_CLOCK_MONOTONIC + EXTRA_DSO_LDOPTS += $(REALTIME_LIBS) diff --git a/www/libxul/files/patch-bug1083461 b/www/libxul/files/patch-bug1083461 deleted file mode 100644 index 66989e0e7cf6..000000000000 --- a/www/libxul/files/patch-bug1083461 +++ /dev/null @@ -1,156 +0,0 @@ -commit c97894b -Author: L. David Baron <dbaron@dbaron.org> -Date: Sun Oct 19 23:31:39 2014 -0400 - - Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky approval-mozilla-esr31=bkerensa ---- - layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ - layout/style/nsCSSValue.h | 22 ++++++++++++++++------ - layout/style/nsStyleAnimation.cpp | 6 ++++-- - 3 files changed, 36 insertions(+), 20 deletions(-) - -diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp -index 781ef65..4bbc979 100644 ---- layout/style/nsCSSValue.cpp -+++ layout/style/nsCSSValue.cpp -@@ -253,13 +253,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const - return *mValue.mRect == *aOther.mValue.mRect; - } - else if (eCSSUnit_List == mUnit) { -- return *mValue.mList == *aOther.mValue.mList; -+ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); - } - else if (eCSSUnit_SharedList == mUnit) { - return *mValue.mSharedList == *aOther.mValue.mSharedList; - } - else if (eCSSUnit_PairList == mUnit) { -- return *mValue.mPairList == *aOther.mValue.mPairList; -+ return nsCSSValuePairList::Equal(mValue.mPairList, -+ aOther.mValue.mPairList); - } - else if (eCSSUnit_GridTemplateAreas == mUnit) { - return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; -@@ -1740,13 +1741,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, - } - } - --bool --nsCSSValueList::operator==(const nsCSSValueList& aOther) const -+/* static */ bool -+nsCSSValueList::Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValueList *p1 = this, *p2 = &aOther; -+ const nsCSSValueList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mValue != p2->mValue) - return false; -@@ -1799,8 +1802,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult - bool - nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const - { -- return !mHead == !aOther.mHead && -- (!mHead || *mHead == *aOther.mHead); -+ return nsCSSValueList::Equal(mHead, aOther.mHead); - } - - size_t -@@ -2010,13 +2012,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, - } - } - --bool --nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const -+/* static */ bool -+nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValuePairList *p1 = this, *p2 = &aOther; -+ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mXValue != p2->mXValue || - p1->mYValue != p2->mYValue) -diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h -index 753938c..77eeef0 100644 ---- layout/style/nsCSSValue.h -+++ layout/style/nsCSSValue.h -@@ -806,9 +806,8 @@ struct nsCSSValueList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(nsCSSValueList const& aOther) const; -- bool operator!=(const nsCSSValueList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -821,6 +820,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValueList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; - }; - - // nsCSSValueList_heap differs from nsCSSValueList only in being -@@ -1199,9 +1204,8 @@ struct nsCSSValuePairList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(const nsCSSValuePairList& aOther) const; -- bool operator!=(const nsCSSValuePairList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -1215,6 +1219,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValuePairList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; - }; - - // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being -diff --git layout/style/nsStyleAnimation.cpp layout/style/nsStyleAnimation.cpp -index 6c2ccb0..8dbe404 100644 ---- layout/style/nsStyleAnimation.cpp -+++ layout/style/nsStyleAnimation.cpp -@@ -3816,11 +3816,13 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const - case eUnit_Filter: - case eUnit_Shadow: - case eUnit_BackgroundPosition: -- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; -+ return nsCSSValueList::Equal(mValue.mCSSValueList, -+ aOther.mValue.mCSSValueList); - case eUnit_Transform: - return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; - case eUnit_CSSValuePairList: -- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; -+ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, -+ aOther.mValue.mCSSValuePairList); - case eUnit_UnparsedString: - return (NS_strcmp(GetStringBufferValue(), - aOther.GetStringBufferValue()) == 0); diff --git a/www/libxul/files/patch-bug991253 b/www/libxul/files/patch-bug991253 index 161feb2ca7b5..73d71610ab03 100644 --- a/www/libxul/files/patch-bug991253 +++ b/www/libxul/files/patch-bug991253 @@ -1,14 +1,16 @@ --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr<nsIFile> hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr<nsISimpleEnumerator> dictDirs; diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile index 207b8b2dab01..fb942159e83d 100644 --- a/www/linux-firefox/Makefile +++ b/www/linux-firefox/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 35.0 +DISTVERSION= 36.0.4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo index 82691a0a471e..563cfb38c04d 100644 --- a/www/linux-firefox/distinfo +++ b/www/linux-firefox/distinfo @@ -1,5 +1,5 @@ -SHA256 (firefox-35.0.tar.bz2) = 1ff41809f88f068fc46770ca518851a5188ae936e4a6d0d11c9b8bdc740298a7 -SIZE (firefox-35.0.tar.bz2) = 47069126 +SHA256 (firefox-36.0.4.tar.bz2) = 15665cca9e862042585b49c69c62fabf9b65edc6cbbb67cc11b4cf387458a0fc +SIZE (firefox-36.0.4.tar.bz2) = 47843171 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist index 389c32620c5f..4db6d8502b1e 100644 --- a/www/linux-firefox/pkg-plist +++ b/www/linux-firefox/pkg-plist @@ -36,6 +36,8 @@ lib/%%APP_NAME%%/dictionaries/en-US.aff lib/%%APP_NAME%%/dictionaries/en-US.dic lib/%%APP_NAME%%/firefox lib/%%APP_NAME%%/firefox-bin +lib/%%APP_NAME%%/gmp-clearkey/0.1/clearkey.info +lib/%%APP_NAME%%/gmp-clearkey/0.1/libclearkey.so lib/%%APP_NAME%%/icons/updater.png lib/%%APP_NAME%%/libfreebl3.chk lib/%%APP_NAME%%/libfreebl3.so @@ -44,7 +46,6 @@ lib/%%APP_NAME%%/libfreebl3.so %%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0 %%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0 lib/%%APP_NAME%%/libmozalloc.so -lib/%%APP_NAME%%/libmozsandbox.so lib/%%APP_NAME%%/libmozsqlite3.so lib/%%APP_NAME%%/libnspr4.so lib/%%APP_NAME%%/libnss3.so @@ -59,7 +60,6 @@ lib/%%APP_NAME%%/libsoftokn3.chk lib/%%APP_NAME%%/libsoftokn3.so lib/%%APP_NAME%%/libssl3.so lib/%%APP_NAME%%/libxul.so -lib/%%APP_NAME%%/mozilla-xremote-client lib/%%APP_NAME%%/omni.ja lib/%%APP_NAME%%/platform.ini lib/%%APP_NAME%%/plugin-container diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile index 2a1be77acf1d..f978c7358eb3 100644 --- a/www/linux-seamonkey/Makefile +++ b/www/linux-seamonkey/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.32 +DISTVERSION= 2.33.1 CATEGORIES= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo index 313005a159be..4125bd2f3947 100644 --- a/www/linux-seamonkey/distinfo +++ b/www/linux-seamonkey/distinfo @@ -1,5 +1,5 @@ -SHA256 (seamonkey-2.32.tar.bz2) = 571829702f8dc5f869181ec31911797471e63ebac5b0b2bfb9f5ae1986478f47 -SIZE (seamonkey-2.32.tar.bz2) = 40849036 +SHA256 (seamonkey-2.33.1.tar.bz2) = f52b597a938f2980fc438a96ac38b9d23cb403a7319bb5d60d862f96efc54926 +SIZE (seamonkey-2.33.1.tar.bz2) = 41382431 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist index 859175fcb16f..e2f951aaa555 100644 --- a/www/linux-seamonkey/pkg-plist +++ b/www/linux-seamonkey/pkg-plist @@ -88,7 +88,6 @@ lib/%%APP_NAME%%/libfreebl3.so lib/%%APP_NAME%%/libldap60.so lib/%%APP_NAME%%/libldif60.so lib/%%APP_NAME%%/libmozalloc.so -lib/%%APP_NAME%%/libmozsandbox.so lib/%%APP_NAME%%/libmozsqlite3.so lib/%%APP_NAME%%/libnspr4.so lib/%%APP_NAME%%/libnss3.so @@ -105,7 +104,6 @@ lib/%%APP_NAME%%/libsoftokn3.so lib/%%APP_NAME%%/libssl3.so lib/%%APP_NAME%%/libxul.so lib/%%APP_NAME%%/license.txt -lib/%%APP_NAME%%/mozilla-xremote-client lib/%%APP_NAME%%/omni.ja lib/%%APP_NAME%%/platform.ini lib/%%APP_NAME%%/plugin-container @@ -115,7 +113,6 @@ lib/%%APP_NAME%%/removed-files lib/%%APP_NAME%%/run-mozilla.sh lib/%%APP_NAME%%/seamonkey lib/%%APP_NAME%%/seamonkey-bin -lib/%%APP_NAME%%/searchplugins/creativecommons.xml lib/%%APP_NAME%%/searchplugins/google.xml lib/%%APP_NAME%%/searchplugins/wikipedia.xml lib/%%APP_NAME%%/searchplugins/yahoo.xml diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile index 93b10f52b08c..40f9587f7af5 100644 --- a/www/seamonkey-i18n/Makefile +++ b/www/seamonkey-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey-i18n -PORTVERSION= 2.32 +PORTVERSION= 2.33.1 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack PKGNAMEPREFIX= diff --git a/www/seamonkey-i18n/distinfo b/www/seamonkey-i18n/distinfo index fd393028db46..5fa603f4dc20 100644 --- a/www/seamonkey-i18n/distinfo +++ b/www/seamonkey-i18n/distinfo @@ -1,54 +1,54 @@ -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.be.langpack.xpi) = fec9ed55542d53940cc8c73c37519acbcbe5451106e495b661e85eda27b040c8 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.be.langpack.xpi) = 841560 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ca.langpack.xpi) = d2f1e695ce860c976fc8239f2315aee37e2a8c3fa482dbd2ec9b3f16dd6daff4 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ca.langpack.xpi) = 832917 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.cs.langpack.xpi) = 19616f12c39cc398b8e27197a81be822b08ee2bad104ec705d2877fa175831f8 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.cs.langpack.xpi) = 830451 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.de.langpack.xpi) = 6588e65232922c57a7cdd53cab38a3d8cd8f26fa6105ae564a3ae231be2d67b8 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.de.langpack.xpi) = 838041 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-GB.langpack.xpi) = f74ef701cb701527d4852591450864bd97ccd6f3b4b6392fedb474c260ab6a84 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-GB.langpack.xpi) = 804019 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-US.langpack.xpi) = 73cdd17bc37fc4346b594ee35f5adcc0e3fcc870a66662e9a67faafa372a40f6 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.en-US.langpack.xpi) = 803478 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-AR.langpack.xpi) = 2d40bc0f2f6e9a31618c149b7a1c9a69cbb92f5e79e1e90d063a94e9390d1326 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-AR.langpack.xpi) = 852545 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-ES.langpack.xpi) = 2d1e94907a26ffef9b0df13c6d79ef238f5f3da271add0e1503174a1bccc70f1 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.es-ES.langpack.xpi) = 829553 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fi.langpack.xpi) = 84c3d99167bb99f9dca4eb2c7f9f6c96c5610b0e4cf69a43a5bfa720f4ac4f7f -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fi.langpack.xpi) = 799881 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fr.langpack.xpi) = faa3938631be0862bfc2f851caf7f065a255bb931d4d6bddea0af656c1ac472c -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.fr.langpack.xpi) = 810711 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.gl.langpack.xpi) = 2ddb7809dfbde64044c1b46b20ef9e86e82f13a9c1da18d8cd8b5c9cdc32038d -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.gl.langpack.xpi) = 814445 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.hu.langpack.xpi) = 7c87922eac25dd9cc8bfcc1f61e458c27197816be50d28948f759e5d5fdfae7e -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.hu.langpack.xpi) = 844069 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.it.langpack.xpi) = 1925e77234e5a4423d66b0e988a5ef9aeb067d8193e34a31273741570cb77540 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.it.langpack.xpi) = 742070 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja-JP-mac.langpack.xpi) = d999898fc267310b68c419e56c7fc520791f2a03e596b5b150ea45e28b215ec6 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja-JP-mac.langpack.xpi) = 900391 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja.langpack.xpi) = e44009f8ec92c476f0c04ea6862629db8884f8f143f707ae47418ac9ecbad6dd -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ja.langpack.xpi) = 884921 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.lt.langpack.xpi) = f2b7a50cb4a8e02e2cdd4badcf5566ca520f95450a0d84d267297e6ca57b7a22 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.lt.langpack.xpi) = 852677 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nb-NO.langpack.xpi) = 0666795e29873639bf1cd127b22491a4c87d3d38894de5d5734a68e5a83356ea -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nb-NO.langpack.xpi) = 822959 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nl.langpack.xpi) = f7a93a63084268f9a593859d72fd207d33e01c87f2f0983ab4c536b529183b74 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.nl.langpack.xpi) = 796641 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pl.langpack.xpi) = f6b5ac5a752ba2e3d2b5145f5f05d2d486ccc3fc1c56898ef143b0009a60d3c6 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pl.langpack.xpi) = 868114 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pt-PT.langpack.xpi) = 5bcdb4fa75d548301d7d16ecff4d97c7348f53c98cea6920a9154b3fa5c85611 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.pt-PT.langpack.xpi) = 833784 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ru.langpack.xpi) = 039e3c3ba62b2157c7a3da45a6fa1ebbb5276524dbb059f6352cb5d7f0d74368 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.ru.langpack.xpi) = 899661 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sk.langpack.xpi) = cb5111034a7561dc7a5928032920cdffe0e7a828c2e3188f37baebfd9619d496 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sk.langpack.xpi) = 857464 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sv-SE.langpack.xpi) = b8d3c4b1d11d21b11a2fde81fa265a1cfc228678f2021f306329f90c8bfd1af1 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.sv-SE.langpack.xpi) = 825104 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.tr.langpack.xpi) = 88075220e2f653ca2b318e54d80a2d4f56b3cea041d861892822e63b63c493b8 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.tr.langpack.xpi) = 811614 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.uk.langpack.xpi) = 85772ee30485bd069ff97827d487ba974906369598ef80793ca41c0d59183c46 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.uk.langpack.xpi) = 873317 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-CN.langpack.xpi) = 6948c68c87c41587786f92f728cb0ac9568066f2e4e5e8cd858a09f8aa5c5d31 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-CN.langpack.xpi) = 834251 -SHA256 (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-TW.langpack.xpi) = 58e96499f4a412741b04ecd3026ebbd2cb50be14ec69d17b6e5373f6b2915b71 -SIZE (xpi/seamonkey-i18n-2.32/seamonkey-2.32.zh-TW.langpack.xpi) = 860363 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.be.langpack.xpi) = bd6ccc1b70c8fe41d43b5f0f05137454f425e572a631ac9641bd7549375ede34 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.be.langpack.xpi) = 842837 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ca.langpack.xpi) = f46880e8582a63d6af332c76d988fabb5077fba92affc1881ab8e3d24bf6b331 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ca.langpack.xpi) = 834200 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.cs.langpack.xpi) = 38c09955551adc43dc2e6dec6aafd199b4a6fe7886a761eaafaa70938e8c3cff +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.cs.langpack.xpi) = 831811 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.de.langpack.xpi) = 36b12d7681556ed9501ba74e0b8e0564c41d87695f8b7b8960dde0b099f83500 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.de.langpack.xpi) = 838262 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.en-GB.langpack.xpi) = 5521941e84ba5979abf4864e5eefbdd331580e6e76f5ae46d4c43cf0a67170da +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.en-GB.langpack.xpi) = 804289 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.en-US.langpack.xpi) = f75c5e469d6680c45bb5b863aa11bc5ed87aa32f7ea25c6129109e8c07eef3f7 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.en-US.langpack.xpi) = 803780 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.es-AR.langpack.xpi) = 40270d0af40557516049df8922f83dc4050dee0ad22599896fee226236115906 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.es-AR.langpack.xpi) = 852874 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.es-ES.langpack.xpi) = 75b754919326c4ee9c114abadb02a387f91b7b65821b081eb820aaf50050621e +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.es-ES.langpack.xpi) = 830037 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.fi.langpack.xpi) = 42f3a3001dcbd9f6ff8f77ef5094363231282b1e05959ed07469adce9e841efc +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.fi.langpack.xpi) = 801209 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.fr.langpack.xpi) = 864455ed8186096d90daaf35368d22825e4c3f2bcc3829efe60c4345b532718b +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.fr.langpack.xpi) = 812075 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.gl.langpack.xpi) = 74eac6af6cce412bd9a320696e78fd22e6e4a285b0873e21bc861df837a27d6a +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.gl.langpack.xpi) = 815203 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.hu.langpack.xpi) = 3451b3b0604842a23dab9aadb91ed51bbf60431bc5b456d337dbb5c22aba1c93 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.hu.langpack.xpi) = 844136 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.it.langpack.xpi) = e6975df4e7680199d133df63875e5eb8aa5b7ff4dcfa0ddadf4867e8b4f3b68d +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.it.langpack.xpi) = 742287 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ja-JP-mac.langpack.xpi) = 7b66f5eadc13b1f3758d82b0382b2e6693f6dbd5926c3916df62760dfd2c2f34 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ja-JP-mac.langpack.xpi) = 901811 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ja.langpack.xpi) = e14120fbdece134b8716b47c28d7e7c823b3424cc238bd65980d91cc00ee9695 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ja.langpack.xpi) = 886326 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.lt.langpack.xpi) = 19f699e40637e9f4dd06561bcc99cc8adc54c2e5b4c9d19cdce05eefbfcb2e55 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.lt.langpack.xpi) = 853980 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.nb-NO.langpack.xpi) = adafdef75d19013e0ae6aaf60986680a56cbb0f69b5c4332bd7202becb343699 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.nb-NO.langpack.xpi) = 824264 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.nl.langpack.xpi) = 44cb967d184ac079ce8ece66a8875f7f338f464f7c10189c7241512dc766492e +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.nl.langpack.xpi) = 796770 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.pl.langpack.xpi) = 48a0ee96e322f8c5da269744dc8a0fdde4395cc801a01d6aa2279696e81011a5 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.pl.langpack.xpi) = 867982 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.pt-PT.langpack.xpi) = 6b109aaa7fb7402fbb383a0479a7010430d227df18c57010f78b3c80cd437f99 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.pt-PT.langpack.xpi) = 834974 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ru.langpack.xpi) = 3f7fa18e6da04e75b4e9a161e65aa45c16495bf78234eb1168573f3e0715ff9c +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.ru.langpack.xpi) = 899955 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.sk.langpack.xpi) = c80460e380b74047149fe8885a4befc4efb762eb28c98a2df6d61d06fbd709f4 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.sk.langpack.xpi) = 857564 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.sv-SE.langpack.xpi) = f42d0dc239e124488b57b0b96b1f9cc3cae2118525d5d2bf5e2ac699211c00fb +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.sv-SE.langpack.xpi) = 826424 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.tr.langpack.xpi) = db1d8392f2d8c298d8b8a9a0da835cfcf14679a52dd96a8fad2c8dc7b29ea5dd +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.tr.langpack.xpi) = 812398 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.uk.langpack.xpi) = 5f40259490b909023b318fa633fb8f549071c0bb23f2a1f3037c21c6792570da +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.uk.langpack.xpi) = 874106 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.zh-CN.langpack.xpi) = 1e07dbcfc5739a5e76b13b07327ce81a753e7bfe503a3abd9d5f656d12f918aa +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.zh-CN.langpack.xpi) = 834422 +SHA256 (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.zh-TW.langpack.xpi) = b0c382d9fc410b7a2c4219511c461ca0cd9df14f5a8ac799cfa46d236af5d636 +SIZE (xpi/seamonkey-i18n-2.33.1/seamonkey-2.33.1.zh-TW.langpack.xpi) = 860687 diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index b9c99bc48aa1..ac2891012b8c 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= seamonkey -DISTVERSION= 2.32 -PORTREVISION= 1 +DISTVERSION= 2.33.1 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ @@ -14,7 +13,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ - nss>=3.17.2:${PORTSDIR}/security/nss \ + nss>=3.17.4:${PORTSDIR}/security/nss \ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ @@ -23,7 +22,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ libvorbis>=1.3.4:${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 \ @@ -32,8 +31,8 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l -EM_VERSION= 1.7.2 -L_VERSION= 3.7 +EM_VERSION= 1.8 +L_VERSION= 3.8 SSP_UNSAFE= yes USE_GECKO= gecko diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 5a81f70fec81..230b901c156c 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.32.source.tar.bz2) = e174dc5093e49078c33f91b4e8658327957d59bd53ac59e304441d8d5f17ba9b -SIZE (seamonkey-2.32.source.tar.bz2) = 199700383 -SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6 -SIZE (enigmail-1.7.2.tar.gz) = 1420346 +SHA256 (seamonkey-2.33.1.source.tar.bz2) = b29779cfd4b334ed21a8265ec13327aa7f35ef2895c38a971e41f3e63c85af08 +SIZE (seamonkey-2.33.1.source.tar.bz2) = 203015246 +SHA256 (enigmail-1.8.tar.gz) = 9dca4e9d6fc3f79f51a4ed73918bd69b71668168144895f3a4f5bdaaec0e5f15 +SIZE (enigmail-1.8.tar.gz) = 1588239 diff --git a/www/seamonkey/files/patch-bug1021761 b/www/seamonkey/files/patch-bug1021761 index 7305ac77fee7..15c899907dd9 100644 --- a/www/seamonkey/files/patch-bug1021761 +++ b/www/seamonkey/files/patch-bug1021761 @@ -2,7 +2,7 @@ diff --git configure.in configure.in index 48e60c0..ec08417 100644 --- mozilla/configure.in +++ mozilla/configure.in -@@ -5438,6 +5438,60 @@ fi +@@ -5591,6 +5591,67 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -16,33 +16,40 @@ index 48e60c0..ec08417 100644 + ;; +esac + -+MOZ_ARG_DISABLE_BOOL(oss, -+[ --disable-oss Disable OpenSoundSystem support], -+ MOZ_OSS=, -+ MOZ_OSS=1) ++MOZ_ARG_WITH_STRING(oss, ++[ --with-oss[=PFX] Enable OpenSoundSystem support [installed at prefix PFX]], ++ OSSPREFIX=$withval) ++ ++if test -n "$OSSPREFIX"; then ++ if test "$OSSPREFIX" != "no"; then ++ MOZ_OSS=1 ++ else ++ MOZ_OSS= ++ fi ++fi + +_SAVE_CFLAGS=$CFLAGS +_SAVE_LIBS=$LIBS +if test -n "$MOZ_OSS"; then + dnl Prefer 4Front implementation + AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) -+ if test -z "$MOZ_OSS_CFLAGS"; then -+ for oss_conf in /etc/oss.conf /usr/local/etc/oss.conf; do -+ if test -e "$oss_conf"; then -+ . "$oss_conf" -+ fi -+ done ++ if test "$OSSPREFIX" != "yes"; then ++ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf ++ if test -f "$oss_conf"; then ++ . "$oss_conf" ++ else ++ OSSLIBDIR=$OSSPREFIX/lib/oss ++ fi + if test -d "$OSSLIBDIR"; then -+ MOZ_OSS_CFLAGS="-I$OSSLIBDIR/include" ++ MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include" + fi + fi + AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) + + CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" -+ MOZ_CHECK_HEADERS(sys/soundcard.h linux/soundcard.h soundcard.h) ++ MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h) + + if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ -+ "$ac_cv_header_linux_soundcard_h" != "yes" -a \ + "$ac_cv_header_soundcard_h" != "yes"; then + AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --disable-ogg --disable-wave --disable-webm.]) + fi @@ -50,7 +57,7 @@ index 48e60c0..ec08417 100644 + dnl Assume NetBSD implementation over SunAudio + AC_CHECK_LIB(ossaudio, _oss_ioctl, + [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") -+ MOZ_OSS_LIBS="-lossaudio"]) ++ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"]) +fi +CFLAGS=$_SAVE_CFLAGS +LIBS=$_SAVE_LIBS @@ -63,30 +70,6 @@ index 48e60c0..ec08417 100644 dnl = Check alsa availability on Linux dnl ================================== -@@ -5451,12 +5505,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, - MOZ_ALSA=1, - MOZ_ALSA=) - -+MOZ_ARG_DISABLE_BOOL(alsa-dlopen, -+[ --disable-alsa-dlopen Disable runtime linking of libasound.so], -+ DISABLE_LIBASOUND_DLOPEN=1, -+ DISABLE_LIBASOUND_DLOPEN=) -+ - if test -n "$MOZ_ALSA"; then - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , - [echo "$MOZ_ALSA_PKG_ERRORS" - AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) - fi - -+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then -+ AC_DEFINE(DISABLE_LIBASOUND_DLOPEN) -+else -+ MOZ_ALSA_LIBS= -+fi -+ - AC_SUBST(MOZ_ALSA) - - dnl ======================================================== diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS index b441e8a..950d9e5 100644 --- mozilla/media/libcubeb/AUTHORS @@ -660,7 +643,7 @@ new file mode 100644 index 0000000..5e38e27 --- /dev/null +++ mozilla/media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,404 @@ +@@ -0,0 +1,402 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -669,8 +652,6 @@ index 0000000..5e38e27 + */ +#if defined(HAVE_SYS_SOUNDCARD_H) +#include <sys/soundcard.h> -+#elif defined(HAVE_LINUX_SOUNDCARD_H) -+#include <linux/soundcard.h> +#else +#include <soundcard.h> +#endif @@ -1089,17 +1070,33 @@ index 8b7a0dd..31212ce 100644 +CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] +diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build +index 991f03f..3d99eb5 100644 +--- mozilla/media/webrtc/signaling/test/moz.build ++++ mozilla/media/webrtc/signaling/test/moz.build +@@ -112,8 +112,8 @@ if CONFIG['JS_SHARED_LIBRARY']: + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] + OS_LIBS += CONFIG['REALTIME_LIBS'] + +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] ++if CONFIG['MOZ_OSS']: ++ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] + + if CONFIG['MOZ_NATIVE_JPEG']: + OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] diff --git toolkit/library/moz.build toolkit/library/moz.build index e191f13..4fb268a 100644 --- mozilla/toolkit/library/moz.build +++ mozilla/toolkit/library/moz.build -@@ -239,6 +239,9 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: +@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] +if CONFIG['MOZ_OSS']: + OS_LIBS += CONFIG['MOZ_OSS_LIBS'] -+ - if CONFIG['MOZ_ALSA']: - OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] + if CONFIG['HAVE_CLOCK_MONOTONIC']: + OS_LIBS += CONFIG['REALTIME_LIBS'] diff --git a/www/seamonkey/files/patch-bug1041795 b/www/seamonkey/files/patch-bug1041795 deleted file mode 100644 index 5164776bdde7..000000000000 --- a/www/seamonkey/files/patch-bug1041795 +++ /dev/null @@ -1,48 +0,0 @@ -diff --git config/rules.mk config/rules.mk -index 4d67eda..783942f 100644 ---- mozilla/config/rules.mk -+++ mozilla/config/rules.mk -@@ -858,7 +858,7 @@ ifdef DTRACE_PROBE_OBJ - ifndef DTRACE_LIB_DEPENDENT - NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS)) - $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS) -- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS) -+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS) - endif - endif - endif -@@ -876,7 +876,7 @@ ifndef INCREMENTAL_LINKER - endif - ifdef DTRACE_LIB_DEPENDENT - ifndef XP_MACOSX -- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) -+ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) - endif - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS)) - @$(RM) $(DTRACE_PROBE_OBJ) -diff --git js/src/Makefile.in js/src/Makefile.in -index 28ca5e8..96793d7 100644 ---- mozilla/js/src/Makefile.in -+++ mozilla/js/src/Makefile.in -@@ -342,7 +342,7 @@ endif - - ifdef HAVE_DTRACE - $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d -- dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in -+ dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in - sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \ - -e '/const/!s/char \*/const char */g' \ - javascript-trace.h.in > javascript-trace.h -diff --git probes/Makefile.in probes/Makefile.in -index 6d18f34..deec83f 100644 ---- mozilla/probes/Makefile.in -+++ mozilla/probes/Makefile.in -@@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h - - # Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE - $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile -- dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp -+ dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp - sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \ - mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h - rm mozilla-trace.h.tmp diff --git a/www/seamonkey/files/patch-bug1061736 b/www/seamonkey/files/patch-bug1061736 deleted file mode 100644 index 4d8925a04f6a..000000000000 --- a/www/seamonkey/files/patch-bug1061736 +++ /dev/null @@ -1,50 +0,0 @@ -commit a7add79 -Author: Gavin Sharp <gavin@gavinsharp.com> -Date: Mon Oct 27 18:43:51 2014 -0700 - - Bug 1061736: add DuckDuckGo as a search engine option in Firefox. r=dolske ---- - browser/locales/Makefile.in | 2 +- - browser/locales/en-US/searchplugins/ddg.xml | 21 +++++++++++++++++++++ - 2 files changed, 22 insertions(+), 1 deletion(-) - -diff --git browser/locales/Makefile.in browser/locales/Makefile.in -index eb3c30b..b172876 100644 ---- suite/locales/Makefile.in -+++ suite/locales/Makefile.in -@@ -118,7 +118,7 @@ libs:: $(addprefix generic/profile/,$(PR - libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) - $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome - --SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt)) -+SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt)) ddg - - libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) - $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins -diff --git browser/locales/en-US/searchplugins/ddg.xml browser/locales/en-US/searchplugins/ddg.xml -new file mode 100644 -index 0000000..d68deb4 ---- /dev/null -+++ suite/locales/en-US/searchplugins/ddg.xml -@@ -0,0 +1,21 @@ -+<?xml version="1.0" encoding="utf-8"?> -+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> -+ <ShortName>DuckDuckGo</ShortName> -+ <Description>Search DuckDuckGo</Description> -+ <InputEncoding>UTF-8</InputEncoding> -+ <Image height="16" width="16">data:image/icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA11RgALs6oACbQ9wAj0v8AI9L/ACfQ9wAu0agANdUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzzN4CNdL/oK/z//////////////////////+jsPv/BDXX/wAz0t4AAAAAAAAAAAAAAAAAAAAAAAAAAAAyzvNSduD//////8jK/v+P+Lf/IbQL/17RPP+J3Y//wOKX//////9YeuX/ADLO8wAAAAAAAAAAAAAAAAAw091piOX/8/X9/1Fx5P9xhu//WOWZ/0W9Lv9Lwjn/J8BB/xyDAP9bdfL/9fP//2mI5v8AMNPdAAAAAAc610YRQ9f//////0Zr4P8AGdD/sb32////////////wrv//wAh1/8MPab/ACPc/05r4///////EkPX/wc610YANtWkrr/y/6S48P8AJ9L/AB3R/+/w/v///////////3+D7f8AQeL/AYTw/wFr5/8AMNb/p7Tv/6698v8AM9WkADLW//////8yXt//AC3V/wAw1/////////////z///8A0P7/AKb1/wWI7P8AuPf/AJ3w/zZW3P//////ADHV/wAx2P//////AzrZ/wAu1/84ZOL////////////e////AND//wC1+f8Atff/AZbv/wY62f8ELNf//////wAw1/8AMtn//////wAw2f8ALNn/kKrz////+//cwbH////////////R////Rcb8/wDO/f8A/P//AHzo//////8AMNj/ADXa//////8vXuL/ACna/4yq9///79T/jUkg/9i+r///////r2Q0/7Cozv8BKdr/AirY/zdZ4P//////ADTa/wI72tOuv/T/prr0/wAl2v+JqPb//7yW/+bUxv/9+/n////u//W+n/+Op/L/ADPd/wAv2v+ru/T/r7/0/wI72tMLQd1DEEjg//////9Cbef/ADng///////////////////////R3///AC3g/wAy3v9SeOn//////xFI4P8LQd1DAAAAAAM64PNmiuz/9/j//2mN7f/m7P3///////////9Cb+n/ACXd/wAt3v9rju3//////2iL7P8DOuDzAAAAAAAAAAAAAAAAAT3g/0p16f//////3OT8/3OS7v8AKt3/ACPc/zhn5/+xw/b//////0956v8CPeD/AAAAAAAAAAAAAAAAAAAAAAAAAAAEPODzBUDh/5uz8//7/f7/////////////////prz0/wtF4v8FQeDzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtF5kYDQOOkADrj/wA44v8AOeP/ADzk/wVB46QPReZGAAAAAAAAAAAAAAAAAAAAAPAPAADgBwAAwAMAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChIzyAnRNFwJ0TQryND0d8nRNH/J0TR/ydE0f8nRNH/I0PR3ydE0K8nRNFwKEjPIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChE00AlRdK/J0XS/ydF0v8nRdL/XXPd/11z3f94i+P/k6Lp/5Oi6f9rf+D/NVDV/ydF0v8nRdL/JUXSvyhE00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAzxAnRNOvJ0XT/ydF0/8lRdK/KEXSYOvu+6/+/v6//v7+v/39/c////////////7+/r/J0fOAKEXSYCVF0r8nRdP/J0XT/ydE068gQM8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlRdUwJ0bT7ydG0/8nRtHPKETTQAAAAADHx8dA2vHhn5TYpN/o9+z/////////////////8PL83ydG0o8lRdUwAAAAAChE00AnRtHPJ0bT/ydG0+8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKEXVYCdG1P8nRtT/KEbTgAAAAAAmRtZQI0PU38jIyP/F6s//Rrtk/0a7ZP9/yIr/c796/4vLkv+JpNf/M3Kq/zyWh/8zeKTfJkbWUAAAAAAoRtOAJ0bU/ydG1P8oRdVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVF1TAnR9X/J0fV/yhF1WAgQM8QJ0fTrydH1f9CW8//2tra/6Pdsv9Gu2T/Rrtk/0WzWv9Gu2T/Rrtk/0a7ZP9Gu2T/Rrtk/z6egP8nR9X/J0fTryBAzxAoRdVgJ0fV/ydH1f8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAgQM8QJ0fV7ydH1f8oSNVgIEDPECdH1c8nR9X/J0fV/1xwyf/t7e3/o92y/0a7ZP9Gu2T/Ra5U/0a7ZP9Gu2T/Rrtk/0a7ZP9Gu2T/Pp6A/ydH1f8nR9X/J0fVzyBAzxAoSNVgJ0fV/ydH1e8gQM8QAAAAAAAAAAAAAAAAAAAAACdH1q8nR9b/KEjVgCBQzxAnR9bPJ0fW/ydH1v8nR9b/gIzB//r6+v+j3bL/Rrtk/13Ed/+i26//ruG7/z6egf8+noH/Rrtk/0a7ZP86kI//J0fW/ydH1v8nR9b/J0fWzyBQzxAoSNWAJ0fW/ydH1q8AAAAAAAAAAAAAAAAoSNdAJkjW/yZH1s8AAAAAJEfWryZI1v8mSNb/JkjW/yZI1v+jqsT//////+j37P/R7tj////////////W3ff/JkjW/yZI1v8uZbr/PJeI/zJzrP8mSNb/JkjW/yZI1v8mSNb/JEfWrwAAAAAmR9bPJkjW/yhI10AAAAAAAAAAACVI1r8mSNf/KEjXQCZJ1lAmSNf/JkjX/yZI1/8mSNf/JkjX/9HR0f///////////////////////////5Ok6/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JknWUChI10AmSNf/JUjWvwAAAAAoSNcgJknY/yZH2M8AAAAAI0nY3yZJ2P8mSdj/JknY/yZJ2P9KZM//39/f////////////////////////////XHfi/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8jSdjfAAAAACZH2M8mSdj/KEjXICdJ2HAmSdj/JUjXYCVK2jAmSdj/JknY/yZJ2P8mSdj/JknY/2V4yf/t7e3///////////////////////////9cd+L/HXTj/xSf7/8Nwfj/CdL8/wnS/P8J0vz/ELDz/xt85v8mSdj/JknY/yZJ2P8lStowJUjXYCZJ2P8nSdhwJErZryZK2f8oSNcgJUnajyZK2f8mStn/JkrZ/yZK2f8mStn/iJPA////////////////////////////0ff+/xjV/P8J0vz/Drn1/xiO6/8Yjuv/GI7r/xCw8/8Lyvr/CdL8/xmF6P8mStn/JkrZ/yVJ2o8oSNcgJkrZ/yRK2a8jStrfI0rZ3wAAAAAlSdq/Jkra/yZK2v8mStr/Jkra/yZK2v+xtsf///////////////////////////8o2Pz/CdL8/wvK+v8mStr/Jkra/yZK2v8mStr/Jkra/yZK2v8iW97/Jkra/yZK2v8mStr/JUnavwAAAAAjStnfI0ra3yZK2v8lSdq/AAAAACZH2O8mStr/Jkra/yZK2v8mStr/L1HY/9HR0f///////////////////////////yjY/P8J0vz/CdL8/xCw9P8QsPT/ELD0/xSf7/8ddeX/Jkra/yZK2v8mStr/Jkra/yZK2v8mR9jvAAAAACVJ2r8mStr/Jkvb/yVJ2r8AAAAAJkvb/yZL2/8mS9v/Jkvb/yZL2/9KZtL/4+Pj////////////////////////////4Pn//0fd/f8J0vz/CdL8/wnS/P8J0vz/CdL8/wnS/P8Lyvr/Fpfu/yJc3/8mS9v/Jkvb/yZL2/8AAAAAJUnavyZL2/8mS9z/JUncvwAAAAAmS9z/Jkvc/yZL3P8mS9z/Jkvc/26AyP/x8fH//////////////////////////////////////9H3/v/C9P7/o+7+/2fa+/8Oufb/CdL8/wnS/P8J0vz/CdL8/xiP7P8mS9z/Jkvc/wAAAAAlSdy/Jkvc/yZM3P8lTNy/AAAAACZJ2e8mTNz/Jkzc/yZM3P8mTNz/iJTB////////////qnth/5VaOf/x6eX///////////////////////Hp5f/x6eX/ydL2/yZM3P8kVN7/G37o/xKo8v8QsfT/HXbm/yZM3P8mSdnvAAAAACVM3L8mTNz/I0vc3yZJ2u8AAAAAJUzevyZM3f8mTN3/Jkzd/yZM3f+fqc3///////////+VWjn/v5yI/+re1///////////////////////jk8s/7iRe//J0vb/Jkzd/yZM3f8mTN3/Jkzd/yZM3f8mTN3/Jkzd/yVM3r8AAAAAI0vc3yNL3N8kTd2vJk3d/yhQ3yAlTd2PJk3d/yZN3f8mTd3/Jk3d/6St0v////////////Hp5f/q3tf///////////////////////////+xhm7/49PK/6Cx8P8mTd3/Jk3d/yZN3f8mTd3/Jk3d/yZN3f8mTd3/JU3djyhQ3yAmTd3/JE3drydN33AmTd7/J03fcCVK3zAmTd7/Jk3e/yZN3v8mTd7/pK7S///////Sp5r/////////////////////////////////////////////////T27k/yZN3v8mTd7/Jk3e/yZN3v8mTd7/Jk3e/yZN3v8lSt8wJ03fcCZN3v8nTd9wKFDfICZO3/8mTt3PAAAAACVN3r8mTt//Jk7f/yZO3/+EltX//////+fRyv/SqaD/59LO///////////////////////at63/vIBy/7Glxf8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8mTt//JU3evwAAAAAmTt3PJk7f/yhQ3yAAAAAAJE/dryZO3/8oUN9AKFDfQCZO3/8mTt//Jk7f/zhb2v/o6/T/////////////////////////////////////////////////XHrn/yZO3/8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8oUN9AKFDfQCZO3/8kT92vAAAAAAAAAAAoUN9AJk7g/yZO4M8AAAAAJk/hnyZO4P8mTuD/Jk7g/05v5v/k6fv//////////////////////////////////////3eR7P8mTuD/Jk7g/yZO4P8mTuD/Jk7g/yZO4P8mTuD/Jk/hnwAAAAAmTuDPJk7g/yhQ30AAAAAAAAAAAAAAAAAjT+GfJU/h/yVO4Y8gUN8QIk7gzyVP4f8lT+H/SWnW/0lp1v+bq+H/8fHx/////////////////6Cy8v9OcOb/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yJO4M8gUN8QJU7hjyVP4f8jT+GfAAAAAAAAAAAAAAAAAAAAACBQ3xAlTOHvJU/h/yVQ4mAgUN8QIk7hzyVP4f+ktOv///////////////////////H0/f9phur/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yVP4f8iTuHPIFDfECVQ4mAlT+H/JUzh7yBQ3xAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ3zAlUOLvJVDi/yVQ4mAgUN8QI1Din4mb2//J0/j/ydP4/6299P93ku3/M1vk/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/I1DinyBQ3xAlUOJgJVDi/yVQ4u8lUN8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAlUOLvJVDi/yVQ4o8AAAAAJFDjQCVQ4r8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDivyRQ40AAAAAAJVDijyVQ4v8lUOLvJVDkMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAjUeTfJVHj/yNR5N8kUONAAAAAACVQ5DAmUuOAJVHivyNR5N8lUeP/JVHj/yNR5N8lUeK/JlLjgCVQ5DAAAAAAJFDjQCNR5N8lUeP/I1Hk3yVQ5DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBQ3xAjUuSfJVHk/yVR5P8jUeTfJFLkcChQ5yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoUOcgJFLkcCNR5N8lUeT/JVHk/yNS5J8gUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkUONAI1LknyVS5P8lUuT/JVLk/yVS5O8lUeS/JVHkvyVR5L8lUeS/JVLk7yVS5P8lUuT/JVLk/yRS468kUONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFDfECVS5GAjUuWfIlPlzyVS5f8lUuX/JVLl/yVS5f8iU+XPI1LlnyVS5GAgUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/ggBB/wgAEP4AAAB8AAAAPAAAADiAAAEYAAAAEQAAAIAAAAAAAAAAAgAAAEIAAABCAAAAQgAAAEIAAABCAAAAQAAAAAAAAAABAAAAiAAAABiAAAEcAAAAPAAAAD4AAAB/CAAQ/4IAQf/AfgP/8AAP//wAP/</Image> -+ <Image height="26" width="65">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAaCAYAAADovjFxAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxRTYyNzYzMzFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxRTYyNzYzMjFBQUUxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDE4MDExNzQwNzIwNjgxMTg3MUZCQUIxMEI4RjU1NzYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7hxyCFAAAF4UlEQVR42tSZa2wUVRTH/3dmp92+tnRpCiUgxFoKCDQplsRIfZSgCEHSapBGBCURQvCLWkkQg9GYGNDwTYlGUCMoCA2EtEpEq1KjRJCA9EEElba2FajbN213d+b6vzOzZZfi99mb/DJ3d/aczD33vO6skFLCq6O9YubYXChE4n1+LublaVJO5hLDvRUhjaSefMolno+XU0uOX7WG5BxLSBsXc448Qo6SFWSuywr3O3XvnPqtK3PbkWxGUL5whHzN7WyAZeWQRZBWFz+v4v6+w3sKztFFFpEc0mDLOLJinNIkCocMXppJLhdcCssMw4zu5fOX2XGi6RAa91Rot8aNMsB6kkJOk24yh6seSjZPEHzoZmlfZaaU1pqR/Dsv+XfVlQXf/QbZ67dBz5sKKzxK20TpGBbU5qrtJWXkEllDMqWrK94jPG0ESzpwPTUkl8yQFvZL09oaLlqIG1LDQFoA6Y9vxJQ9Dch+bjus4WEaIwxpmjSGdJKgw1ay39bh6KqJ6U8GTyjnc1aQheQ1UqV2Of3LPTBPfI40RkVsEdmVGzClphmZy9bAitAQlhnvEbBlHR1KV4VbVbydE66sLFI+e8mN5e1Qc7o6IqMIr3sVhVUb/le2e1c1Bk8cgvAxFWjj9rqQvA7HGIVeN4LqA1SJm0iOci/LQDc3aZrg4RZkpBgYHY4iK8OXIHetz4RPi6K/ao4b9PrtkuVKElL9hafDgfuzjrQQk5QxH9hxPphfgAy/gYHByDgDqJGXrSOYlYrAo1WQUTc32LJj+aHM1dlEnvK2EYClpIasiotrmL5URE2JiQEDuw+ewunGjgS5hrNtWLp5P/QHKhk9lh1BDuKmIYAnyWGyxNuJUWI2+ZncG5/djKF+DA45ZX7Hh9/j2HdNCWKzC/JRsXg+sgrmQ4aFjS/LQvqsYejpqiTYepTOn8g8n8c9QQ21zdPiDxD+620IhULIC2TiYl01/CmJy8jNNrCxMh/hjiMIVvYioziK1BlRQJcIHc1B6KscqpLTXN2pPo/nhNjwxR2jIFgdBtouAzPuSDSAZLPUXgX0HYFgLjRIcLnO3sFAb33AJnLdYFNp9w/6Lco97Qm57o7dbKC5wpHffgHuL09srjo22AYY/tOPoQsBiFRgtJ3zljQqo/HoCfbSnULR6eq2vJ4TWskCcnYsJ9hGYIz/1YQR65bTYOARe5FW2EDfqQD+rQ1iqDkN/qlhTHhwAJnFQ6oxiuUWpfMe0uzpPuH3ZUV7eZlFVpPWsRjh+WA4OAV579UiPzghQaajuhgZc1qRWTIKnQ4g0i27N77RlI5rXwQR/seI9cnTyWfkvNfDYR8v35K/iSoBd8eSY8r1doR6escZYfRqLvrPDEDsM+ALWNADJiLdBttoYXuJEPamK13t5D6y1evNUj3pJzvIJqfRYV5XyZGFf/CPlnEy6UXzoLEZYDqEHBCIdBpsmFSsODEgHb1K105Xd4PnD1B86M2kmjSSA/Yi6AlSaBhtPG3/5mTXcTT3nLPnwYcq4KP7X52cgvc3TcWvpQFVDu1UIoWt74CrS+nc7P3qIO00rkLiBfcQdReZCamVqAqRcuUiolzJDx11aO4+gxxjOnqtbmhvzITO+6Yh0DthhF4jYmeHs4Q1FJfd+T6ZLC9VpHOcnk7qyQJSqzzB39WKnr5h+HhS1DUfOvs64RNRVgATlnDawoghYoWl1pWtd3WVJ0WfEDf6pGqhnTdCTGqihCw3urt2h0LdecH0ydB1Aw8XLkfPjRGUTixB4JUtuDDXj0nXokMmsJbyddJJiOoYPZuO0ZdsRlDjsnTa5x/JCDTxEnPfpIH6Y28uXvHYttUFzyNb1cTY+4TyC8ezD37wltT1k5YmXmRkjbhhMI2BcTVpXrS2LJ011jmO/VfgPO7L/GKnfSQ0zU+EaR2SlnWGN53FaRpdw1cKTX+Cxlrr5oMt5G2713Kq7NhLxmQ1gpPvpXyWs2f4oSz+oHHznxrRwOvHnHwkYpK3McJ/AgwADmrfhvtTyFYAAAAASUVORK5CYII=</Image> -+ <Image height="52" width="130">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAA0CAYAAABGkOCVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoxNTg5QTM3RjNCMjA2ODExODIyQUVEOUNBRDIxQzhDMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo4RTdBNDY4ODFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo4RTdBNDY4NzFBQUQxMUU0ODc3NTg3NjMyNDFCNzExQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OTE3MzgzQ0I2QjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MTU4OUEzN0YzQjIwNjgxMTgyMkFFRDlDQUQyMUM4QzMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7NVVBAAAAO30lEQVR42uxdCXRU1Rn+3nszk5nJhmEJAYKyJJJAWFyqUqwWwaJi0aKA9bh0USwunEo9UGmrHG0Vj3LUUoEqFQGXciqgiFCoVtsKeBAJS9JWtrAmIUxmkpnJJDNv6X/fu5O8mUwmkwkoPef9Od/cN/ct9593v/vf//73vhdB0zRY0nU5dktxuzxBMG3zD6GD84XYHYMI1xMuJZQQ2MWzCS6+P0TwE74i/Juwi7CFcCR6gY6qUeMf5t2JjhUsInxjRBhJyUOEewn2NNWIEFYQFlM17rWI8P9FhJsILxGGdHDpOsJ+wmlCA8/LJfQhjCD07uC8Q4TZhI3pEMFmVenXJqMJ7xIGx+UfJawivEf4IsVrXUaYQriLcCHPY8T6gHCYMJVQ3hXlLIvw9ViE1wg/iTt8JeFpuvsHYs4BehLKCAWEHnyXj1BN2EfwmGuMzimi5FeEu+Ouv5zwU6trOD+IUEif/zS1WiZvEWZSzQT4gQ5WYbwVj0+x+I+5dXmNrhPm18miz6WEO+OszdV0zHGLCN8cEZj53mnaXUO4ke72blYTArRS+r6QMLnVFggmu5C6sO5gLl23kp/NuqBNhL6mYy7XTN1OoioXrSo9JzKJ7vVOjTtrhLWEAoMEag5UZaMmyxVqJDKZAFUmKDJBpd0EqinTuZ1hMqGCV34ObZfzstaajmGEnGT5CF+vRbg0zul7krCAN8Ufa6K0vLnkCmSXXQ5nuBmavx6qtw4t+3dC9p6GIJH/LkkQRMm4oNBlC8F8kT/x7Sd4+WYnc5c1ajj3UhBHgofppi/mdbmGmHA75DDC9afh63cxSr4zMeZk+Uw1Au+/jsCGN6C2NEGw2clmk9EWumS4l/PWP43KXkBle2j793wf060fdzwti3CuLAIfy0eHhwtMrZE5jONAZl+lSrUvXI/+w0qTXF1D/Su/QeP65RDsDrISkkGGrlmHf+mOYptVeoJvH04Uw7CIkKYcjSMCVdESSh7gX1lM4JYYEuj1qyKU1w/eUdcC3jPQMnNh65UP9+Dh6FFUin79+8e4ioG/vYszCx80uguyDkLUOqROCDMZ1vPYA5OlVOs/s4hw9onAmncF32YRwXy+/TZhRsy4TVWoD4gAkTA0RYHjuh/Adc0tyBhcAme/iyDGVXLk5GE0bfsr/NRlsK7DIITUFTK8Q7iDb9fCiFAyGQ4+0rCIcPaIUMHJwORb0ISddGfv4kGj2AE8jQ4QaUFkwh3o9/OFcNtSd9M8L8+D/8PVeneBrpHhbtJpFelkHtJWcjJYw8duiSZEMYFQyrfX8BudQ9srTceQJaBclYgQURCc/hiGPPZCl0jApOcjzyJz3GRodA39WubrJ8dKXSfmLDIdjbxSrrt+jGUR0pSqKRdHN9msXxnfvgBGOHiDESgyE4eYIMvwFw5D8bJNyOiOozrjEiiNXmNUkbpVYIGnm2GErb08j4WsR1oWoftSbCLBW5wERe1IYOoW5HseT4sEClmAWk8zzgQ19H7kd5RBfoaqInYWIalM5rr5uK7guhdbROhOz6DpmMVThqd5usiUZ4AqUVNUBHsVIm9oiX5+U4uCpavLsWTVbmz6+FCn5R2vDuhRR7+vCdLYSbAVFpHfqeiGpl15HSOq21OmPP03WF1DmnLk+3rXECS4eYCGBWokFhdKxBqBRgqnR30Xg+e/jF7ZWXjng68wdkwBBvbPTqt8/+a3UbdoLgQHdxxTF+aYkJOBk1xn9huyLIuQvhRyEjB5jaf3dRQgYmi5oC8k0bjl024qSpsETLIn3UHugabPS6BrjTmq43KeZjJCWERIt2sAbjBN6mzSjDn/25JNEKk2B+RIxBiumZw8D5n7lKJDX1bhqjtfwUtvbde/u0aPNSapgK7gNq7rJlPe9RYR0mfCVaa7u53nXZesBgRNQSgUirnM4y9uxogpi/DE4q3kN0SSFrlszQ4cPeXFF/tOwNcCOMuuNBxGVTOxLQFi9biO67rdlHe5RYT0ZQRP63jap+NDBR32gA/+QDBmz5sby2G3iThe68O2L48mLXDGDaPhsElgk9Q9aOiRMbi0HQk0VSDHlCBzqEIbGdqkd5zupRYR0u8ahvH7X8HTkUlNMnUFTs8peLz1Mde5+doShGVVb+VXjipMWuZN1wxD1dZ5WP3MNCPDmWUYBBZfokpXIoJelnt0ED1vrUfeFC/cw5uIK0K8PqN4up+nxdY0dPqSxdNTPO2X3CAQEWqP4nhDY8yuxfOnYM49V2NA3x66ZehSbMHfAi0iwd5XRmZJE1zDQ3BfHIJg582fzU/ZNNQsy0dwj8u8+KmApyd5mmsRoRtxBC7RJec5yboGtjjNUX8aQpMfTeEI3I62RxkGDchLrVD5DJl9sihyNYRwBSTtVQx64RRsubrJIZ2MmmZdgyBqeur7KAeBclfb4IVXPE+jrMy0iNB9CfO0k4dUBDZU0K2C1+uDO793aldXybSfmgOt/nWqyBazywFHL2Mlk6aIrfmMAEqTiMbPcuH9KBtqQNIjB2yoaRJ7nO7WCqWzID2jMZ7OeMC6B3dtFbw+H/qnQAQtuA3q4QlEhpCxUkm00SWiC12FVnLprZ9FKytdaNyejWC522j9ktE1RIljjkfF6R62iJC+syjzhtQjzgPvmAmCCFcNWYQGX+cFRKqhHvi2UYGiHYIkEh9ERBpt1BUokHIUqC0iQv/JgH93JoJ73VACkk4K3TcQDAJoieekorpGdQ9YREifCWzJF5uwGcZzKjpjDqsZZ3UVTsQ5jAkPD+3h/DGWqWmyiCO/LtTNfusSRr2la8Z3xjNJayssebAxqmsJT49Yw8f0ZR9Ph/L0YHKDYKxIdjTUQQg2ItjSkvzw7Al6VwBB1U9Vmw2LIHBz3wqJE4JVvMIcRUKExxJYDCExIQ7G6V5pESH9rqHcNC4fzPMqk4aY2ehBZN1Dle4wJmeCDeKgNYaJFxXYesgYMKcGrqJmvuJN0GMHKlU6iBDOoc3oMaERBffXYcjCEyhaUgV7fjiRHpVc18GmvL1W15A+EzbT51P8G5t3+AOMBaKlnfkKTt1PaMCAvvmdWIVbUbtxKpwFW5B9WRiZpSEdbFpb9lHVUYsX3Sokl9o6nNV9SOoiGj/LRrjWET9aYLKe59xgyttqESF9i2B+fmE6DCK8Sni8U4eRRg6eem9K5QT/G0T9h70hrpaQNaoZWWVNcBc3w5EvG6Fj3qoZAeSAiACNGLyf5KD5uIMZlUTyqknnqOyxiNA9YUvS2PIvtmScRW2qYDzdXJRsCOk8dRgn/P6UChAzaMRgU/WxIKtk/263bgmkbBkZ/WXYsmSoYQGR03a0kAWIOo+6/9B+2HiA6+hC2zL3DXo5Vl12S5aYtmdz8zw3uUUQYPd7IQYa4G8KdVqAY8CFdJaqDwtZ5Yp2Sh0qOY8SQgdp6FhOQ8dKN8Ieux5a1vdLbSOJOJnLdZwd/xssIqTbNRjrQdg6hObo8i+ev45woqPlYvoEkMAdRl/n8QTn0BFQ2VI30ySj4QtorYCoz3HraHUA25fNdFrHdYwuVWvmv8EiwlmQ+Txl3eyjWvv+N8EwUtS7B6+vodOLZ44Za0wv8poz6p1aPpFD4hBTW6A0nR/2KNoiyvNbuyCrHtN2FqNYxKKMfPsF3v9uo+1VyaakXdWH4fF27jA6i8tgc+eyZcwspABBocqn0o4OdOKP9w/A+1P6UL4Wr1M82Kt5tjHdmI48T+a668dYRDg7Yl6ruJbPArJX2RxP5CYYRKhCYyDQmv3+oZX44ear8NwXj2JX7T9iTuk5/lbYI0QAIoFiF7B2al+svKc/avpm4MBQt24dhI7XLTId7uY6re1AZ2vSKX2TEOOJreAmlz0nwB5Jn0k3fhkdMYa2T7CGHTt0oBbY1AS7tw4NgSbkZrnpcmTiaWSw37ML+zw70dPZB9cXTseO2h04ekkl1CuK4WzW4AxrCGRJsMlGxbNtmU1IaUg0sdBMGKMZpc6k/ZNMUdEVMaMTq0bPWlcx0WSK2buMLtOMF1+VEVpiuwaCaMw71PPuQSC/QRSogkU7HGIGGsM+vLhjCU4E9xA9FDhY2MAmoMkt6pbBsAKGjxhyiom6gxZetofrstS0b2K7YapVhWdN2JPGU03f2TOQF9FdP6inxhNGsYEl8hPq+cjBJbn5HoEIQZVNpBA0I5XYs4m84hPNHdjldpm+uLLN73KaynW1iHAOZS3d/CdNzZLNUJZR911D23mEv7eNAUVknGwbOWTY3K0ntf7RiSp7uQb/kwUFClt4IpF1IIuish5BbGcKWBl5epmsq9JwyLTvyTg/wSLCOZQFdM+Xta5gNx6SncKH8+MJP6IGrqj6GsZjCAQNh7GXKx+qpkIhyKqMiBpGVoYbh2tCOF4XQq1Xw3TvtXjouUMY94kXeZ4wIuQ4OshnsBPoeop+baMMjZe5l0cZWMYyRN/llEAsZzFNUZOP3R/g5jkaZVzPI3iz6LQVZOhXkFPwjBCJzHOcqYbPH0J+1kDI9McmlAbmFGFG8QMY1etK1ARrdZ8hz2WsITn05gaM++g0vkNk8OfY0ewSmWV4lnb9UmsLJrJ5j1kmfdhr/OZFX76JBD2M9exjmlLxvWGpOJCzeKVExasHmzRsNcKMMjzjb19aMO2+mcVFQ7Du2EqUXDAGw7LLOrxmw5b1OPbb2RBtjs8FUWTkekN/a6Mxr8CcwD/DeDw/Kg/Srlc609UiwrklAvtgD8J8SjAvVd5LRHiE8Gn0NTqZKz692aGq853ZOSMycnIzJWcGbHx5e0RWEGluQaTB63H7z7ztfe/Nh71b1vE3ruk24BrCy+DvOuBSr+cL2J/KGxQsIpx7IkTlecKc2AO0esJiqMrrUJQq5hgyS2HUidY+EiUK+pPPomRjaxgH0cjjXhiv+o9fD88inL9oHaBYRDiviMA22aNMiwi3xRGCgU0oUJehB3vY01M0xNP4ZITAnkPIp8Y/nLZHkhWYqAce2stfWGBLMEc0LSKcl0SISj5vsewVd5ndVCXIHdHno/EBIc6QWEQ4f4nQaghIriDcCOMfelyaYvHsX/mwf9DxIeHz+NcopUOE/wkwAAeR3z4C+zelAAAAAElFTkSuQmCC</Image> -+ <Url type="text/html" method="get" template="https://duckduckgo.com/"> -+ <Param name="q" value="{searchTerms}"/> -+ <MozParam name="t" condition="purpose" purpose="contextmenu" value="ffcm"/> -+ <MozParam name="t" condition="purpose" purpose="keyword" value="ffab"/> -+ <MozParam name="t" condition="purpose" purpose="searchbar" value="ffsb"/> -+ <MozParam name="t" condition="purpose" purpose="homepage" value="ffhp"/> -+ <MozParam name="t" condition="purpose" purpose="newtab" value="ffnt"/> -+ </Url> -+ <Url type="application/x-suggestions+json" template="https://ac.duckduckgo.com/ac/"> -+ <Param name="q" value="{searchTerms}"/> -+ <Param name="type" value="list"/> -+ </Url> -+</OpenSearchDescription> diff --git a/www/seamonkey/files/patch-bug1082199 b/www/seamonkey/files/patch-bug1082199 deleted file mode 100644 index e24fe4726c2c..000000000000 --- a/www/seamonkey/files/patch-bug1082199 +++ /dev/null @@ -1,26 +0,0 @@ -commit 258ec90 -Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com> -Date: Fri Oct 17 15:55:00 2014 +0200 - - Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium ---- - memory/build/mozjemalloc_compat.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 78bb13a..70265a7 100644 ---- mozilla/memory/build/mozjemalloc_compat.c -+++ mozilla/memory/build/mozjemalloc_compat.c -@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats) - size_t active, allocated, mapped, page, pdirty; - size_t lg_chunk; - -+ // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in -+ // src/ctl.c -+ uint64_t epoch = 0; -+ size_t esz = sizeof(epoch); -+ int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz); -+ - CTL_GET("arenas.narenas", narenas); - CTL_GET("arenas.page", page); - CTL_GET("stats.active", active); diff --git a/www/seamonkey/files/patch-bug1083461 b/www/seamonkey/files/patch-bug1083461 deleted file mode 100644 index 8b8031a6cb2a..000000000000 --- a/www/seamonkey/files/patch-bug1083461 +++ /dev/null @@ -1,159 +0,0 @@ -commit 87f367b -Author: L. David Baron <dbaron@dbaron.org> -Date: Sun Oct 19 23:31:39 2014 -0400 - - Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky - - --HG-- - extra : transplant_source : %CD%5D%9BE%FE%DE%A4%F2%B8%CF%D7%AE%84%90%3B%E8%A0d%D7%2B ---- - layout/style/StyleAnimationValue.cpp | 6 ++++-- - layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------ - layout/style/nsCSSValue.h | 22 ++++++++++++++++------ - 3 files changed, 36 insertions(+), 20 deletions(-) - -diff --git layout/style/StyleAnimationValue.cpp layout/style/StyleAnimationValue.cpp -index 40bc8bf..1898fe6 100644 ---- mozilla/layout/style/StyleAnimationValue.cpp -+++ mozilla/layout/style/StyleAnimationValue.cpp -@@ -3851,11 +3851,13 @@ StyleAnimationValue::operator==(const StyleAnimationValue& aOther) const - case eUnit_Filter: - case eUnit_Shadow: - case eUnit_BackgroundPosition: -- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList; -+ return nsCSSValueList::Equal(mValue.mCSSValueList, -+ aOther.mValue.mCSSValueList); - case eUnit_Transform: - return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList; - case eUnit_CSSValuePairList: -- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList; -+ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList, -+ aOther.mValue.mCSSValuePairList); - case eUnit_UnparsedString: - return (NS_strcmp(GetStringBufferValue(), - aOther.GetStringBufferValue()) == 0); -diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp -index dcb8496..fefb4f9 100644 ---- mozilla/layout/style/nsCSSValue.cpp -+++ mozilla/layout/style/nsCSSValue.cpp -@@ -264,13 +264,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const - return *mValue.mRect == *aOther.mValue.mRect; - } - else if (eCSSUnit_List == mUnit) { -- return *mValue.mList == *aOther.mValue.mList; -+ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList); - } - else if (eCSSUnit_SharedList == mUnit) { - return *mValue.mSharedList == *aOther.mValue.mSharedList; - } - else if (eCSSUnit_PairList == mUnit) { -- return *mValue.mPairList == *aOther.mValue.mPairList; -+ return nsCSSValuePairList::Equal(mValue.mPairList, -+ aOther.mValue.mPairList); - } - else if (eCSSUnit_GridTemplateAreas == mUnit) { - return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas; -@@ -1875,13 +1876,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult, - } - } - --bool --nsCSSValueList::operator==(const nsCSSValueList& aOther) const -+/* static */ bool -+nsCSSValueList::Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValueList *p1 = this, *p2 = &aOther; -+ const nsCSSValueList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mValue != p2->mValue) - return false; -@@ -1934,8 +1937,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult - bool - nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const - { -- return !mHead == !aOther.mHead && -- (!mHead || *mHead == *aOther.mHead); -+ return nsCSSValueList::Equal(mHead, aOther.mHead); - } - - size_t -@@ -2148,13 +2150,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty, - } - } - --bool --nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const -+/* static */ bool -+nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2) - { -- if (this == &aOther) -+ if (aList1 == aList2) { - return true; -+ } - -- const nsCSSValuePairList *p1 = this, *p2 = &aOther; -+ const nsCSSValuePairList *p1 = aList1, *p2 = aList2; - for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) { - if (p1->mXValue != p2->mXValue || - p1->mYValue != p2->mYValue) -diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h -index 8418a2d..f0c4e63 100644 ---- mozilla/layout/style/nsCSSValue.h -+++ mozilla/layout/style/nsCSSValue.h -@@ -871,9 +871,8 @@ struct nsCSSValueList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(nsCSSValueList const& aOther) const; -- bool operator!=(const nsCSSValueList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValueList* aList1, -+ const nsCSSValueList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -886,6 +885,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValueList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE; - }; - - // nsCSSValueList_heap differs from nsCSSValueList only in being -@@ -1264,9 +1269,8 @@ struct nsCSSValuePairList { - void AppendToString(nsCSSProperty aProperty, nsAString& aResult, - nsCSSValue::Serialization aValueSerialization) const; - -- bool operator==(const nsCSSValuePairList& aOther) const; -- bool operator!=(const nsCSSValuePairList& aOther) const -- { return !(*this == aOther); } -+ static bool Equal(const nsCSSValuePairList* aList1, -+ const nsCSSValuePairList* aList2); - - size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const; - -@@ -1280,6 +1284,12 @@ private: - { - MOZ_COUNT_CTOR(nsCSSValuePairList); - } -+ -+ // We don't want operator== or operator!= because they wouldn't be -+ // null-safe, which is generally what we need. Use |Equal| method -+ // above instead. -+ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE; -+ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE; - }; - - // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being diff --git a/www/seamonkey/files/patch-bug1122547 b/www/seamonkey/files/patch-bug1122547 new file mode 100644 index 000000000000..1ccacf9ce842 --- /dev/null +++ b/www/seamonkey/files/patch-bug1122547 @@ -0,0 +1,20 @@ +diff --git media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc +index e68a104..a090241 100644 +--- mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc +@@ -159,12 +159,13 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding( + // Assume that render timing errors are due to changes in the video stream. + if (next_render_time_ms < 0) { + timing_error = true; +- } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) { ++ } else if (std::abs(static_cast<int>(next_render_time_ms - now_ms)) > ++ max_video_delay_ms_) { + WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding, + VCMId(vcm_id_, receiver_id_), + "This frame is out of our delay bounds, resetting jitter " + "buffer: %d > %d", +- static_cast<int>(std::abs(next_render_time_ms - now_ms)), ++ std::abs(static_cast<int>(next_render_time_ms - now_ms)), + max_video_delay_ms_); + timing_error = true; + } else if (static_cast<int>(timing_->TargetVideoDelay()) > diff --git a/www/seamonkey/files/patch-bug1122586 b/www/seamonkey/files/patch-bug1122586 deleted file mode 100644 index 1d130ca76770..000000000000 --- a/www/seamonkey/files/patch-bug1122586 +++ /dev/null @@ -1,30 +0,0 @@ -diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp -index 36a6ccf..96d3bd0 100644 ---- mozilla/content/media/MediaDecoderStateMachine.cpp -+++ mozilla/content/media/MediaDecoderStateMachine.cpp -@@ -18,6 +18,7 @@ - #include "nsTArray.h" - #include "MediaDecoder.h" - #include "MediaDecoderReader.h" -+#include "mozilla/MathAlgorithms.h" - #include "mozilla/mozalloc.h" - #include "VideoUtils.h" - #include "mozilla/dom/TimeRanges.h" -@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS, - // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration - // less than this are ignored, as they're assumed to be the result of - // instability in the duration estimation. --static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2; -+static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2; - - static TimeDuration UsecsToDuration(int64_t aUsecs) { - return TimeDuration::FromMicroseconds(aUsecs); -@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration) - AssertCurrentThreadInMonitor(); - int64_t duration = GetDuration(); - if (aDuration != duration && -- std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) { -+ mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) { - SetDuration(aDuration); - nsCOMPtr<nsIRunnable> event = - NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged); diff --git a/www/seamonkey/files/patch-bug1128161 b/www/seamonkey/files/patch-bug1128161 new file mode 100644 index 000000000000..56349a2ea252 --- /dev/null +++ b/www/seamonkey/files/patch-bug1128161 @@ -0,0 +1,28 @@ +commit 6af7f0e6 +Author: Chris Double <chris.double@double.co.nz> +Date: Tue Feb 3 11:20:17 2015 +1300 + + Bug 1128161 - Fix build error when logging is disabled - r=ajones +--- + dom/media/mediasource/MediaSourceUtils.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git dom/media/mediasource/MediaSourceUtils.cpp dom/media/mediasource/MediaSourceUtils.cpp +index 44a40f5..83bba60 100644 +--- mozilla/dom/media/mediasource/MediaSourceUtils.cpp ++++ mozilla/dom/media/mediasource/MediaSourceUtils.cpp +@@ -11,7 +11,6 @@ + + namespace mozilla { + +-#if defined(PR_LOGGING) + nsCString + DumpTimeRanges(dom::TimeRanges* aRanges) + { +@@ -31,6 +30,5 @@ DumpTimeRanges(dom::TimeRanges* aRanges) + + return dump; + } +-#endif + + } // namespace mozilla diff --git a/www/seamonkey/files/patch-bug847568 b/www/seamonkey/files/patch-bug847568 index 197494504ade..f7d74c4f1674 100644 --- a/www/seamonkey/files/patch-bug847568 +++ b/www/seamonkey/files/patch-bug847568 @@ -83,10 +83,10 @@ index ac38f40..87536b7 100644 dnl Check for pixman and cairo dnl ======================================================== -diff --git content/base/src/moz.build content/base/src/moz.build +diff --git dom/base/moz.build dom/base/moz.build index a660ba4..6b2f602 100644 ---- mozilla/content/base/src/moz.build -+++ mozilla/content/base/src/moz.build +--- mozilla/dom/base/moz.build ++++ mozilla/dom/base/moz.build @@ -196,6 +196,9 @@ SOURCES += [ 'nsObjectLoadingContent.cpp', ] @@ -237,6 +237,6 @@ index 67f0db9..d42137a 100644 +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + - if CONFIG['MOZ_ALSA']: - OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] + if CONFIG['MOZ_OSS']: + OS_LIBS += CONFIG['MOZ_OSS_LIBS'] diff --git a/www/seamonkey/files/patch-bug858919 b/www/seamonkey/files/patch-bug858919 deleted file mode 100644 index fa66d350307b..000000000000 --- a/www/seamonkey/files/patch-bug858919 +++ /dev/null @@ -1,394 +0,0 @@ -commit a33d4f7 -Author: Martin Stransky <stransky@redhat.com> -Date: Fri Nov 14 04:04:00 2014 +0100 - - Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt ---- - toolkit/components/alerts/nsAlertsService.cpp | 10 +-- - toolkit/system/gnome/moz.build | 2 + - toolkit/system/gnome/nsAlertsIconListener.cpp | 64 ++++++++++++------ - toolkit/system/gnome/nsAlertsIconListener.h | 89 ++++++++++++++++++++++++++ - toolkit/system/gnome/nsGnomeModule.cpp | 5 ++ - toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++ - toolkit/system/gnome/nsSystemAlertsService.h | 27 ++++++++ - 7 files changed, 226 insertions(+), 25 deletions(-) - -diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp -index 93f4536..f8b5e07 100644 ---- mozilla/toolkit/components/alerts/nsAlertsService.cpp -+++ mozilla/toolkit/components/alerts/nsAlertsService.cpp -@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl - nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID)); - nsresult rv; - if (sysAlerts) { -- return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -- aAlertCookie, aAlertListener, aAlertName, -- aBidi, aLang, aData, -- IPC::Principal(aPrincipal)); -+ rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -+ aAlertCookie, aAlertListener, aAlertName, -+ aBidi, aLang, aData, -+ IPC::Principal(aPrincipal)); -+ if (NS_SUCCEEDED(rv)) -+ return NS_OK; - } - - if (!ShouldShowAlert()) { -diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build -index c033f8b..9242209 100644 ---- mozilla/toolkit/system/gnome/moz.build -+++ mozilla/toolkit/system/gnome/moz.build -@@ -5,7 +5,9 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - SOURCES += [ -+ 'nsAlertsIconListener.cpp', - 'nsGnomeModule.cpp', -+ 'nsSystemAlertsService.cpp', - ] - - if CONFIG['MOZ_ENABLE_GCONF']: -diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp -index f39335e..55f4356 100644 ---- mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp -+++ mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp -@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure, - NS_RELEASE(alert); - } - -+static GdkPixbuf* -+GetPixbufFromImgRequest(imgIRequest* aRequest) -+{ -+ nsCOMPtr<imgIContainer> image; -+ nsresult rv = aRequest->GetImage(getter_AddRefs(image)); -+ if (NS_FAILED(rv)) { -+ return nullptr; -+ } -+ -+ nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = -+ do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); -+ -+ return imgToPixbuf->ConvertImageToPixbuf(image); -+} -+ - NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, - nsIObserver, nsISupportsWeakReference) - -@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe - nsresult - nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest) - { -+ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); -+ - uint32_t imgStatus = imgIRequest::STATUS_ERROR; - nsresult rv = aRequest->GetImageStatus(&imgStatus); - NS_ENSURE_SUCCESS(rv, rv); - if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) { - // We have an error getting the image. Display the notification with no icon. - ShowAlert(nullptr); -- } - -- if (mIconRequest) { -+ // Cancel any pending request - mIconRequest->Cancel(NS_BINDING_ABORTED); - mIconRequest = nullptr; - } -+ - return NS_OK; - } - - nsresult - nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest) - { -- if (aRequest != mIconRequest) -- return NS_ERROR_FAILURE; -+ NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!"); - - if (mLoadedFrame) - return NS_OK; // only use one frame - -- nsCOMPtr<imgIContainer> image; -- nsresult rv = aRequest->GetImage(getter_AddRefs(image)); -- if (NS_FAILED(rv)) -- return rv; -- -- nsCOMPtr<nsIImageToPixbuf> imgToPixbuf = -- do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); -- -- GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image); -- if (!imagePixbuf) -- return NS_ERROR_FAILURE; -+ GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest); -+ if (!imagePixbuf) { -+ ShowAlert(nullptr); -+ } else { -+ ShowAlert(imagePixbuf); -+ g_object_unref(imagePixbuf); -+ } - -- ShowAlert(imagePixbuf); -+ mLoadedFrame = true; - -- g_object_unref(imagePixbuf); -+ // Cancel any pending request (multipart image loading/decoding for instance) -+ mIconRequest->Cancel(NS_BINDING_ABORTED); -+ mIconRequest = nullptr; - -- mLoadedFrame = true; - return NS_OK; - } - -@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf) - mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE); - gboolean result = notify_notification_show(mNotification, nullptr); - -+ if (result && mAlertListener) -+ mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get()); -+ - return result ? NS_OK : NS_ERROR_FAILURE; - } - -@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl) - if (!il) - return ShowAlert(nullptr); - -- return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, -- this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, -- nullptr, getter_AddRefs(mIconRequest)); -+ nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr, -+ this, nullptr, nsIRequest::LOAD_NORMAL, nullptr, -+ 0 /* use default */, getter_AddRefs(mIconRequest)); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ mIconRequest->StartDecoding(); -+ -+ return NS_OK; - } - - void -diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h -new file mode 100644 -index 0000000..ac96db9 ---- /dev/null -+++ mozilla/toolkit/system/gnome/nsAlertsIconListener.h -@@ -0,0 +1,89 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsAlertsIconListener_h__ -+#define nsAlertsIconListener_h__ -+ -+#include "nsCOMPtr.h" -+#include "imgINotificationObserver.h" -+#include "nsStringAPI.h" -+#include "nsIObserver.h" -+#include "nsWeakReference.h" -+ -+#include <gdk-pixbuf/gdk-pixbuf.h> -+ -+class imgIRequest; -+ -+struct NotifyNotification; -+ -+class nsAlertsIconListener : public imgINotificationObserver, -+ public nsIObserver, -+ public nsSupportsWeakReference -+{ -+public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_IMGINOTIFICATIONOBSERVER -+ NS_DECL_NSIOBSERVER -+ -+ nsAlertsIconListener(); -+ -+ nsresult InitAlertAsync(const nsAString & aImageUrl, -+ const nsAString & aAlertTitle, -+ const nsAString & aAlertText, -+ bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener); -+ -+ void SendCallback(); -+ void SendClosed(); -+ -+protected: -+ virtual ~nsAlertsIconListener(); -+ -+ nsresult OnStopRequest(imgIRequest* aRequest); -+ nsresult OnStopFrame(imgIRequest* aRequest); -+ -+ /** -+ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols -+ * is that notify_notification_new takes three arguments in libnotify.so.4 and -+ * four in libnotify.so.1. -+ * Passing the fourth argument as NULL is binary compatible. -+ */ -+ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); -+ typedef bool (*notify_is_initted_t)(void); -+ typedef bool (*notify_init_t)(const char*); -+ typedef GList* (*notify_get_server_caps_t)(void); -+ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); -+ typedef bool (*notify_notification_show_t)(void*, char*); -+ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); -+ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); -+ -+ nsCOMPtr<imgIRequest> mIconRequest; -+ nsCString mAlertTitle; -+ nsCString mAlertText; -+ -+ nsCOMPtr<nsIObserver> mAlertListener; -+ nsString mAlertCookie; -+ -+ bool mLoadedFrame; -+ bool mAlertHasAction; -+ -+ static void* libNotifyHandle; -+ static bool libNotifyNotAvail; -+ static notify_is_initted_t notify_is_initted; -+ static notify_init_t notify_init; -+ static notify_get_server_caps_t notify_get_server_caps; -+ static notify_notification_new_t notify_notification_new; -+ static notify_notification_show_t notify_notification_show; -+ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; -+ static notify_notification_add_action_t notify_notification_add_action; -+ NotifyNotification* mNotification; -+ gulong mClosureHandler; -+ -+ nsresult StartRequest(const nsAString & aImageUrl); -+ nsresult ShowAlert(GdkPixbuf* aPixbuf); -+}; -+ -+#endif -diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp -index 5ccc8e5..f893893 100644 ---- mozilla/toolkit/system/gnome/nsGnomeModule.cpp -+++ mozilla/toolkit/system/gnome/nsGnomeModule.cpp -@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) - NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) - #endif -+#include "nsSystemAlertsService.h" -+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) - - #ifdef MOZ_ENABLE_GCONF - NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); -@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); - #endif -+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); - - static const mozilla::Module::CIDEntry kGnomeCIDs[] = { - #ifdef MOZ_ENABLE_GCONF -@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { - { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, - { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, - #endif -+ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, - { nullptr } - }; - -@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { - { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, - { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, - #endif -+ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, - { nullptr } - }; - -diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp -new file mode 100644 -index 0000000..b91b402 ---- /dev/null -+++ mozilla/toolkit/system/gnome/nsSystemAlertsService.cpp -@@ -0,0 +1,54 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "nsXULAppAPI.h" -+#include "nsSystemAlertsService.h" -+#include "nsAlertsIconListener.h" -+#include "nsAutoPtr.h" -+ -+NS_IMPL_ADDREF(nsSystemAlertsService) -+NS_IMPL_RELEASE(nsSystemAlertsService) -+ -+NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService) -+ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) -+ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) -+NS_INTERFACE_MAP_END_THREADSAFE -+ -+nsSystemAlertsService::nsSystemAlertsService() -+{ -+} -+ -+nsSystemAlertsService::~nsSystemAlertsService() -+{} -+ -+nsresult -+nsSystemAlertsService::Init() -+{ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, -+ const nsAString & aAlertText, bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener, -+ const nsAString & aAlertName, -+ const nsAString & aBidi, -+ const nsAString & aLang, -+ const nsAString & aData, -+ nsIPrincipal * aPrincipal) -+{ -+ nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener(); -+ if (!alertListener) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -+ aAlertCookie, aAlertListener); -+} -+ -+NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName, -+ nsIPrincipal* aPrincipal) -+{ -+ return NS_ERROR_NOT_IMPLEMENTED; -+} -diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h -new file mode 100644 -index 0000000..b0bd625 ---- /dev/null -+++ mozilla/toolkit/system/gnome/nsSystemAlertsService.h -@@ -0,0 +1,27 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsSystemAlertsService_h__ -+#define nsSystemAlertsService_h__ -+ -+#include "nsIAlertsService.h" -+#include "nsCOMPtr.h" -+ -+class nsSystemAlertsService : public nsIAlertsService -+{ -+public: -+ NS_DECL_NSIALERTSSERVICE -+ NS_DECL_ISUPPORTS -+ -+ nsSystemAlertsService(); -+ -+ nsresult Init(); -+ -+protected: -+ virtual ~nsSystemAlertsService(); -+ -+}; -+ -+#endif /* nsSystemAlertsService_h__ */ diff --git a/www/seamonkey/files/patch-bug991253 b/www/seamonkey/files/patch-bug991253 index 32241fdfe270..06adabf4e833 100644 --- a/www/seamonkey/files/patch-bug991253 +++ b/www/seamonkey/files/patch-bug991253 @@ -1,14 +1,16 @@ --- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ +++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() +@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } + // load system hunspell dictionaries -+ nsIFile* hunDir; ++ nsCOMPtr<nsIFile> hunDir; + NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, &hunDir); -+ LoadDictionariesFromDir(hunDir); ++ true, getter_AddRefs(hunDir)); ++ if (hunDir) { ++ LoadDictionariesFromDir(hunDir); ++ } + // find dictionaries from extensions requiring restart nsCOMPtr<nsISimpleEnumerator> dictDirs; diff --git a/www/seamonkey/files/patch-ijg-libjpeg b/www/seamonkey/files/patch-ijg-libjpeg index 06e9099ba36c..714576fd56ff 100644 --- a/www/seamonkey/files/patch-ijg-libjpeg +++ b/www/seamonkey/files/patch-ijg-libjpeg @@ -51,26 +51,26 @@ index 8fa8200..1d2a259 100644 static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); -@@ -324,6 +340,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) - case JCS_GRAYSCALE: - case JCS_RGB: - case JCS_YCbCr: +@@ -367,6 +382,7 @@ nsJPEGDecoder::WriteInternal(const char* + case JCS_GRAYSCALE: + case JCS_RGB: + case JCS_YCbCr: +#ifdef JCS_EXTENSIONS - // if we're not color managing we can decode directly to - // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB - if (mCMSMode != eCMSMode_All) { -@@ -332,6 +349,9 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) - } else { - mInfo.out_color_space = JCS_RGB; - } + // if we're not color managing we can decode directly to + // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB + if (mCMSMode != eCMSMode_All) { +@@ -375,6 +391,9 @@ nsJPEGDecoder::WriteInternal(const char* + } else { + mInfo.out_color_space = JCS_RGB; + } +#else -+ mInfo.out_color_space = JCS_RGB; ++ mInfo.out_color_space = JCS_RGB; +#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -399,6 +419,15 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount) - return; /* I/O suspension */ + break; + case JCS_CMYK: + case JCS_YCCK: +@@ -433,6 +452,15 @@ nsJPEGDecoder::WriteInternal(const char* + return; // I/O suspension } +#ifndef JCS_EXTENSIONS @@ -83,10 +83,10 @@ index 8fa8200..1d2a259 100644 + } +#endif - /* If this is a progressive JPEG ... */ - mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; -@@ -544,7 +573,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend) - uint32_t *imageRow = ((uint32_t*)mImageData) + + // If this is a progressive JPEG ... + mState = mInfo.buffered_image ? +@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus + uint32_t* imageRow = ((uint32_t*)mImageData) + (mInfo.output_scanline * mInfo.output_width); +#ifdef JCS_EXTENSIONS @@ -94,10 +94,10 @@ index 8fa8200..1d2a259 100644 +#else + if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { +#endif - /* Special case: scanline will be directly converted into packed ARGB */ + // Special case: scanline will be directly converted into packed ARGB if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { - *suspend = true; /* suspend */ -@@ -854,6 +887,282 @@ term_source (j_decompress_ptr jd) + *suspend = true; // suspend +@@ -920,6 +952,282 @@ term_source (j_decompress_ptr jd) } // namespace mozilla @@ -377,6 +377,6 @@ index 8fa8200..1d2a259 100644 +#endif + + - /**************** Inverted CMYK -> RGB conversion **************/ - /* - * Input is (Inverted) CMYK stored as 4 bytes per pixel. + ///*************** Inverted CMYK -> RGB conversion ************************* + /// Input is (Inverted) CMYK stored as 4 bytes per pixel. + /// Output is RGB stored as 3 bytes per pixel. diff --git a/www/seamonkey/files/patch-system-openh264 b/www/seamonkey/files/patch-system-openh264 index c75b8bd83125..0e9c9ff7284a 100644 --- a/www/seamonkey/files/patch-system-openh264 +++ b/www/seamonkey/files/patch-system-openh264 @@ -1,9 +1,9 @@ # Revert bug 1045209 to allow using absolute path -diff --git content/media/gmp/GMPChild.cpp content/media/gmp/GMPChild.cpp +diff --git dom/media/gmp/GMPChild.cpp dom/media/gmp/GMPChild.cpp index 1dde3ac..12c88cf 100644 ---- mozilla/content/media/gmp/GMPChild.cpp -+++ mozilla/content/media/gmp/GMPChild.cpp +--- mozilla/dom/media/gmp/GMPChild.cpp ++++ mozilla/dom/media/gmp/GMPChild.cpp @@ -76,21 +76,14 @@ GetFileBase(const std::string& aPluginPa } #endif @@ -30,10 +30,10 @@ index 1dde3ac..12c88cf 100644 return true; } -diff --git content/media/gmp/GMPParent.cpp content/media/gmp/GMPParent.cpp +diff --git dom/media/gmp/GMPParent.cpp dom/media/gmp/GMPParent.cpp index aa60acf..90878ca 100644 ---- mozilla/content/media/gmp/GMPParent.cpp -+++ mozilla/content/media/gmp/GMPParent.cpp +--- mozilla/dom/media/gmp/GMPParent.cpp ++++ mozilla/dom/media/gmp/GMPParent.cpp @@ -90,23 +90,16 @@ mService = aService; mDirectory = aPluginDir; diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422 index b11c6790c393..cd59001a7386 100644 --- a/www/seamonkey/files/patch-z-bug517422 +++ b/www/seamonkey/files/patch-z-bug517422 @@ -268,10 +268,10 @@ index 87db361..7947626 100644 dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, -diff --git content/media/AudioStream.h content/media/AudioStream.h +diff --git dom/media/AudioStream.h dom/media/AudioStream.h index 085676d..00c54fb 100644 ---- mozilla/content/media/AudioStream.h -+++ mozilla/content/media/AudioStream.h +--- mozilla/dom/media/AudioStream.h ++++ mozilla/dom/media/AudioStream.h @@ -17,7 +17,7 @@ #include "CubebUtils.h" @@ -281,10 +281,10 @@ index 085676d..00c54fb 100644 } namespace mozilla { -diff --git content/media/moz.build content/media/moz.build +diff --git dom/media/moz.build dom/media/moz.build index 7526cff..e0a0ca0 100644 ---- mozilla/content/media/moz.build -+++ mozilla/content/media/moz.build +--- mozilla/dom/media/moz.build ++++ mozilla/dom/media/moz.build @@ -212,3 +212,24 @@ if CONFIG['ANDROID_VERSION'] > '15': CFLAGS += CONFIG['GSTREAMER_CFLAGS'] @@ -382,9 +382,9 @@ diff --git media/libtheora/moz.build media/libtheora/moz.build index 14265b1..3069e99 100644 --- mozilla/media/libtheora/moz.build +++ mozilla/media/libtheora/moz.build -@@ -6,3 +6,5 @@ - - DIRS += ['include', 'lib'] +@@ -93,3 +93,5 @@ if CONFIG['GNU_AS']: + if CONFIG['OS_TARGET'] == 'Android': + DEFINES['__linux__'] = True +if CONFIG['MOZ_NATIVE_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] |